summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaindropsSys <contact@minteck.org>2023-03-15 22:41:52 +0100
committerRaindropsSys <contact@minteck.org>2023-03-15 22:41:52 +0100
commitaa35a851a3521ee0c5626f0af1ab2e6342b48399 (patch)
treeb5719bd0c774413e19ffbb693315214f66e5a52e
parent7259fc1d1cc7d6cfbda8d51b3848cd41be97e548 (diff)
downloaddelta-android-aa35a851a3521ee0c5626f0af1ab2e6342b48399.tar.gz
delta-android-aa35a851a3521ee0c5626f0af1ab2e6342b48399.tar.bz2
delta-android-aa35a851a3521ee0c5626f0af1ab2e6342b48399.zip
Updated 8 files (automated)
-rw-r--r--.idea/gradle.xml4
-rw-r--r--.idea/misc.xml3
-rw-r--r--.idea/vcs.xml1
-rw-r--r--app/build.gradle.kts3
-rw-r--r--app/src/main/java/dev/equestria/delta/MainActivity.kt8
-rw-r--r--build.gradle.kts4
-rw-r--r--gradle.properties3
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
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 @@
<option name="externalProjectPath" value="/Volumes/Unicorn/delta-android" />
<option name="modules">
<set>
- <option value="/Volumes/Unicorn/delta-android" />
- <option value="/Volumes/Unicorn/delta-android/app" />
+ <option value="/Volumes/Projects/delta-android" />
+ <option value="/Volumes/Projects/delta-android/app" />
</set>
</option>
</GradleProjectSettings>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
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 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="/Volumes/Projects/delta-android" vcs="Git" />
<mapping directory="/Volumes/Unicorn/delta-android" vcs="Git" />
</component>
</project> \ 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