From 37920e2991d73d7860c781aaf550baa0e0c3a09b Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Sun, 8 Oct 2017 00:59:01 +0200
Subject: [PATCH] Bug fixes

---
 app/build.gradle                          |   2 +-
 app/release/output.json                   |   2 +-
 app/src/main/res/layout/activity_main.xml | 461 +++++++++++-----------
 3 files changed, 230 insertions(+), 235 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3945a56..aaf39a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 19
         targetSdkVersion 26
-        versionCode 2
+        versionCode 3
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/release/output.json b/app/release/output.json
index 1fdbf41..9429200 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2},"path":"app-release.apk","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"19"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3},"path":"app-release.apk","properties":{"packageId":"com.tommasoberlose.anotherwidget","split":"","minSdkVersion":"19"}}]
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 448ff12..fa50c67 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,262 +1,257 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.tommasoberlose.anotherwidget.ui.activity.MainActivity">
+    tools:context="com.tommasoberlose.anotherwidget.ui.activity.MainActivity"
+    android:background="@drawable/gradient_background"
+    android:orientation="vertical">
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/gradient_background"
-        android:orientation="vertical">
-        <LinearLayout
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_margin="32dp"
+        android:id="@+id/toolbar"
+        android:gravity="center_vertical">
+        <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_margin="32dp"
-            android:id="@+id/toolbar"
-            android:gravity="center_vertical">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/main_pre_title"
-                android:alpha="0.6"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:gravity="center_vertical"
-                style="@style/AnotherWidget.Main.Subtitle"
-                android:textAllCaps="true"/>
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/app_name"
-                android:gravity="center_vertical"
-                style="@style/AnotherWidget.Main.Title"
-                android:textAllCaps="true"/>
-        </LinearLayout>
-        <RelativeLayout
+            android:text="@string/main_pre_title"
+            android:alpha="0.6"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:gravity="center_vertical"
+            style="@style/AnotherWidget.Main.Subtitle"
+            android:textAllCaps="true"/>
+        <TextView
             android:layout_width="match_parent"
-            android:layout_height="128dp"
-            android:id="@+id/widget">
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                android:id="@+id/widget_bg"/>
-            <include
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                layout="@layout/the_widget"/>
-        </RelativeLayout>
+            android:layout_height="wrap_content"
+            android:text="@string/app_name"
+            android:gravity="center_vertical"
+            style="@style/AnotherWidget.Main.Title"
+            android:textAllCaps="true"/>
+    </LinearLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="128dp"
+        android:id="@+id/widget">
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            android:id="@+id/widget_bg"/>
+        <include
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            layout="@layout/the_widget"/>
+    </RelativeLayout>
 
-        <RelativeLayout
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="3">
+        <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="3">
-            <ScrollView
+            android:layout_height="match_parent"
+            android:id="@+id/all_set_container">
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/all_set_container">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingTop="20dp"
+                android:paddingBottom="20dp">
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
                     android:paddingLeft="32dp"
                     android:paddingRight="32dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="20dp">
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_change_unit"
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:foreground="?android:attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:id="@+id/action_change_unit"
-                        android:orientation="vertical">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/AnotherWidget.Settings.Title"
-                            android:text="@string/settings_unit_title"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:id="@+id/temp_unit"
-                            style="@style/AnotherWidget.Settings.Subtitle"/>
-                    </LinearLayout>
+                        style="@style/AnotherWidget.Settings.Title"
+                        android:text="@string/settings_unit_title"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/temp_unit"
+                        style="@style/AnotherWidget.Settings.Subtitle"/>
                 </LinearLayout>
+            </LinearLayout>
 
-            </ScrollView>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+        </ScrollView>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:visibility="gone"
+            android:id="@+id/no_calendar_permission_container"
+            android:layout_centerInParent="true"
+            android:orientation="vertical">
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:padding="14dp"
                 android:visibility="gone"
