From 709a36fb31700cf138fc759473a70cd3aff23df5 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Wed, 28 Sep 2022 17:06:42 +0200 Subject: [PATCH] Remove material dialogs library --- app/build.gradle.kts | 1 - base/build.gradle.kts | 2 -- .../launcher2/licenses/OpenSourceLicenses.kt | 8 ------- base/src/main/res/values/themes.xml | 4 ---- g-services/build.gradle.kts | 3 --- settings.gradle.kts | 22 ------------------- ui/build.gradle.kts | 2 -- .../ui/launcher/SharedLauncherActivity.kt | 5 ----- 8 files changed, 47 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6d37d7fa..ddc9543c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -99,7 +99,6 @@ dependencies { implementation(libs.coil.core) implementation(libs.coil.svg) - implementation(libs.bundles.materialdialogs) implementation(libs.koin.android) diff --git a/base/build.gradle.kts b/base/build.gradle.kts index df2c67bf..8f998519 100644 --- a/base/build.gradle.kts +++ b/base/build.gradle.kts @@ -43,8 +43,6 @@ dependencies { implementation(libs.androidx.palette) - implementation(libs.bundles.materialdialogs) - implementation(project(":ktx")) implementation(project(":i18n")) diff --git a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt index a71799be..d41a0be8 100644 --- a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt +++ b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt @@ -85,14 +85,6 @@ val OpenSourceLicenses = arrayOf( copyrightNote = "Copyright (c) 2009-2021 Jonathan Hedley ", url = "https://jsoup.org/" ), - OpenSourceLibrary( - name = "Material Dialogs", - description = "Easy to use material design dialogs", - licenseName = R.string.apache_license_name, - licenseText = R.raw.license_apache_2, - copyrightNote = "Copyright (C) 2020 Wasabeef", - url = "https://github.com/afollestad/material-dialogs" - ), OpenSourceLibrary( name = "mXparser (Version 4.4.2)", description = "A super easy, rich, fast and highly flexible math expression parser library", diff --git a/base/src/main/res/values/themes.xml b/base/src/main/res/values/themes.xml index 0aa2f702..b4c70fbf 100644 --- a/base/src/main/res/values/themes.xml +++ b/base/src/main/res/values/themes.xml @@ -17,10 +17,6 @@ @style/Typography.Label.Medium @style/Typography.Label.Small @style/PopupMenu - ?colorSurface - literal - @font/poppins500 - @font/poppins600 diff --git a/g-services/build.gradle.kts b/g-services/build.gradle.kts index c0d51802..d5f8d2ef 100644 --- a/g-services/build.gradle.kts +++ b/g-services/build.gradle.kts @@ -47,9 +47,6 @@ dependencies { implementation(libs.google.drive) implementation(libs.google.oauth2) - - implementation(libs.bundles.materialdialogs) - implementation(project(":i18n")) implementation(project(":crashreporter")) } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 99d1c481..cbac3c60 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -300,28 +300,6 @@ dependencyResolutionManagement { .to("org.apache.commons", "commons-text") .version("1.9") - version("materialdialogs", "3.3.0") - alias("materialdialogs.core") - .to("com.afollestad.material-dialogs", "core") - .versionRef("materialdialogs") - alias("materialdialogs.input") - .to("com.afollestad.material-dialogs", "input") - .versionRef("materialdialogs") - alias("materialdialogs.color") - .to("com.afollestad.material-dialogs", "color") - .versionRef("materialdialogs") - alias("materialdialogs.bottomsheets") - .to("com.afollestad.material-dialogs", "bottomsheets") - .versionRef("materialdialogs") - bundle( - "materialdialogs", listOf( - "materialdialogs.core", - "materialdialogs.input", - "materialdialogs.color", - "materialdialogs.bottomsheets" - ) - ) - // 4.4.2 is the last GPL compatible version, don't update to 5.x alias("mathparser") .to("org.mariuszgromada.math", "MathParser.org-mXparser") diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index ef30126a..3c690199 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -99,8 +99,6 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodelcompose) - implementation(libs.bundles.materialdialogs) - implementation(libs.jsoup) implementation(libs.koin.android) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt index ace95653..d3c76b50 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt @@ -29,11 +29,6 @@ import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsControllerCompat import androidx.lifecycle.Lifecycle import androidx.lifecycle.flowWithLifecycle -import com.afollestad.materialdialogs.LayoutMode -import com.afollestad.materialdialogs.MaterialDialog -import com.afollestad.materialdialogs.bottomsheets.BottomSheet -import com.afollestad.materialdialogs.callbacks.onDismiss -import com.afollestad.materialdialogs.customview.customView import com.android.launcher3.GestureNavContract import com.google.accompanist.systemuicontroller.rememberSystemUiController import de.mm20.launcher2.preferences.Settings