diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8683c1a76..5e29853e5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,7 +14,6 @@ plugins { alias(libs.plugins.jetbrains.kotlin.parcelize) alias(libs.plugins.jetbrains.kotlin.serialization) alias(libs.plugins.google.ksp) - alias(libs.plugins.androidx.navigation) alias(libs.plugins.ktlint) alias(libs.plugins.rikka.tools.refine.plugin) alias(libs.plugins.hilt.android.plugin) @@ -128,23 +127,25 @@ configure { create("vanilla") { isDefault = true dimension = "device" + buildConfigField("Boolean", "SHOW_ANONYMOUS_LOGIN", "true") } create("huawei") { dimension = "device" versionNameSuffix = "-hw" + buildConfigField("Boolean", "SHOW_ANONYMOUS_LOGIN", "false") } // This flavor is only for preloaded devices / users who push the app to system create("preload") { dimension = "device" versionNameSuffix = "-preload" + buildConfigField("Boolean", "SHOW_ANONYMOUS_LOGIN", "true") } } buildFeatures { buildConfig = true - viewBinding = true aidl = true compose = true } @@ -193,8 +194,6 @@ dependencies { implementation(libs.androidx.lifecycle.viewmodel.ktx) implementation(libs.androidx.lifecycle.navigation3) implementation(libs.androidx.preference.ktx) - implementation(libs.androidx.swiperefreshlayout) - implementation(libs.androidx.viewpager2) implementation(libs.androidx.work.runtime.ktx) implementation(libs.androidx.paging.runtime) @@ -205,13 +204,12 @@ dependencies { implementation(libs.androidx.navigation3.runtime) implementation(libs.androidx.navigation3.ui) implementation(libs.kotlinx.serialization.json) - implementation(libs.androidx.navigation.fragment.ktx) - implementation(libs.androidx.navigation.ui.ktx) implementation(libs.androidx.activity.compose) implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.material3) + implementation(libs.androidx.compose.runtime.livedata) implementation(libs.androidx.ui) implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) @@ -225,13 +223,6 @@ dependencies { implementation(libs.coil.compose) implementation(libs.coil.network) - // Shimmer - implementation(libs.facebook.shimmer) - - // Epoxy - implementation(libs.airbnb.epoxy.android) - ksp(libs.airbnb.epoxy.processor) - // HTTP Clients implementation(libs.squareup.okhttp) diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 1957cd575..c93bbf511 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -19,8 +19,8 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logo_alt.xml b/app/src/main/res/drawable/ic_logo_alt.xml new file mode 100644 index 000000000..0b363e48b --- /dev/null +++ b/app/src/main/res/drawable/ic_logo_alt.xml @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 0d0e9d687..7bbd3f99c 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -3,7 +3,6 @@ diff --git a/app/src/main/res/values-v26/styles_text.xml b/app/src/main/res/values-v26/styles_text.xml deleted file mode 100644 index 7de3434b0..000000000 --- a/app/src/main/res/values-v26/styles_text.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 7c98db554..f9b4cc56f 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -19,51 +19,6 @@ --> - - 12sp - 13sp - 14sp - 15sp - 16sp - 17sp - 18sp - 19sp - 20sp - - - 24sp - 25sp - 26sp - 27sp - 28sp - 29sp - 30sp - 31sp - 32sp - 33sp - 34sp - 35sp - 36sp - 37sp - 38sp - 39sp - 40sp - 41sp - 42sp - 43sp - 44sp - 45sp - 46sp - 47sp - 48sp - - - - 0 - 1 - 2 - - @string/pref_updates_auto_off @string/pref_updates_auto_notify @@ -115,18 +70,18 @@ @string/about_libera_summary + + @string/pref_theme_style_system + @string/pref_theme_style_light + @string/pref_theme_style_dark + + @string/title_apps @string/title_games @string/title_updates - - 0 - 1 - 2 - - 0 1.0 @@ -174,10 +129,4 @@ 80798000 82201710 - - - 0 - 1 - 2 - diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index abde5e933..000000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 02e3e3506..afdfd7d90 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,9 +21,4 @@ #6C63FF #6C63FF - - - #E4002B - #FF9933 - #49A942 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 3bebb6e80..a29bb956f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -42,6 +42,7 @@ 72dp 80dp 108dp + 192dp 192dp @@ -71,4 +72,6 @@ 10dp 12dp 16dp + + 5dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7df15ff0..061af3343 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,14 +236,14 @@ "App not found" "Could not get files" "Session expired, re-login to obtain new session." - Log in and enjoy. - Woah! All good. - Getting things ready… - Please log in to your Google Play account - Could not log in via Google - Last session scrapped - Verifying session - Verifying Google session + "Log in and enjoy." + "All good." + "Getting things ready…" + "Please log in to your Google Play account" + "Could not log in via Google" + "Last session scrapped" + "Verifying session" + "Verifying Google session" "Make sure you re-login to apply the spoof" "Make sure you re-login and restart app to apply changes." "Categories" @@ -342,6 +342,10 @@ Failed to generate session, error code: %1$d Check internet connectivity App language + Theme + Follow system + Light + Dark Layout Select default tab App links @@ -560,4 +564,7 @@ Loading in progress Page %1$d + + + "Check" diff --git a/app/src/main/res/values/styles_text.xml b/app/src/main/res/values/styles_text.xml deleted file mode 100644 index 0eac122eb..000000000 --- a/app/src/main/res/values/styles_text.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/styles_widget.xml b/app/src/main/res/values/styles_widget.xml deleted file mode 100644 index 7ba934543..000000000 --- a/app/src/main/res/values/styles_widget.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b4220a9af..cc9850a12 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -21,7 +21,6 @@ @@ -38,26 +37,5 @@ - - - - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 46a2a3caa..f70913682 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,17 +6,16 @@ [versions] activity = "1.13.0" +adaptive = "1.3.0-beta01" agCoreservice = "13.3.1.300" -androidGradlePlugin = "9.2.0" -adaptive = "1.3.0-alpha10" +androidGradlePlugin = "9.2.1" androidx-hilt = "1.3.0" androidx-junit = "1.3.0" browser = "1.10.0" coil = "3.4.0" -composeBom = "2026.04.01" -composeMaterial = "1.5.0-alpha18" +composeBom = "2026.05.00" +composeMaterial = "1.5.0-alpha19" core = "1.18.0" -epoxy = "5.2.1" espresso = "3.7.0" gplayapi = "3.5.9" hiddenapibypass = "6.1" @@ -28,11 +27,11 @@ ktlint = "14.2.0" leakcanary = "2.14" libsu = "6.0.0" lifecycle = "2.10.0" -material = "1.13.0" +material = "1.14.0" navigation = "2.9.8" navigation3 = "1.1.1" okhttp = "5.3.2" -paging = "3.4.2" +paging = "3.5.0" preference = "1.2.1" processPhoenix = "3.0.0" protobufJavalite = "4.34.1" @@ -40,32 +39,25 @@ rikkaHiddenAPI = "4.4.0" rikkaTools = "4.4.0" room = "2.8.4" serialization = "1.11.0" -shimmer = "0.5.0" shizuku = "13.1.5" -swiperefreshlayout = "1.2.0" truth = "1.4.5" -viewpager2 = "1.1.0" work = "2.11.2" [libraries] -huawei-hms-coreservice = { module = "com.huawei.hms:ag-coreservice", version.ref = "agCoreservice" } -airbnb-epoxy-android = { module = "com.airbnb.android:epoxy", version.ref = "epoxy" } -airbnb-epoxy-processor = { module = "com.airbnb.android:epoxy-processor", version.ref = "epoxy" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity" } -androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" } -androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } -androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core" } androidx-adaptive-core = { module = "androidx.compose.material3.adaptive:adaptive", version.ref = "adaptive" } androidx-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "adaptive" } androidx-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version.ref = "adaptive" } +androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata" } +androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core" } androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } androidx-hilt-viewmodel = { module = "androidx.hilt:hilt-lifecycle-viewmodel-compose", version.ref = "androidx-hilt" } androidx-junit = { module = "androidx.test.ext:junit-ktx", version.ref = "androidx-junit" } -androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } androidx-lifecycle-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycle" } +androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" } androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeMaterial" } -androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" } -androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" } androidx-navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" } androidx-navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" } androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging" } @@ -73,22 +65,19 @@ androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.r androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preference" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } -androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "room" } -androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" } +androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } androidx-ui = { group = "androidx.compose.ui", name = "ui" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } -androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version.ref = "viewpager2" } androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "work" } auroraoss-gplayapi = { module = "com.auroraoss:gplayapi", version.ref = "gplayapi" } -coil-kt = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } +coil-kt = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } coil-network = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" } -facebook-shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "shimmer" } github-topjohnwu-libsu = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu" } google-android-material = { module = "com.google.android.material:material", version.ref = "material" } google-protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobufJavalite" } @@ -98,6 +87,7 @@ hilt-android-core = { module = "com.google.dagger:hilt-android", version.ref = " hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } hilt-androidx-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } hilt-androidx-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" } +huawei-hms-coreservice = { module = "com.huawei.hms:ag-coreservice", version.ref = "agCoreservice" } junit = { module = "junit:junit", version.ref = "junit" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } lsposed-hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version.ref = "hiddenapibypass" } @@ -114,8 +104,8 @@ android-application = { id = "com.android.application", version.ref = "androidGr androidx-navigation = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } hilt-android-plugin = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } rikka-tools-refine-plugin = { id = "dev.rikka.tools.refine", version.ref = "rikkaTools" }