-                android:id="@+id/no_calendar_permission_container"
-                android:layout_centerInParent="true"
-                android:orientation="vertical">
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="14dp"
-                    android:visibility="gone"
-                    android:tint="@android:color/white"
-                    android:background="@drawable/circle_background"
-                    android:src="@drawable/ic_action_calendar"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Main.Title"
-                    android:paddingTop="16dp"
-                    android:paddingRight="32dp"
-                    android:paddingLeft="32dp"
-                    android:text="@string/title_permission_calendar"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Main.Description"
-                    android:paddingBottom="32dp"
-                    android:paddingRight="32dp"
-                    android:paddingLeft="32dp"
-                    android:text="@string/description_permission_calendar"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Main.Button"
-                    android:id="@+id/request_calendar"
-                    android:text="@string/button_request_permission"/>
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:id="@+id/no_location_permission_container"
-                android:layout_centerInParent="true"
-                android:orientation="vertical"
-                android:visibility="gone">
-                <ImageView
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="14dp"
-                    android:visibility="gone"
-                    android:tint="@android:color/white"
-                    android:background="@drawable/circle_background"
-                    android:src="@drawable/ic_action_location"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Main.Title"
-                    android:paddingTop="16dp"
-                    android:paddingRight="32dp"
-                    android:paddingLeft="32dp"
-                    android:text="@string/title_permission_location"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Main.Description"
-                    android:paddingBottom="32dp"
-                    android:paddingRight="32dp"
-                    android:paddingLeft="32dp"
-                    android:text="@string/description_permission_location"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/AnotherWidget.Main.Button"
-                    android:id="@+id/request_location"
-                    android:text="@string/button_request_permission"/>
-            </LinearLayout>
-        </RelativeLayout>
+                android:tint="@android:color/white"
+                android:background="@drawable/circle_background"
+                android:src="@drawable/ic_action_calendar"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Title"
+                android:paddingTop="16dp"
+                android:paddingRight="32dp"
+                android:paddingLeft="32dp"
+                android:text="@string/title_permission_calendar"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Description"
+                android:paddingBottom="32dp"
+                android:paddingRight="32dp"
+                android:paddingLeft="32dp"
+                android:text="@string/description_permission_calendar"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Button"
+                android:id="@+id/request_calendar"
+                android:text="@string/button_request_permission"/>
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:gravity="center"
-            android:baselineAligned="false"
-            android:id="@+id/menu_container"
-            android:background="@color/midnight_blue"
-            android:layout_gravity="bottom">
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="3"
-                android:gravity="center"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
-                android:background="?android:attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:id="@+id/action_share"
-                android:orientation="vertical">
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:padding="2dp"
-                    android:layout_marginTop="8dp"
-                    android:src="@drawable/ic_action_sms"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/action_share"
-                    style="@style/AnotherWidget.Main.Button.TabBar"
-                    android:background="@android:color/transparent"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="3"
-                android:gravity="center"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
-                android:background="?android:attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:id="@+id/action_project"
-                android:orientation="vertical">
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:padding="2dp"
-                    android:layout_marginTop="8dp"
-                    android:src="@drawable/ic_action_code"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/action_project"
-                    style="@style/AnotherWidget.Main.Button.TabBar"
-                    android:background="@android:color/transparent"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="3"
-                android:gravity="center"
-                android:paddingBottom="8dp"
-                android:paddingTop="8dp"
-                android:background="?android:attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:id="@+id/action_support"
-                android:orientation="vertical">
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:padding="2dp"
-                    android:layout_marginTop="8dp"
-                    android:src="@drawable/ic_action_gift"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/action_support"
-                    style="@style/AnotherWidget.Main.Button.TabBar"
-                    android:background="@android:color/transparent"/>
-            </LinearLayout>
+            android:id="@+id/no_location_permission_container"
+            android:layout_centerInParent="true"
+            android:orientation="vertical"
+            android:visibility="gone">
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:padding="14dp"
+                android:visibility="gone"
+                android:tint="@android:color/white"
+                android:background="@drawable/circle_background"
+                android:src="@drawable/ic_action_location"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Title"
+                android:paddingTop="16dp"
+                android:paddingRight="32dp"
+                android:paddingLeft="32dp"
+                android:text="@string/title_permission_location"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Description"
+                android:paddingBottom="32dp"
+                android:paddingRight="32dp"
+                android:paddingLeft="32dp"
+                android:text="@string/description_permission_location"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/AnotherWidget.Main.Button"
+                android:id="@+id/request_location"
+                android:text="@string/button_request_permission"/>
         </LinearLayout>
+    </RelativeLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:baselineAligned="false"
+        android:id="@+id/menu_container"
+        android:background="@color/midnight_blue"
+        android:layout_gravity="bottom">
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:gravity="center"
+            android:paddingBottom="8dp"
+            android:paddingTop="8dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:id="@+id/action_share"
+            android:orientation="vertical">
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:padding="2dp"
+                android:layout_marginTop="8dp"
+                android:src="@drawable/ic_action_sms"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/action_share"
+                style="@style/AnotherWidget.Main.Button.TabBar"
+                android:background="@android:color/transparent"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:gravity="center"
+            android:paddingBottom="8dp"
+            android:paddingTop="8dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:id="@+id/action_project"
+            android:orientation="vertical">
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:padding="2dp"
+                android:layout_marginTop="8dp"
+                android:src="@drawable/ic_action_code"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/action_project"
+                style="@style/AnotherWidget.Main.Button.TabBar"
+                android:background="@android:color/transparent"/>
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="3"
+            android:gravity="center"
+            android:paddingBottom="8dp"
+            android:paddingTop="8dp"
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:focusable="true"
+            android:id="@+id/action_support"
+            android:orientation="vertical">
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:padding="2dp"
+                android:layout_marginTop="8dp"
+                android:src="@drawable/ic_action_gift"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/action_support"
+                style="@style/AnotherWidget.Main.Button.TabBar"
+                android:background="@android:color/transparent"/>
+        </LinearLayout>
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+
+</LinearLayout>
\ No newline at end of file