fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-06-05 21:49:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor code-consistency changes

Browse Source
This commit is contained in:
Naveen
2022-06-04 22:40:34 +05:30
parent a82ee7b113
commit ae0b24bbc6
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
View File

@ -12,8 +12,8 @@ import com.simplemobiletools.calculator.R
import com.simplemobiletools.calculator.databases.CalculatorDatabase import com.simplemobiletools.calculator.databases.CalculatorDatabase
import com.simplemobiletools.calculator.dialogs.HistoryDialog import com.simplemobiletools.calculator.dialogs.HistoryDialog
import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.config
import com.simplemobiletools.calculator.extensions.refreshAppWidget
import com.simplemobiletools.calculator.extensions.updateViewColors import com.simplemobiletools.calculator.extensions.updateViewColors
import com.simplemobiletools.calculator.extensions.updateWidgets
import com.simplemobiletools.calculator.helpers.* import com.simplemobiletools.calculator.helpers.*
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.LICENSE_AUTOFITTEXTVIEW import com.simplemobiletools.commons.helpers.LICENSE_AUTOFITTEXTVIEW
@ -84,7 +84,7 @@ class MainActivity : SimpleActivity(), Calculator {
if (storedUseCommaAsDecimalMark != config.useCommaAsDecimalMark) { if (storedUseCommaAsDecimalMark != config.useCommaAsDecimalMark) {
setupDecimalSeparator() setupDecimalSeparator()
refreshAppWidget<MyWidgetProvider>() updateWidgets()
} }
vibrateOnButtonPress = config.vibrateOnButtonPress vibrateOnButtonPress = config.vibrateOnButtonPress

5
app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
View File

@ -6,8 +6,7 @@ import android.view.Menu
import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.R
import com.simplemobiletools.calculator.extensions.calculatorDB import com.simplemobiletools.calculator.extensions.calculatorDB
import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.config
import com.simplemobiletools.calculator.extensions.refreshAppWidget import com.simplemobiletools.calculator.extensions.updateWidgets
import com.simplemobiletools.calculator.helpers.MyWidgetProvider
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@ -105,7 +104,7 @@ class SettingsActivity : SimpleActivity() {
settings_use_comma_as_decimal_mark_holder.setOnClickListener { settings_use_comma_as_decimal_mark_holder.setOnClickListener {
settings_use_comma_as_decimal_mark.toggle() settings_use_comma_as_decimal_mark.toggle()
config.useCommaAsDecimalMark = settings_use_comma_as_decimal_mark.isChecked config.useCommaAsDecimalMark = settings_use_comma_as_decimal_mark.isChecked
refreshAppWidget<MyWidgetProvider>() updateWidgets()
ensureBackgroundThread { applicationContext.calculatorDB.deleteHistory() } ensureBackgroundThread { applicationContext.calculatorDB.deleteHistory() }
} }
} }

17
app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt
View File

@ -9,6 +9,7 @@ import android.widget.Button
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.calculator.databases.CalculatorDatabase import com.simplemobiletools.calculator.databases.CalculatorDatabase
import com.simplemobiletools.calculator.helpers.Config import com.simplemobiletools.calculator.helpers.Config
import com.simplemobiletools.calculator.helpers.MyWidgetProvider
import com.simplemobiletools.calculator.interfaces.CalculatorDao import com.simplemobiletools.calculator.interfaces.CalculatorDao
val Context.config: Config get() = Config.newInstance(applicationContext) val Context.config: Config get() = Config.newInstance(applicationContext)
@ -28,10 +29,14 @@ fun Context.updateViewColors(viewGroup: ViewGroup, textColor: Int) {
} }
} }
inline fun <reified T> Context.refreshAppWidget() { fun Context.updateWidgets() {
val intent = Intent(this, T::class.java) val widgetIDs = AppWidgetManager.getInstance(applicationContext)?.getAppWidgetIds(ComponentName(applicationContext, MyWidgetProvider::class.java))
intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE ?: return
val ids = AppWidgetManager.getInstance(this).getAppWidgetIds(ComponentName(this, T::class.java)) if (widgetIDs.isNotEmpty()) {
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids) Intent(applicationContext, MyWidgetProvider::class.java).apply {
sendBroadcast(intent) action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIDs)
sendBroadcast(this)
}
}
} }