From aa35a851a3521ee0c5626f0af1ab2e6342b48399 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Wed, 15 Mar 2023 22:41:52 +0100 Subject: Updated 8 files (automated) --- .idea/gradle.xml | 4 ++-- .idea/misc.xml | 3 +-- .idea/vcs.xml | 1 + app/build.gradle.kts | 3 ++- app/src/main/java/dev/equestria/delta/MainActivity.kt | 8 +++++++- build.gradle.kts | 4 ++-- gradle.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d58262b..16aa624 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -9,8 +9,8 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 1896758..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,6 @@ - - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d10e87f..3a3c97b 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,7 @@ + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 669068d..1945840 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ android { minSdk = 27 targetSdk = 33 versionCode = 2 - versionName = "5.0-8" + versionName = "5.0-9" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" resConfigs("en", "fr") @@ -35,6 +35,7 @@ android { kotlinOptions { jvmTarget = "1.8" } + buildToolsVersion = "33.0.1" buildFeatures { viewBinding = true } diff --git a/app/src/main/java/dev/equestria/delta/MainActivity.kt b/app/src/main/java/dev/equestria/delta/MainActivity.kt index 7e239c6..341e1f4 100644 --- a/app/src/main/java/dev/equestria/delta/MainActivity.kt +++ b/app/src/main/java/dev/equestria/delta/MainActivity.kt @@ -325,7 +325,13 @@ class MainActivity : AppCompatActivity() { url ).path.startsWith("/support/") || URL(url).path === "/support" || URL(url).path.startsWith( "/mobile_profile/" - ) || URL(url).path === "/mobile_profile" + ) || URL(url).path === "/mobile_profile" || URL(url).path.startsWith( + "/beta/" + ) || URL(url).path === "/beta" || URL(url).path.startsWith( + "/studio/" + ) || URL(url).path === "/studio" || URL(url).path.startsWith( + "/logout/" + ) || URL(url).path === "/logout" ) { changedNavItem = true binding.navigationBar.selectedItemId = R.id.navigation_profile diff --git a/build.gradle.kts b/build.gradle.kts index 6ee2f34..3ed979a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,8 +15,8 @@ buildscript { } plugins { - id("com.android.application") version "8.0.0-alpha11" apply false - id("com.android.library") version "8.0.0-alpha11" apply false + id("com.android.application") version "8.1.0-alpha08" apply false + id("com.android.library") version "8.1.0-alpha08" apply false id("org.jetbrains.kotlin.android") version "1.7.21" apply false } diff --git a/gradle.properties b/gradle.properties index 3c5031e..f19c7b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,5 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fab501d..f9e8871 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Dec 27 09:59:20 CET 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit