diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/build.gradle.kts | 6 | ||||
| -rw-r--r-- | app/lint.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/map_preference_widget_switch.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/values/styles_material3.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/values/themes_material3.xml | 8 |
6 files changed, 1 insertions, 53 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5f7a8ee8..053d7478 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -63,6 +63,7 @@ dependencies { implementation(libs.androidx.constraintlayout) implementation(libs.androidx.core.ktx) implementation(libs.androidx.documentfile) + // Pins androidx.fragment (FragmentActivity, BiometricPrompt): appcompat alone resolves 1.5.4. implementation(libs.androidx.fragment.ktx) implementation(libs.androidx.hilt.navigation.compose) implementation(libs.bundles.androidxLifecycle) @@ -70,9 +71,6 @@ dependencies { implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.androidx.material) implementation(libs.androidx.navigation.compose) - implementation(libs.androidx.preference) - implementation(libs.androidx.recyclerview) - implementation(libs.androidx.recyclerviewSelection) implementation(libs.compose.ui.tooling) implementation(libs.dagger.hilt.android) @@ -84,13 +82,11 @@ dependencies { implementation(libs.aps.sublimeFuzzy) implementation(libs.aps.zxingAndroidEmbedded) - implementation(libs.thirdparty.fastscroll) implementation(libs.thirdparty.jgit) { exclude(group = "org.apache.httpcomponents", module = "httpclient") } implementation(libs.thirdparty.kotlinResult) implementation(libs.thirdparty.logcat) - implementation(libs.thirdparty.modernAndroidPrefs) implementation(libs.thirdparty.leakcanary.plumber) implementation(libs.thirdparty.sshj) implementation(libs.thirdparty.bouncycastle.bcprov) diff --git a/app/lint.xml b/app/lint.xml index 8834cbd7..44b84e59 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -5,7 +5,6 @@ <lint> <issue id="ContentDescription"> <ignore path="src/main/res/layout/oreo_autofill_dataset.xml" /> - <ignore path="src/main/res/layout/oreo_autofill_filter_row.xml" /> </issue> <issue id="InvalidPackage"> <ignore regexp="X509LDAPCertStoreSpi" /> @@ -20,10 +19,6 @@ <issue id="UnusedResources"> <ignore path="src/main/res/values/bools.xml" /> <ignore path="src/main/res/values/colors_material3.xml" /> - <ignore path="src/main/res/layout/map_preference_widget_switch.xml" /> - </issue> - <issue id="PrivateResource"> - <ignore path="src/main/res/layout/map_preference_widget_switch.xml" /> </issue> <issue id="VectorPath"> <ignore path="src/main/res/drawable/app_settings_alt_24px.xml" /> diff --git a/app/src/main/res/layout/map_preference_widget_switch.xml b/app/src/main/res/layout/map_preference_widget_switch.xml deleted file mode 100644 index 566e72d4..00000000 --- a/app/src/main/res/layout/map_preference_widget_switch.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - ~ SPDX-License-Identifier: GPL-3.0-only - --> - -<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/checkbox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@null" - android:clickable="false" - android:focusable="false" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index a1d3c974..00000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - ~ SPDX-License-Identifier: GPL-3.0-only - --> - -<resources> - <declare-styleable name="Multiselected"> - <attr name="state_multiselected" format="boolean" /> - </declare-styleable> -</resources> diff --git a/app/src/main/res/values/styles_material3.xml b/app/src/main/res/values/styles_material3.xml deleted file mode 100644 index 329905e1..00000000 --- a/app/src/main/res/values/styles_material3.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved. - ~ SPDX-License-Identifier: GPL-3.0-only - --> - -<resources> - - <style name="APSThemeM3.Toolbar" parent="Widget.Material3.Toolbar"> - <item name="android:background">?android:colorBackground</item> - </style> - -</resources> diff --git a/app/src/main/res/values/themes_material3.xml b/app/src/main/res/values/themes_material3.xml index 0ce3796f..0ec74a45 100644 --- a/app/src/main/res/values/themes_material3.xml +++ b/app/src/main/res/values/themes_material3.xml @@ -10,8 +10,6 @@ <item name="android:windowLightStatusBar">@bool/light_status_bar</item> <item name="android:statusBarColor">?android:colorBackground</item> <item name="android:navigationBarColor">?android:colorBackground</item> - <item name="toolbarStyle">@style/APSThemeM3.Toolbar</item> - <item name="bottomSheetDialogTheme">@style/APSThemeM3.BottomSheetDialog</item> </style> <!-- AppCompat activities whose whole UI is Compose --> @@ -43,12 +41,6 @@ <item name="windowNoTitle">true</item> </style> - <style name="APSThemeM3.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog"> - <item name="android:windowIsFloating">false</item> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor">@android:color/transparent</item> - </style> - <style name="APSThemeM3" parent="Theme.Material3.DayNight"> <item name="colorPrimary">@color/md_theme_light_primary</item> <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item> |
