← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~trb143/openlp/Android2-a5 into lp:openlp/android2

 

Tim Bentley has proposed merging lp:~trb143/openlp/Android2-a5 into lp:openlp/android2.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/Android2-a5/+merge/277514

Support fat fingers on Blank Dialog
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/Android2-a5 into lp:openlp/android2.
=== modified file 'app/app.iml'
--- app/app.iml	2015-10-16 19:32:04 +0000
+++ app/app.iml	2015-11-15 10:19:48 +0000
@@ -87,6 +87,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

=== modified file 'app/build.gradle'
--- app/build.gradle	2015-10-16 19:32:04 +0000
+++ app/build.gradle	2015-11-15 10:19:48 +0000
@@ -10,7 +10,7 @@
         applicationId "org.openlp.android2"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 4
+        versionCode 5
         versionName "2.0"
     }
     android {

=== modified file 'app/src/main/res/layout/blank_display_dialog.xml'
--- app/src/main/res/layout/blank_display_dialog.xml	2015-09-20 21:02:37 +0000
+++ app/src/main/res/layout/blank_display_dialog.xml	2015-11-15 10:19:48 +0000
@@ -7,14 +7,16 @@
               android:layout_height="fill_parent"
               android:weightSum="1">
     <TextView
-            android:layout_width="294dp"
+            android:layout_width="314dp"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/display_blank_summary"
             android:id="@+id/textView"
             android:textStyle="bold|italic"
             android:textSize="40px"
-            android:height="45px"/>
+            android:height="70px"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -22,7 +24,9 @@
             android:id="@+id/buttonReset"
             android:textSize="20sp"
             android:height="40dp"
-            android:clickable="true"/>
+            android:clickable="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -30,7 +34,9 @@
             android:id="@+id/buttonScreen"
             android:textSize="20sp"
             android:height="40dp"
-            android:clickable="true"/>
+            android:clickable="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,7 +44,9 @@
             android:id="@+id/buttonTheme"
             android:textSize="20sp"
             android:height="40dp"
-            android:clickable="true"/>
+            android:clickable="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -46,5 +54,7 @@
             android:id="@+id/buttonDesktop"
             android:textSize="20sp"
             android:height="40dp"
-            android:clickable="true"/>
+            android:clickable="true"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
 </LinearLayout>
\ No newline at end of file


Follow ups