openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/Android_Search into lp:openlp/android2.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/Android_Search/+merge/294735
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/Android_Search into lp:openlp/android2.

=== modified file 'app/build.gradle'
--- app/build.gradle	2016-01-11 20:02:36 +0000
+++ app/build.gradle	2016-05-15 17:15:18 +0000
@@ -10,7 +10,7 @@
         applicationId "org.openlp.android2"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 5
+        versionCode 6
         versionName "2.0"
     }
     android {

=== modified file 'app/src/main/res/layout/blank_display_dialog.xml'
--- app/src/main/res/layout/blank_display_dialog.xml	2016-01-11 20:02:36 +0000
+++ app/src/main/res/layout/blank_display_dialog.xml	2016-05-15 17:15:18 +0000
@@ -7,7 +7,7 @@
               android:layout_height="fill_parent"
               android:weightSum="1">
     <TextView
-            android:layout_width="314dp"
+            android:layout_width="315dp"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/display_blank_summary"
@@ -15,18 +15,18 @@
             android:textStyle="bold|italic"
             android:textSize="40px"
             android:height="70px"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp" />
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"/>
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/display_reset"
             android:id="@+id/buttonReset"
             android:textSize="20sp"
-            android:height="40dp"
+            android:height="30dp"
             android:clickable="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp" />
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"/>
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -35,8 +35,8 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp" />
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"/>
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -45,8 +45,8 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp" />
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"/>
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,6 +55,6 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="20dp" />
+            android:layout_marginTop="20dp"
+            android:layout_marginBottom="20dp"/>
 </LinearLayout>
\ No newline at end of file