From 8f7895e219455bf5272cfcccff1c6921dc2740c4 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 21 Dec 2022 16:59:26 +0100
Subject: [PATCH] tweaking widget text sizes

---
 .../calculator/activities/WidgetConfigureActivity.kt        | 2 ++
 .../calculator/helpers/MyWidgetProvider.kt                  | 6 ++++--
 app/src/main/res/values/integers.xml                        | 4 ++++
 app/src/main/res/values/styles.xml                          | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values/integers.xml

diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt
index f54aa995..226f2f94 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt
@@ -134,12 +134,14 @@ class WidgetConfigureActivity : SimpleActivity() {
             R.id.btn_9, R.id.btn_percent, R.id.btn_power, R.id.btn_root, R.id.btn_clear, R.id.btn_reset, R.id.btn_divide, R.id.btn_multiply,
             R.id.btn_minus, R.id.btn_plus, R.id.btn_decimal, R.id.btn_equals
         )
+
         result.setTextColor(mTextColor)
         formula.setTextColor(mTextColor)
         config_save.setTextColor(getProperPrimaryColor().getContrastColor())
 
         viewIds.forEach {
             (findViewById<Button>(it)).setTextColor(mTextColor)
+            (findViewById<Button>(it)).background = null
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt
index 45cdd3e1..281fbd2d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt
@@ -13,6 +13,7 @@ import com.simplemobiletools.calculator.activities.MainActivity
 import com.simplemobiletools.calculator.extensions.config
 import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.setText
+import com.simplemobiletools.commons.extensions.setTextSize
 
 class MyWidgetProvider : AppWidgetProvider(), Calculator {
     companion object {
@@ -55,7 +56,7 @@ class MyWidgetProvider : AppWidgetProvider(), Calculator {
             views.setViewVisibility(R.id.btn_reset, View.VISIBLE)
             views.applyColorFilter(R.id.widget_background, config.widgetBgColor)
 
-            updateTextColors(views, config.widgetTextColor)
+            updateTextColors(views, config.widgetTextColor, context)
             setupDecimalSeparator(views, config.useCommaAsDecimalMark)
             appWidgetManager.updateAppWidget(it, views)
         }
@@ -77,7 +78,7 @@ class MyWidgetProvider : AppWidgetProvider(), Calculator {
         views.setOnClickPendingIntent(id, pendingIntent)
     }
 
-    private fun updateTextColors(views: RemoteViews, color: Int) {
+    private fun updateTextColors(views: RemoteViews, color: Int, context: Context) {
         val viewIds = intArrayOf(
             R.id.formula, R.id.result, R.id.btn_0, R.id.btn_1, R.id.btn_2, R.id.btn_3, R.id.btn_4, R.id.btn_5, R.id.btn_6,
             R.id.btn_7, R.id.btn_8, R.id.btn_9, R.id.btn_percent, R.id.btn_power, R.id.btn_root, R.id.btn_clear, R.id.btn_reset, R.id.btn_divide,
@@ -86,6 +87,7 @@ class MyWidgetProvider : AppWidgetProvider(), Calculator {
 
         for (i in viewIds) {
             views.setTextColor(i, color)
+            views.setTextSize(i, context.resources.getInteger(R.integer.widget_text_size).toFloat())
         }
     }
 
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 00000000..273536bf
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="widget_text_size">22</integer>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index efb2c444..338d0bf7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
     <style name="AppTheme" parent="AppTheme.Base" />
 
     <style name="MyButton">
+        <item name="android:background">@null</item>
         <item name="android:textSize">@dimen/button_text_size</item>
         <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:textAllCaps">false</item>