Bugfix

Author: helloyanis

src/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.helloyanis.rucoycalculator"
         minSdk = 24
         targetSdk = 34
-        versionCode = 80
-        versionName = "8.0"
+        versionCode = 81
+        versionName = "8.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -66,7 +66,7 @@ dependencies {
     implementation("androidx.datastore:datastore-preferences-rxjava2:1.0.0")
     implementation("androidx.datastore:datastore-preferences-rxjava3:1.0.0")
     implementation("com.google.android.play:core-ktx:1.8.1")
-    implementation("androidx.compose.material3:material3:1.1.2")
-    implementation("androidx.compose.material3:material3-window-size-class:1.1.2")
+    implementation("androidx.compose.material3:material3:1.2.0")
+    implementation("androidx.compose.material3:material3-window-size-class:1.2.0")
 
 }

src/app/src/main/java/com/helloyanis/rucoycalculator/ui/train/TrainFragment.kt

@@ -52,6 +52,7 @@ import com.helloyanis.rucoycalculator.formulas.Formulas.stat55to99_Calc
 import com.helloyanis.rucoycalculator.formulas.Formulas.threshold_Calc
 import com.helloyanis.rucoycalculator.formulas.Formulas.time_to_kill_Calc
 import com.helloyanis.rucoycalculator.formulas.Formulas.total_accuracy_Calc
+import com.helloyanis.rucoycalculator.formulas.Mob
 import com.helloyanis.rucoycalculator.formulas.mobs
 import kotlinx.coroutines.launch
 
@@ -982,14 +983,14 @@ class TrainFragment : Fragment() {
         } else {
             binding.root.findViewById<TextView>(R.id.str0).text=getString(R.string.offlineinvalidinput)
         }
-
     }
     private fun dmg() {
         val base = binding.root.findViewById<EditText>(R.id.baselevel).text.toString().toDouble()
         val stat1 = binding.root.findViewById<EditText>(R.id.stat).text.toString().toDouble()
         val weaponatk = binding.root.findViewById<EditText>(R.id.weaponatk).text.toString().toDouble()
         val attacktype = binding.root.findViewById<Spinner>(R.id.atkstylespinner).selectedItemPosition
-        val mob = binding.root.findViewById<Spinner>(R.id.mobspinner).selectedItemPosition
+        val sortedMobs = mobs.sortedBy { it.mob_level }
+        val mob = mobs.indexOf(sortedMobs[binding.root.findViewById<Spinner>(R.id.mobspinner).selectedItemPosition])
         val str0: String
         val str1: String
         val str2: String

src/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.2.1"
+agp = "8.3.0-rc02"
 org-jetbrains-kotlin-android = "1.9.0"
 core-ktx = "1.12.0"
 junit = "4.13.2"
@@ -8,10 +8,10 @@ espresso-core = "3.5.1"
 appcompat = "1.6.1"
 material = "1.11.0"
 constraintlayout = "2.1.4"
-lifecycle-livedata-ktx = "2.6.2"
-lifecycle-viewmodel-ktx = "2.6.2"
-navigation-fragment-ktx = "2.7.6"
-navigation-ui-ktx = "2.7.6"
+lifecycle-livedata-ktx = "2.7.0"
+lifecycle-viewmodel-ktx = "2.7.0"
+navigation-fragment-ktx = "2.7.7"
+navigation-ui-ktx = "2.7.7"
 
 [libraries]
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }

src/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Sep 21 19:45:34 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists