Merge pull request #1 from Lyneon/dev

Complete v1.4.2

.gitignore

@@ -16,5 +16,5 @@ local.properties
 /app/src/androidTest/java/com/lyneon/cytoidinfoquerier/
 /app/src/test/java/com/lyneon/cytoidinfoquerier/
 /.idea/deploymentTargetDropDown.xml
-/app/src/main/java/com/lyneon/cytoidinfoquerier/SecretData.kt
 /.idea/
+/app/src/main/java/com/lyneon/cytoidinfoquerier/Secret.kt

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.lyneon.cytoidinfoquerier"
         minSdk = 24
         targetSdk = 34
-        versionCode = 5
-        versionName = "1.3.1"
+        versionCode = 8
+        versionName = "1.4.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -29,7 +29,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
@@ -58,33 +58,37 @@ android {
 }
 
 dependencies {
-    val navVersion = "2.7.5"
-    val appCenterSdkVersion = "5.0.3"
+    val navVersion = "2.7.7"
+    val appCenterSdkVersion = "5.0.4"
+    val media3Version = "1.3.0"
+    val composeBomVersion = "2024.02.02"
 
     implementation("com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}")
     implementation("com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}")
     implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
     implementation("io.coil-kt:coil-compose:2.5.0")
-    implementation("com.tencent:mmkv:1.3.2")
+    implementation("com.tencent:mmkv:1.3.3")
     implementation("androidx.navigation:navigation-compose:$navVersion")
+    implementation("androidx.compose.material:material-icons-extended:1.6.3")
     implementation("dev.shreyaspatil:capturable:1.0.3")
+    implementation("com.patrykandpatrick.vico:compose-m3:1.14.0")
+    implementation("androidx.media3:media3-exoplayer:$media3Version")
 
     implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.1")
-    implementation(platform("androidx.compose:compose-bom:2023.10.01"))
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation(platform("androidx.compose:compose-bom:$composeBomVersion"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation(platform("androidx.compose:compose-bom:2023.10.01"))
+    implementation(platform("androidx.compose:compose-bom:$composeBomVersion"))
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:$composeBomVersion"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 }

app/src/main/AndroidManifest.xml

@@ -9,6 +9,10 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
+    <queries>
+        <package android:name="me.tigerhix.cytoid" />
+    </queries>
+
     <application
         android:name=".BaseApplication"
         android:allowBackup="true"

app/src/main/java/com/lyneon/cytoidinfoquerier/BaseApplication.kt

@@ -4,26 +4,41 @@ import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Intent
 import android.os.Looper
+import android.os.Process
 import androidx.compose.material3.DrawerState
+import com.lyneon.cytoidinfoquerier.data.constant.CytoidConstant
 import com.lyneon.cytoidinfoquerier.ui.activity.CrashActivity
 import com.microsoft.appcenter.crashes.Crashes
 import com.tencent.mmkv.MMKV
 import java.lang.Thread.UncaughtExceptionHandler
 
-
-const val isDebugging = true
-
 class BaseApplication : Application() {
     companion object {
         @SuppressLint("StaticFieldLeak")
         lateinit var context: BaseApplication
         lateinit var globalDrawerState: DrawerState
+        var cytoidIsInstalled = false
+
+        fun restartApp() {
+            val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            if (intent != null) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                context.startActivity(intent)
+            }
+            Process.killProcess(Process.myPid())
+        }
     }
 
+    @SuppressLint("QueryPermissionsNeeded")
     override fun onCreate() {
         super.onCreate()
         context = this
         Thread.setDefaultUncaughtExceptionHandler(CrashHandler())
+        for (installedPackage in packageManager.getInstalledPackages(0)) {
+            if (installedPackage.packageName == CytoidConstant.gamePackageName) {
+                cytoidIsInstalled = true
+            }
+        }
         MMKV.initialize(this)
     }
 }

app/src/main/java/com/lyneon/cytoidinfoquerier/GlobalObject.kt

@@ -0,0 +1,7 @@
+package com.lyneon.cytoidinfoquerier
+
+import kotlinx.serialization.json.Json
+
+val json = Json {
+    ignoreUnknownKeys = true
+}

app/src/main/java/com/lyneon/cytoidinfoquerier/data/CytoidDeepLink.kt

@@ -0,0 +1,5 @@
+package com.lyneon.cytoidinfoquerier.data
+
+object CytoidDeepLink {
+    fun getCytoidLevelDeepLink(levelUID: String): String = "cytoid://levels/$levelUID"
+}

app/src/main/java/com/lyneon/cytoidinfoquerier/data/GraphQL.kt

@@ -0,0 +1,5 @@
+package com.lyneon.cytoidinfoquerier.data
+
+object GraphQL {
+    fun getQueryString(query: String): String = """{"operationName":null,"variables":{},"query":"${query.replace("\n", "\\n").replace("\"", "\\\"")}"}"""
+}

app/src/main/java/com/lyneon/cytoidinfoquerier/model/Character.kt → app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/Character.kt

@@ -1,4 +1,4 @@
-package com.lyneon.cytoidinfoquerier.model
+package com.lyneon.cytoidinfoquerier.data.constant
 
 object Character {
     const val sayaka = "Sayaka"

app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/CytoidColors.kt

@@ -0,0 +1,23 @@
+package com.lyneon.cytoidinfoquerier.data.constant
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+
+object CytoidColors {
+    val easyColor = listOf(Color(0xff67b26f), Color(0xff4ca2cd))
+    val hardColor = listOf(Color(0xff4568dc), Color(0xffb06abc))
+    val extremeColor = listOf(Color(0xff200122), Color(0xff6f0000))
+    val accentColor = Color(165, 180, 252)
+    val backgroundColor = Color(39, 41, 53)
+    val sssColor = listOf(Color(0xffffc53d), Color(0xffff5e07))
+    val maxColor = listOf(Color(0xffec00c6), Color(0xff0096ff))
+    val perfectColor = Color(0xff60a5fa)
+    val greatColor = Color(0xfffacc15)
+    val goodColor = Color(0xff4ade80)
+    val badColor = Color(0xfff87171)
+    val missColor = Color(0xff94a3b8)
+}
+
+fun List<Color>.toIntList() = this.map { it.toArgb() }
+
+fun List<Color>.toIntArray() = this.toIntList().toIntArray()

app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/CytoidConstant.kt

@@ -0,0 +1,7 @@
+package com.lyneon.cytoidinfoquerier.data.constant
+
+object CytoidConstant {
+    const val gamePackageName = "me.tigerhix.cytoid"
+    const val gameAndroidDataPath = "Android/data/$gamePackageName"
+    const val chartsPath = "$gameAndroidDataPath/files/Cytoid"
+}

app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/CytoidScoreRange.kt

@@ -0,0 +1,14 @@
+package com.lyneon.cytoidinfoquerier.data.constant
+
+object CytoidScoreRange {
+    val max = 1000000
+    val sss = 999000 until 1000000
+    val ss = 995000 until 999000
+    val s = 990000 until 995000
+    val aa = 950000 until 990000
+    val a = 900000 until 950000
+    val b = 800000 until 900000
+    val c = 700000 until 800000
+    val d = 600000 until 700000
+    val f = 0 until 600000
+}

app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/MMKVKeys.kt

@@ -0,0 +1,7 @@
+package com.lyneon.cytoidinfoquerier.data.constant
+
+object MMKVKeys {
+    const val ENABLE_APP_CENTER = "ENABLE_APP_CENTER"
+    const val GRID_COLUMNS_COUNT_PORTRAIT = "GRID_COLUMNS_COUNT_PORTRAIT"
+    const val GRID_COLUMNS_COUNT_LANDSCAPE = "GRID_COLUMNS_COUNT_LANDSCAPE"
+}

app/src/main/java/com/lyneon/cytoidinfoquerier/ui/compose/NavRoute.kt → app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/NavRoute.kt

@@ -1,8 +1,9 @@
-package com.lyneon.cytoidinfoquerier.ui.compose
+package com.lyneon.cytoidinfoquerier.data.constant
 
 object NavRoute {
     const val home = "home"
     const val analytics = "analytics"
     const val profile = "profile"
     const val settings = "settings"
+    const val gridColumnsSetting = "gridColumnsSetting"
 }

app/src/main/java/com/lyneon/cytoidinfoquerier/model/graphql/RecordQueryOrder.kt → app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/RecordQueryOrder.kt

@@ -1,4 +1,4 @@
-package com.lyneon.cytoidinfoquerier.model.graphql
+package com.lyneon.cytoidinfoquerier.data.constant
 
 object RecordQueryOrder {
     const val ASC = "ASC"

app/src/main/java/com/lyneon/cytoidinfoquerier/model/graphql/RecordQuerySort.kt → app/src/main/java/com/lyneon/cytoidinfoquerier/data/constant/RecordQuerySort.kt

@@ -1,4 +1,4 @@
-package com.lyneon.cytoidinfoquerier.model.graphql
+package com.lyneon.cytoidinfoquerier.data.constant
 
 object RecordQuerySort {
     const val Score = "Score"