fix: fixed icon and action bar padding

This commit is contained in:
2026-06-13 15:03:18 +03:00
parent bbbf9f6b4a
commit b97d7d58e5
4 changed files with 16 additions and 6 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ android {
applicationId = "ru.omni_devel.cards" applicationId = "ru.omni_devel.cards"
minSdk = 30 minSdk = 30
targetSdk = 36 targetSdk = 36
versionCode = 20 versionCode = 30
versionName = "2.0" versionName = "2.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -108,8 +108,16 @@ fun MainPage(
if (isActionBarShowed) { if (isActionBarShowed) {
Column( Column(
modifier = Modifier.align(Alignment.BottomEnd).padding(16.dp).background(MaterialTheme.colorScheme.inversePrimary, modifier = Modifier
RoundedCornerShape(24.dp)).padding(16.dp).fillMaxWidth() .align(Alignment.BottomEnd)
.padding(innerPadding)
.padding(16.dp)
.background(
MaterialTheme.colorScheme.inversePrimary,
RoundedCornerShape(24.dp)
)
.padding(16.dp)
.fillMaxWidth()
) { ) {
FullWidthButton( FullWidthButton(
onClick = { onClick = {
@@ -156,7 +164,9 @@ fun MainPage(
} }
} else { } else {
Button( Button(
modifier = Modifier.align(Alignment.BottomEnd).padding(32.dp), modifier = Modifier
.align(Alignment.BottomEnd)
.padding(innerPadding).padding(32.dp),
onClick = { onClick = {
isActionBarShowed = true isActionBarShowed = true
} }
@@ -2,5 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/> <!-- <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>-->
</adaptive-icon> </adaptive-icon>
@@ -2,5 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/> <!-- <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>-->
</adaptive-icon> </adaptive-icon>