From 097d27c1f31ad27408d8c7eebbe2578cc46ebc40 Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Mon, 30 May 2022 22:36:03 +0200
Subject: [PATCH] Make save button more floating. Avoid screen rotation

---
 app/build.gradle                             | 16 ++++++----------
 app/src/main/AndroidManifest.xml             |  4 +++-
 app/src/main/res/layout-w900dp/drug_list.xml |  1 +
 app/src/main/res/layout/drug_list.xml        |  1 +
 build.gradle                                 |  2 --
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5d1ba35..4bd997d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,19 +18,15 @@ else {
 android {
     signingConfigs {
         release {
-            storeFile rootProject.file("android-signing-keystore.jks")
-            storePassword secretProperties['signing_keystore_password']
-            keyAlias secretProperties['signing_release_alias_key']
-            keyPassword secretProperties['signing_release_key_password']
         }
         prerelease {
-            storeFile rootProject.file("android-signing-keystore.jks")
+            storeFile file("../android-signing-keystore.jks")
             storePassword secretProperties['signing_keystore_password']
-            keyAlias secretProperties['signing_pre-release_key_alias']
-            keyPassword secretProperties['signing_pre-release_key_password']
+            keyAlias secretProperties['signing_key_alias']
+            keyPassword secretProperties['signing_key_password']
         }
     }
-    compileSdkVersion 31
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "net.foucry.pilldroid"
@@ -87,7 +83,7 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    buildToolsVersion '32.0.0'
+    buildToolsVersion = "32.0.0"
 
     allprojects {
         tasks.withType(JavaCompile) {
@@ -124,4 +120,4 @@ dependencies {
     implementation 'androidx.core:core:1.7.0'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-}
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dca5e89..96a3315 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:screenOrientation="portrait"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:allowBackup="true">
@@ -29,7 +30,8 @@
             android:name=".DrugDetailActivity"
             android:label="@string/title_drug_detail"
             android:parentActivityName=".DrugListActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="net.foucry.pilldroid.DrugListActivity" />
diff --git a/app/src/main/res/layout-w900dp/drug_list.xml b/app/src/main/res/layout-w900dp/drug_list.xml
index 2d16261..6f8d0f6 100644
--- a/app/src/main/res/layout-w900dp/drug_list.xml
+++ b/app/src/main/res/layout-w900dp/drug_list.xml
@@ -9,6 +9,7 @@
     android:divider="?android:attr/dividerHorizontal"
     android:orientation="horizontal"
     android:showDividers="middle"
+    android:fitsSystemWindows="true"
     tools:context="net.foucry.pilldroid.DrugListActivity">
 
     <!--
diff --git a/app/src/main/res/layout/drug_list.xml b/app/src/main/res/layout/drug_list.xml
index d798d15..928091c 100644
--- a/app/src/main/res/layout/drug_list.xml
+++ b/app/src/main/res/layout/drug_list.xml
@@ -6,6 +6,7 @@
     android:name="net.foucry.pilldroid.MedicamentListFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     app:layoutManager="LinearLayoutManager"
     android:background="@drawable/list_selector"
     tools:context="net.foucry.pilldroid.DrugListActivity"
diff --git a/build.gradle b/build.gradle
index 069a4cc..f0bbbef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,6 @@ ext {
     defaultMinSdkVersion = 26
     defaultTargetSdkVersion = 30
     defaultVersionCode = 1
-    defaultVersionCode1 = defaultVersionCode
-    defaultVersionName = 'beta-0.+$versioncode'
 }
 
 allprojects {