diff --git a/app/build.gradle b/app/build.gradle index 4be636e..b791376 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -341,17 +341,6 @@ dependencies { implementation "com.google.devtools.ksp:symbol-processing-api:1.8.0-1.0.8" implementation "androidx.security:security-crypto:1.1.0-alpha04" - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.activity:activity-compose:1.6.1' - implementation platform('androidx.compose:compose-bom:2022.10.00') - implementation 'androidx.compose.ui:ui' - implementation 'androidx.compose.ui:ui-graphics' - implementation 'androidx.compose.ui:ui-tooling-preview' - implementation 'androidx.compose.material3:material3' - androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00') - androidTestImplementation 'androidx.compose.ui:ui-test-junit4' - debugImplementation 'androidx.compose.ui:ui-tooling' - debugImplementation 'androidx.compose.ui:ui-test-manifest' } if (hasSentryConfig) { @@ -379,18 +368,10 @@ android { } kotlinOptions { - jvmTarget= '1.8' + jvmTarget=JavaVersion.VERSION_11 } //noinspection GrDeprecatedAPIUsage buildToolsVersion '33.0.1' - composeOptions { - kotlinCompilerExtensionVersion '1.3.2' - } - packagingOptions { - resources { - excludes += '/META-INF/{AL2.0,LGPL2.1}' - } - } } diff --git a/app/src/main/res/layout/module_entry.xml b/app/src/main/res/layout/module_entry.xml index d3df7a3..a4904da 100644 --- a/app/src/main/res/layout/module_entry.xml +++ b/app/src/main/res/layout/module_entry.xml @@ -4,10 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginTop="2dp" - android:layout_marginRight="8dp" - android:layout_marginBottom="2dp" + android:layout_marginHorizontal="8dp" + android:layout_marginVertical="2dp" android:filterTouchesWhenObscured="true" android:gravity="center_vertical" android:orientation="vertical" @@ -139,8 +137,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" - android:paddingRight="4dp" - android:paddingLeft="4dp" + android:paddingHorizontal="4dp" app:singleLine="true"> @dimen/card_corner_radius @color/light_colorBackgroundFloating @color/light_backgroundColor - @style/Widget.Material.Chip.Choice.Light + @style/Widget.Material3.Chip.Choice.Light -