Fix next alarm clock UI

app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt

@@ -34,7 +34,7 @@ class AWApplication : Application() {
     private fun calibrateVersions() {
         // 2.0 Tolerance
         if (Preferences.clockTextSize > 50f) {
-            Preferences.clockTextSize = 46f
+            Preferences.clockTextSize = 32f
         }
 
         if (Preferences.textMainSize > 36f) {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/ClockSettingsFragment.kt

@@ -116,6 +116,14 @@ class ClockSettingsFragment : Fragment() {
             }.show()
         }
 
+        action_clock_app.setOnClickListener {
+            if (Preferences.showClock) {
+                startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java),
+                    RequestCode.CLOCK_APP_REQUEST_CODE.code
+                )
+            }
+        }
+
         action_show_next_alarm.setOnClickListener {
             BottomSheetMenu<Boolean>(requireContext(), header = getString(R.string.settings_show_next_alarm_title)).setSelectedValue(Preferences.showNextAlarm)
                 .addItem(getString(R.string.settings_visible), true)
@@ -124,14 +132,6 @@ class ClockSettingsFragment : Fragment() {
                     Preferences.showNextAlarm = value
                 }.show()
         }
-
-        action_clock_app.setOnClickListener {
-            if (Preferences.showClock) {
-                startActivityForResult(Intent(requireContext(), ChooseApplicationActivity::class.java),
-                    RequestCode.CLOCK_APP_REQUEST_CODE.code
-                )
-            }
-        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

app/src/main/res/layout/fragment_clock_settings.xml

@@ -141,6 +141,44 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_clock_app"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_add_to_home_screen"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_clock_app_title"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/clock_app_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -178,43 +216,6 @@
                         style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
             </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="16dp"
-                    android:paddingBottom="16dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical"
-                    android:id="@+id/action_clock_app"
-                    android:orientation="horizontal">
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:padding="12dp"
-                        android:src="@drawable/round_add_to_home_screen"
-                        android:tint="@color/colorPrimaryText"/>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="8dp"
-                        android:paddingRight="8dp"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_clock_app_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/clock_app_label"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
-                </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -236,6 +237,5 @@
                     app:textAllCaps="false" />
             </LinearLayout>
         </LinearLayout>
-        </LinearLayout>
     </ScrollView>
 </layout>

tasksintegration/build/intermediates/bundle_manifest/debug/bundle-manifest/AndroidManifest.xml

@@ -4,7 +4,7 @@
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
     android:versionCode="59"
-    android:versionName="2.0.4" >
+    android:versionName="2.0.5" >
 
     <uses-sdk
         android:minSdkVersion="23"

tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Mon May 04 15:26:16 CEST 2020
+#Mon May 04 17:33:06 CEST 2020
 base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
 path.0=classes.dex
 renamed.0=classes.dex

tasksintegration/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -5,7 +5,7 @@
     package="com.tommasoberlose.anotherwidget"
     android:targetSandboxVersion="2"
     android:versionCode="59"
-    android:versionName="2.0.4" >
+    android:versionName="2.0.5" >
 
     <uses-sdk
         android:minSdkVersion="23"

tasksintegration/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -4,7 +4,7 @@
 4    featureSplit="tasksintegration"
 5    package="com.tommasoberlose.anotherwidget"
 6    android:versionCode="59"
-7    android:versionName="2.0.4" >
+7    android:versionName="2.0.5" >
 8
 9    <uses-sdk
 10        android:minSdkVersion="23"

tasksintegration/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -4,7 +4,7 @@
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
     android:versionCode="59"
-    android:versionName="2.0.4" >
+    android:versionName="2.0.5" >
 
     <uses-sdk
         android:minSdkVersion="23"

tasksintegration/build/intermediates/metadata_feature_manifest/debug/metadata-feature/AndroidManifest.xml

@@ -4,7 +4,7 @@
     featureSplit="tasksintegration"
     package="com.tommasoberlose.anotherwidget"
     android:versionCode="59"
-    android:versionName="2.0.4" >
+    android:versionName="2.0.5" >
 
     <uses-sdk android:targetSdkVersion="29" />