Fix activity resize not interacting well with IME keyboard (#220)

chvp · Dec 16, 2024 · fb2f193 · fb2f193
1 parent c907bfe
commit fb2f193
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,11 +8,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NanoLedger"
+        android:windowSoftInputMode="adjustResize"
         >
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="true"
-            android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.NanoLedger"
             android:launchMode="singleInstance">
             <intent-filter>
@@ -23,17 +23,14 @@
         <activity
             android:exported="false"
             android:name=".ui.preferences.PreferencesActivity"
-            android:windowSoftInputMode="adjustResize"
             />
         <activity
             android:exported="false"
             android:name=".ui.add.AddActivity"
-            android:windowSoftInputMode="adjustResize"
             />
         <activity
             android:exported="false"
             android:name=".ui.edit.EditActivity"
-            android:windowSoftInputMode="adjustResize"
             />
     </application>
 

diff --git a/app/src/main/java/be/chvp/nanoledger/ui/add/AddActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/add/AddActivity.kt
@@ -9,6 +9,7 @@ import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Done
@@ -30,6 +31,7 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import be.chvp.nanoledger.R
@@ -107,6 +109,7 @@ class AddActivity() : ComponentActivity() {
                             }
                         }
                     },
+                    modifier = Modifier.imePadding(),
                 ) { contentPadding ->
                     TransactionForm(addViewModel, contentPadding, snackbarHostState)
                 }

diff --git a/app/src/main/java/be/chvp/nanoledger/ui/edit/EditActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/edit/EditActivity.kt
@@ -9,6 +9,7 @@ import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Done
@@ -30,6 +31,7 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import be.chvp.nanoledger.R
@@ -109,6 +111,7 @@ class EditActivity() : ComponentActivity() {
                             }
                         }
                     },
+                    modifier = Modifier.imePadding(),
                 ) { contentPadding ->
                     TransactionForm(editViewModel, contentPadding, snackbarHostState)
                 }

diff --git a/app/src/main/java/be/chvp/nanoledger/ui/main/MainActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/main/MainActivity.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.text.KeyboardActions
@@ -147,6 +148,7 @@ class MainActivity : ComponentActivity() {
                             }
                         }
                     },
+                    modifier = Modifier.imePadding(),
                 ) { contentPadding ->
                     if (fileUri != null) {
                         MainContent(contentPadding)

diff --git a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt
@@ -12,6 +12,7 @@ import androidx.activity.viewModels
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
@@ -85,7 +86,7 @@ class PreferencesActivity() : ComponentActivity() {
                     "," to stringResource(R.string.separator_comma),
                 )
             NanoLedgerTheme {
-                Scaffold(topBar = { Bar() }) { contentPadding ->
+                Scaffold(topBar = { Bar() }, modifier = Modifier.imePadding()) { contentPadding ->
                     Column(
                         modifier =
                             Modifier