From b97d7d58e593e9bf8cfa124b1c9e8b3551cd059a Mon Sep 17 00:00:00 2001
From: Omni Devel <omni@omni-devel.ru>
Date: Sat, 13 Jun 2026 15:03:18 +0300
Subject: [PATCH] fix: fixed icon and action bar padding

---
 mobile/build.gradle.kts                          |  2 +-
 .../java/ru/omni_devel/cards/MainActivity.kt     | 16 +++++++++++++---
 .../main/res/mipmap-anydpi-v26/ic_launcher.xml   |  2 +-
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml  |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 5fff39d..118632f 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -16,7 +16,7 @@ android {
         applicationId = "ru.omni_devel.cards"
         minSdk = 30
         targetSdk = 36
-        versionCode = 20
+        versionCode = 30
         versionName = "2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt
index f715259..8a24ea4 100644
--- a/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt
+++ b/mobile/src/main/java/ru/omni_devel/cards/MainActivity.kt
@@ -108,8 +108,16 @@ fun MainPage(
 
         if (isActionBarShowed) {
             Column(
-                modifier = Modifier.align(Alignment.BottomEnd).padding(16.dp).background(MaterialTheme.colorScheme.inversePrimary,
-                    RoundedCornerShape(24.dp)).padding(16.dp).fillMaxWidth()
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .padding(innerPadding)
+                    .padding(16.dp)
+                    .background(
+                        MaterialTheme.colorScheme.inversePrimary,
+                        RoundedCornerShape(24.dp)
+                    )
+                    .padding(16.dp)
+                    .fillMaxWidth()
             ) {
                 FullWidthButton(
                     onClick = {
@@ -156,7 +164,9 @@ fun MainPage(
             }
         } else {
             Button(
-                modifier = Modifier.align(Alignment.BottomEnd).padding(32.dp),
+                modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .padding(innerPadding).padding(32.dp),
                 onClick = {
                     isActionBarShowed = true
                 }
diff --git a/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 65291b9..6b76375 100644
--- a/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
+<!--    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>-->
 </adaptive-icon>
\ No newline at end of file
diff --git a/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 65291b9..6b76375 100644
--- a/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
+<!--    <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>-->
 </adaptive-icon>
\ No newline at end of file