fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaking widget text sizes

This commit is contained in:
tibbi 2022-12-21 16:59:26 +01:00
parent c6c351825b
commit 8f7895e219
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt
View File

@ -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_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 R.id.btn_minus, R.id.btn_plus, R.id.btn_decimal, R.id.btn_equals
) )
result.setTextColor(mTextColor) result.setTextColor(mTextColor)
formula.setTextColor(mTextColor) formula.setTextColor(mTextColor)
config_save.setTextColor(getProperPrimaryColor().getContrastColor()) config_save.setTextColor(getProperPrimaryColor().getContrastColor())
viewIds.forEach { viewIds.forEach {
(findViewById<Button>(it)).setTextColor(mTextColor) (findViewById<Button>(it)).setTextColor(mTextColor)
(findViewById<Button>(it)).background = null
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/MyWidgetProvider.kt
View File

@ -13,6 +13,7 @@ import com.simplemobiletools.calculator.activities.MainActivity
import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.config
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.setText import com.simplemobiletools.commons.extensions.setText
import com.simplemobiletools.commons.extensions.setTextSize
class MyWidgetProvider : AppWidgetProvider(), Calculator { class MyWidgetProvider : AppWidgetProvider(), Calculator {
companion object { companion object {
@ -55,7 +56,7 @@ class MyWidgetProvider : AppWidgetProvider(), Calculator {
views.setViewVisibility(R.id.btn_reset, View.VISIBLE) views.setViewVisibility(R.id.btn_reset, View.VISIBLE)
views.applyColorFilter(R.id.widget_background, config.widgetBgColor) views.applyColorFilter(R.id.widget_background, config.widgetBgColor)
updateTextColors(views, config.widgetTextColor) updateTextColors(views, config.widgetTextColor, context)
setupDecimalSeparator(views, config.useCommaAsDecimalMark) setupDecimalSeparator(views, config.useCommaAsDecimalMark)
appWidgetManager.updateAppWidget(it, views) appWidgetManager.updateAppWidget(it, views)
} }
@ -77,7 +78,7 @@ class MyWidgetProvider : AppWidgetProvider(), Calculator {
views.setOnClickPendingIntent(id, pendingIntent) views.setOnClickPendingIntent(id, pendingIntent)
} }
private fun updateTextColors(views: RemoteViews, color: Int) { private fun updateTextColors(views: RemoteViews, color: Int, context: Context) {
val viewIds = intArrayOf( 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.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, 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) { for (i in viewIds) {
views.setTextColor(i, color) views.setTextColor(i, color)
views.setTextSize(i, context.resources.getInteger(R.integer.widget_text_size).toFloat())
} }
} }

4
app/src/main/res/values/integers.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="widget_text_size">22</integer>
</resources>

1
app/src/main/res/values/styles.xml
View File

@ -3,6 +3,7 @@
<style name="AppTheme" parent="AppTheme.Base" /> <style name="AppTheme" parent="AppTheme.Base" />
<style name="MyButton"> <style name="MyButton">
<item name="android:background">@null</item>
<item name="android:textSize">@dimen/button_text_size</item> <item name="android:textSize">@dimen/button_text_size</item>
<item name="android:fontFamily">sans-serif-light</item> <item name="android:fontFamily">sans-serif-light</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>