Merge pull request #166 from Yet-Zio/v2.0.4

v2.0.4

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
@@ -158,20 +157,20 @@ open class CalcBaseActivity : AppCompatActivity() {
         val items = when (currentView) {
             CalcView.CALCULATOR -> {
                 listOf(
-                    Pair("Converter", R.drawable.ic_baseline_cyclone_24),
-                    Pair("Programmer", R.drawable.ic_baseline_code_24)
+                    Pair(getString(R.string.converter), R.drawable.ic_baseline_cyclone_24),
+                    Pair(getString(R.string.programmer), R.drawable.ic_baseline_code_24)
                 )
             }
             CalcView.CONVERTER -> {
                 listOf(
-                    Pair("Calculator", R.drawable.ic_baseline_calculate_24),
-                    Pair("Programmer", R.drawable.ic_baseline_code_24)
+                    Pair(getString(R.string.calculator), R.drawable.ic_baseline_calculate_24),
+                    Pair(getString(R.string.programmer), R.drawable.ic_baseline_code_24)
                 )
             }
             else -> {
                 listOf(
-                    Pair("Calculator", R.drawable.ic_baseline_calculate_24),
-                    Pair("Converter", R.drawable.ic_baseline_cyclone_24)
+                    Pair(getString(R.string.calculator), R.drawable.ic_baseline_calculate_24),
+                    Pair(getString(R.string.converter), R.drawable.ic_baseline_cyclone_24)
                 )
             }
         }
@@ -183,15 +182,15 @@ open class CalcBaseActivity : AppCompatActivity() {
 
         when(currentView){
             CalcView.CALCULATOR -> {
-                modeTV?.setText("Calculator", false)
+                modeTV?.setText(getString(R.string.calculator), false)
                 modeSelector.setStartIconDrawable(R.drawable.ic_baseline_calculate_24)
             }
             CalcView.CONVERTER -> {
-                modeTV?.setText("Converter", false)
+                modeTV?.setText(getString(R.string.converter), false)
                 modeSelector.setStartIconDrawable(R.drawable.ic_baseline_cyclone_24)
             }
             else -> {
-                modeTV?.setText("Programmer", false)
+                modeTV?.setText(getString(R.string.programmer), false)
                 modeSelector.setStartIconDrawable(R.drawable.ic_baseline_code_24)
             }
         }

app/src/main/res/resources.properties

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