fix build and chips display in some cases

closes #274 and bumps deps

Signed-off-by: androidacy-user <opensource@androidacy.com>
pull/284/head
androidacy-user 1 year ago
parent fb11b16eaf
commit ead2d3d30e

@ -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}'
}
}
}

@ -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">
<com.google.android.material.chip.Chip

@ -28,13 +28,13 @@
<item name="dialogCornerRadius">@dimen/card_corner_radius</item>
<item name="colorBackgroundFloating">@color/light_colorBackgroundFloating</item>
<item name="backgroundColor">@color/light_backgroundColor</item>
<item name="chipStyle">@style/Widget.Material.Chip.Choice.Light</item>
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
</style>
<style name="Widget.Material.Chip.Choice.Light" parent="Widget.Material3.Chip.Choice.Light">
<item name="chipBackgroundColor">@color/light_chipBackgroundColor</item>
<style name="Widget.Material3.Chip.Choice.Light" parent="Widget.Material3.Chip.Assist">
<item name="chipBackgroundColor">@color/white</item>
<item name="chipStrokeWidth">0dp</item>
<item name="chipIconTint">@color/black</item>
<item name="chipIconTint">?attr/colorControlNormal</item>
</style>
<style name="Theme.MagiskModuleManager.Transparent.Light" parent="Theme.MagiskModuleManager.Monet.Dark">
@ -54,6 +54,7 @@
<item name="android:actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
<!-- Action bar -->
<item name="actionBarStyle">@style/Widget.Material3.ActionBar.Solid</item>
<item name="chipStyle">@style/Widget.Material3.Chip.Choice.Light</item>
</style>
<style name="Theme.MagiskModuleManager.Dark" parent="Theme.Material3.Dark">

Loading…
Cancel
Save