fixed unit conv and added simplified chinese translation to system settings

Author: Yet-Zio

.gitignore

@@ -1,6 +1,8 @@
 *.iml
 .gradle
 /local.properties
+/.idea
+/.idea/discord.xml
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

app/build.gradle.kts

@@ -17,12 +17,16 @@ android {
         excludeFields = arrayOf("generated")
     }
 
+    androidResources {
+        generateLocaleConfig = true
+    }
+
     defaultConfig {
         applicationId = "yetzio.yetcalc"
         minSdk = 28
         targetSdk = 35
-        versionCode = 19
-        versionName = "2.0.3"
+        versionCode = 20
+        versionName = "2.0.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/yetzio/yetcalc/component/UnitConv.kt

@@ -1189,8 +1189,8 @@ class UnitConv{
                 return rankine * 5/9
             }
 
-            fun DelisleToKel(delisle: Double): Double{
-                return (delisle + 100)/1.5000 + abs_zero
+            fun DelisleToKel(delisle: Double): Double {
+                return 373.15 - (delisle / 1.5)
             }
 
             fun NewtonToKel(newton: Double): Double{
@@ -1275,24 +1275,24 @@ class UnitConv{
                 return (kelvin - abs_zero) * 9/5 + 32
             }
 
-            fun KelToRankine(kelvin: Double): Double{
-                return kelvin / 5/9
+            fun KelToRankine(kelvin: Double): Double {
+                return kelvin * 9/5
             }
 
-            fun KelToDelisle(kelvin: Double): Double{
-                return (kelvin - 100)*1.5000 - abs_zero
+            fun KelToDelisle(kelvin: Double): Double {
+                return (373.15 - kelvin) * 1.5
             }
 
-            fun KelToNewton(kelvin: Double): Double{
-                return (kelvin*0.33000) - abs_zero
+            fun KelToNewton(kelvin: Double): Double {
+                return (kelvin - abs_zero) * 0.33
             }
 
-            fun KelToReaumur(kelvin: Double): Double{
-                return (kelvin*0.80000) - abs_zero
+            fun KelToReaumur(kelvin: Double): Double {
+                return (kelvin - abs_zero) * 0.8
             }
 
-            fun KelToRomer(kelvin: Double): Double{
-                return (kelvin + 7.5)*0.52500 - abs_zero
+            fun KelToRomer(kelvin: Double): Double {
+                return (kelvin - abs_zero) * 21/40 + 7.5
             }
 
             fun KelToYoctoKel(kelvin: Double): Double{

app/src/main/java/yetzio/yetcalc/component/operators/ProgrammerOps.kt

@@ -37,20 +37,6 @@ class InfixOrOperator : AbstractOperator() {
     }
 }
 
-//@PrefixOperator(precedence = OPERATOR_PRECEDENCE_UNARY)
-//class PrefixNotOperator: AbstractOperator() {
-//    @Throws(EvaluationException::class)
-//    override fun evaluate(
-//        expression: Expression, operatorToken: Token?, vararg operands: EvaluationValue
-//    ): EvaluationValue {
-//        val value = expression.evaluateSubtree(operands[0].expressionNode)
-//
-//        val result = value.stringValue.toLong(10).inv()
-//
-//        return expression.convertValue(result)
-//    }
-//}
-
 @PrefixOperator
 class PrefixNotOperator : AbstractOperator() {
     override fun evaluate(

app/src/main/java/yetzio/yetcalc/config/CalcBaseActivity.kt

@@ -30,7 +30,6 @@ import yetzio.yetcalc.views.ProgramCalcActivity
 import yetzio.yetcalc.views.UnitConvActivity
 import kotlin.properties.Delegates
 
-
 open class CalcBaseActivity : AppCompatActivity() {
     lateinit var theme: String
     lateinit var currentMatYouStyle: String

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="VERSION_NAMEANDNUM">重回正轨 (2.0.3)</string>
+    <string name="VERSION_NAMEANDNUM">重回正轨 (2.0.4)</string>
     <string name="eastereggtoast">你现在拥有了能带领人类撕碎高维度数学难题的完美躯体！(Gigachad.mp4)</string>
     <string name="app_descrp">Yet another calculator by Yet Zio</string>
     <string name="ghbtext">在Github查看</string>

app/src/main/res/values/strings.xml

@@ -1,8 +1,8 @@
 <resources>
     <string name="author_name" translatable="false">Yet Zio</string>
     <string name="app_name" translatable="false">yetCalc</string>
-    <string name="VERSION_NUM" translatable="false">2.0.3</string>
-    <string name="VERSION_NAMEANDNUM">Back in Action (2.0.3)</string>
+    <string name="VERSION_NUM" translatable="false">2.0.4</string>
+    <string name="VERSION_NAMEANDNUM">Back in Action (2.0.4)</string>
     <string name="eastereggtoast">Congratulations, Now you are a Gigachad!</string>
     <string name="app_descrp">Yet another calculator by Yet Zio</string>
     <string name="ghbtext">View on GitHub</string>
@@ -212,7 +212,7 @@
     <string name="helpmenu">Help</string>
 
     <string name="currency_convertertitle">\nCurrency</string>
-    <string name="converter">Unit Converter</string>
+    <string name="converter">Converter</string>
     <string name="from">From</string>
     <string name="to">To</string>
     <string name="amount">Amount</string>

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-aboutlibrariesCore = "11.3.0-rc01"
-agp = "8.7.2"
+aboutlibrariesCore = "11.3.0-rc02"
+agp = "8.7.3"
 desugar_jdk_libs = "2.1.3"
 dynamicToastsVersion = "4.3.0"
 evalex = "3.4.0"
 gson = "2.11.0"
-kotlin = "1.9.0"
+kotlin = "2.1.0"
 coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -18,7 +18,7 @@ activity = "1.9.3"
 constraintlayout = "2.2.0"
 mathparserOrgMxparser = "4.4.3"
 preferenceKtx = "1.2.1"
-navigationUiKtx = "2.8.4"
+navigationUiKtx = "2.8.5"
 
 [libraries]
 aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibrariesCore" }
@@ -46,5 +46,5 @@ androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version = "11.3.0-rc01" }
+aboutLibraries = { id = "com.mikepenz.aboutlibraries.plugin", version = "11.3.0-rc02" }