Merge pull request #174 from Yet-Zio/v2.0.5

v2.0.5

Author: Yet-Zio

app/build.gradle.kts

@@ -25,8 +25,8 @@ android {
         applicationId = "yetzio.yetcalc"
         minSdk = 28
         targetSdk = 35
-        versionCode = 20
-        versionName = "2.0.4"
+        versionCode = 21
+        versionName = "2.0.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -20,6 +20,8 @@ object SharedPrefs {
     const val LEFTJUSTRES = "leftjustifyres"
     const val LEFTJUSTPGRES = "leftjustifypgres"
     const val DATEFMTKEY = "dateFormatKey"
+    const val SYSFONTCALCKEY = "usesystemfontcalc"
+    const val SYSFONTPGCALCKEY = "usesystemfontpgcalc"
 
     // CONVERTER KEYS
     const val SAVE_RECENT_TABKEY = "saverecenttabkey"

app/src/main/java/yetzio/yetcalc/views/CalculatorActivity.kt

@@ -4,6 +4,7 @@ import android.animation.ObjectAnimator
 import android.app.Activity
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.View
 import android.widget.ArrayAdapter
@@ -14,6 +15,7 @@ import android.widget.LinearLayout
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.button.MaterialButton
@@ -153,6 +155,11 @@ class CalculatorActivity : CalcBaseActivity(), View.OnClickListener {
             }
         })
 
+        val fontPref = preferences.getBoolean(SharedPrefs.SYSFONTCALCKEY, false)
+        if(fontPref){
+            textexpression.typeface = Typeface.DEFAULT
+        }
+
         textres = findViewById(R.id.textres)
 
         if(getScreenOrientation(applicationContext) == Configuration.ORIENTATION_PORTRAIT){
@@ -277,6 +284,15 @@ class CalculatorActivity : CalcBaseActivity(), View.OnClickListener {
         }
 
         settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()){
+            val newFontPref = preferences.getBoolean(SharedPrefs.SYSFONTCALCKEY, false)
+            if(newFontPref){
+                textexpression.typeface = Typeface.DEFAULT
+            }
+            else{
+                val customFont = ResourcesCompat.getFont(this, R.font.nunitosans)
+                textexpression.typeface = customFont
+            }
+
             val almInt = preferences.getBoolean(SharedPrefs.ALMINTKEY, true)
             val canInt = preferences.getBoolean(SharedPrefs.CANINTKEY, false)
             val precisionChoice = preferences.getString(SharedPrefs.PRECKEY, "Default precision")

app/src/main/java/yetzio/yetcalc/views/ProgramCalcActivity.kt

@@ -3,6 +3,7 @@ package yetzio.yetcalc.views
 import android.animation.ObjectAnimator
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.View
 import android.widget.FrameLayout
@@ -11,6 +12,7 @@ import android.widget.LinearLayout
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
@@ -138,6 +140,14 @@ class ProgramCalcActivity : CalcBaseActivity(), View.OnClickListener{
         mviewModel = ViewModelProvider(this)[ProgramCalcViewModel::class.java]
         mviewModel.hapticPref = preferences.getBoolean(SharedPrefs.HAPTICKEY, true)
         settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()){
+            val newfontPref = preferences.getBoolean(SharedPrefs.SYSFONTPGCALCKEY, false)
+            if(newfontPref){
+                textexpression.typeface = Typeface.DEFAULT
+            }
+            else{
+                val customFont = ResourcesCompat.getFont(this, R.font.nunitosans)
+                textexpression.typeface = customFont
+            }
             mviewModel.hapticPref = preferences.getBoolean(SharedPrefs.HAPTICKEY, true)
         }
         settingsBt = findViewById(R.id.settingsButton)
@@ -165,6 +175,11 @@ class ProgramCalcActivity : CalcBaseActivity(), View.OnClickListener{
             }
         })
 
+        val fontPref = preferences.getBoolean(SharedPrefs.SYSFONTPGCALCKEY, false)
+        if(fontPref){
+            textexpression.typeface = Typeface.DEFAULT
+        }
+
         textres = findViewById(R.id.textres)
 
         if(getScreenOrientation(applicationContext) == Configuration.ORIENTATION_PORTRAIT){

app/src/main/res/drawable/systemfont.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M9.93,13.5h4.14L12,7.98 9.93,13.5zM20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM15.71,17.88l-0.9,-2.38L9.17,15.5l-0.89,2.37c-0.14,0.38 -0.5,0.63 -0.91,0.63 -0.68,0 -1.15,-0.69 -0.9,-1.32l4.25,-10.81c0.22,-0.53 0.72,-0.87 1.28,-0.87s1.06,0.34 1.27,0.87l4.25,10.81c0.25,0.63 -0.22,1.32 -0.9,1.32 -0.4,0 -0.76,-0.25 -0.91,-0.62z"/>
+    
+</vector>