From 174cb7a1b099c2b0467c14362e3c23f3e65fe61c Mon Sep 17 00:00:00 2001 From: Fuzzy Date: Mon, 8 Jan 2024 23:31:22 +0000 Subject: [PATCH 1/6] Added Nothing themes + Updated Gradle version --- .../opencalculator/HistoryAdapter.kt | 4 +- .../opencalculator/MainActivity.kt | 6 +- .../com/darkempire78/opencalculator/Themes.kt | 36 ++++++-- .../main/res/drawable/nothing_backspace.xml | 81 ++++++++++++++++++ app/src/main/res/font/fonts.xml | 4 + app/src/main/res/font/nothing.ttf | Bin 0 -> 32164 bytes app/src/main/res/values/attrs.xml | 2 + app/src/main/res/values/colors.xml | 34 ++++++++ app/src/main/res/values/strings.xml | 2 + app/src/main/res/values/styles.xml | 79 ++++++++++++++++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 237 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/drawable/nothing_backspace.xml create mode 100644 app/src/main/res/font/fonts.xml create mode 100644 app/src/main/res/font/nothing.ttf diff --git a/app/src/main/java/com/darkempire78/opencalculator/HistoryAdapter.kt b/app/src/main/java/com/darkempire78/opencalculator/HistoryAdapter.kt index 78112b08..b2094924 100644 --- a/app/src/main/java/com/darkempire78/opencalculator/HistoryAdapter.kt +++ b/app/src/main/java/com/darkempire78/opencalculator/HistoryAdapter.kt @@ -138,7 +138,7 @@ class HistoryAdapter( calculation.setOnLongClickListener { if (MyPreferences(itemView.context).longClickToCopyValue) { val clipboardManager = itemView.context.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager - clipboardManager.setPrimaryClip(ClipData.newPlainText(R.string.copied_history_calculation, historyElement.calculation)) + clipboardManager.setPrimaryClip(ClipData.newPlainText(R.string.copied_history_calculation.toString(), historyElement.calculation)) if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) Toast.makeText(itemView.context, R.string.value_copied, Toast.LENGTH_SHORT).show() true // Or false if not consumed} @@ -150,7 +150,7 @@ class HistoryAdapter( result.setOnLongClickListener { if (MyPreferences(itemView.context).longClickToCopyValue) { val clipboardManager = itemView.context.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager - clipboardManager.setPrimaryClip(ClipData.newPlainText(R.string.copied_history_result, historyElement.result)) + clipboardManager.setPrimaryClip(ClipData.newPlainText(R.string.copied_history_result.toString(), historyElement.result)) if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) Toast.makeText(itemView.context, R.string.value_copied, Toast.LENGTH_SHORT).show() true // Or false if not consumed diff --git a/app/src/main/java/com/darkempire78/opencalculator/MainActivity.kt b/app/src/main/java/com/darkempire78/opencalculator/MainActivity.kt index de9fc2f9..43264c60 100644 --- a/app/src/main/java/com/darkempire78/opencalculator/MainActivity.kt +++ b/app/src/main/java/com/darkempire78/opencalculator/MainActivity.kt @@ -16,6 +16,7 @@ import android.view.View import android.view.accessibility.AccessibilityEvent import android.widget.Button import android.widget.HorizontalScrollView +import android.widget.ImageButton import android.widget.Toast import androidx.activity.addCallback import androidx.appcompat.app.AppCompatActivity @@ -37,6 +38,7 @@ import java.util.* var appLanguage: Locale = Locale.getDefault() var currentTheme: Int = 0 +var currentThemeName: String = "" class MainActivity : AppCompatActivity() { private lateinit var view: View @@ -66,6 +68,7 @@ class MainActivity : AppCompatActivity() { setTheme(themes.getTheme()) currentTheme = themes.getTheme() + currentThemeName = themes.getThemeNameFromId(currentTheme) binding = ActivityMainBinding.inflate(layoutInflater) view = binding.root @@ -187,7 +190,7 @@ class MainActivity : AppCompatActivity() { getSystemService(CLIPBOARD_SERVICE) as ClipboardManager clipboardManager.setPrimaryClip( ClipData.newPlainText( - R.string.copied_result, + R.string.copied_result.toString(), binding.resultDisplay.text ) ) @@ -348,6 +351,7 @@ class MainActivity : AppCompatActivity() { } val formerValue = binding.input.text.toString() + val cursorPosition = binding.input.selectionStart val leftValue = formerValue.subSequence(0, cursorPosition).toString() val leftValueFormatted = diff --git a/app/src/main/java/com/darkempire78/opencalculator/Themes.kt b/app/src/main/java/com/darkempire78/opencalculator/Themes.kt index 75457929..be4c75f4 100644 --- a/app/src/main/java/com/darkempire78/opencalculator/Themes.kt +++ b/app/src/main/java/com/darkempire78/opencalculator/Themes.kt @@ -14,14 +14,18 @@ class Themes(private val context: Context) { // Themes private const val DEFAULT_THEME_INDEX = 0 - const val AMOLED_THEME_INDEX = 1 + private const val AMOLED_THEME_INDEX = 1 private const val MATERIAL_YOU_THEME_INDEX = 2 + private const val NOTHING_LIGHT_THEME_INDEX = 3 + private const val NOTHING_DARK_THEME_INDEX = 4 // used to go from Preference int value to actual theme private val themeMap = mapOf( DEFAULT_THEME_INDEX to R.style.AppTheme, AMOLED_THEME_INDEX to R.style.AmoledTheme, - MATERIAL_YOU_THEME_INDEX to R.style.MaterialYouTheme + MATERIAL_YOU_THEME_INDEX to R.style.MaterialYouTheme, + NOTHING_LIGHT_THEME_INDEX to R.style.NothingLightTheme, + NOTHING_DARK_THEME_INDEX to R.style.NothingDarkTheme ) // Styles - Combinations of theme + day/night mode @@ -29,6 +33,8 @@ class Themes(private val context: Context) { private const val LIGHT_STYLE_INDEX = 1 private const val DARK_STYLE_INDEX = 2 private const val AMOLED_STYLE_INDEX = 3 + private const val NOTHING_LIGHT_STYLE_INDEX = 4 + private const val NOTHING_DARK_STYLE_INDEX = 5 fun openDialogThemeSelector(context: Context) { @@ -47,12 +53,16 @@ class Themes(private val context: Context) { SYSTEM_STYLE_INDEX to systemName, LIGHT_STYLE_INDEX to context.getString(R.string.theme_light), DARK_STYLE_INDEX to context.getString(R.string.theme_dark), - AMOLED_STYLE_INDEX to context.getString(R.string.theme_amoled) + AMOLED_STYLE_INDEX to context.getString(R.string.theme_amoled), + NOTHING_LIGHT_STYLE_INDEX to context.getString(R.string.theme_nothing_light), + NOTHING_DARK_STYLE_INDEX to context.getString(R.string.theme_nothing_dark) ) val checkedItem = when (preferences.theme) { AMOLED_THEME_INDEX -> AMOLED_STYLE_INDEX MATERIAL_YOU_THEME_INDEX -> SYSTEM_STYLE_INDEX + NOTHING_LIGHT_THEME_INDEX -> NOTHING_LIGHT_STYLE_INDEX + NOTHING_DARK_THEME_INDEX -> NOTHING_DARK_STYLE_INDEX else -> { when (preferences.forceDayNight) { AppCompatDelegate.MODE_NIGHT_NO -> LIGHT_STYLE_INDEX @@ -81,6 +91,14 @@ class Themes(private val context: Context) { preferences.theme = AMOLED_THEME_INDEX preferences.forceDayNight = AppCompatDelegate.MODE_NIGHT_YES } + NOTHING_LIGHT_STYLE_INDEX -> { + preferences.theme = NOTHING_LIGHT_THEME_INDEX + preferences.forceDayNight = AppCompatDelegate.MODE_NIGHT_NO + } + NOTHING_DARK_STYLE_INDEX -> { + preferences.theme = NOTHING_DARK_THEME_INDEX + preferences.forceDayNight = AppCompatDelegate.MODE_NIGHT_YES + } } dialog.dismiss() reloadActivity(context) @@ -115,10 +133,10 @@ class Themes(private val context: Context) { var theme = "THEME" when (themeID) { DEFAULT_THEME_INDEX -> { - if (MyPreferences(this.context).forceDayNight == AppCompatDelegate.MODE_NIGHT_YES) { - theme = context.getString(R.string.theme_dark) + theme = if (MyPreferences(this.context).forceDayNight == AppCompatDelegate.MODE_NIGHT_YES) { + context.getString(R.string.theme_dark) } else { - theme = context.getString(R.string.theme_light) + context.getString(R.string.theme_light) } } MATERIAL_YOU_THEME_INDEX -> { @@ -127,6 +145,12 @@ class Themes(private val context: Context) { AMOLED_THEME_INDEX -> { theme = context.getString(R.string.theme_amoled) } + NOTHING_LIGHT_THEME_INDEX -> { + theme = context.getString(R.string.theme_nothing_light) + } + NOTHING_DARK_THEME_INDEX -> { + theme = context.getString(R.string.theme_nothing_dark) + } } return theme } diff --git a/app/src/main/res/drawable/nothing_backspace.xml b/app/src/main/res/drawable/nothing_backspace.xml new file mode 100644 index 00000000..9b36cf14 --- /dev/null +++ b/app/src/main/res/drawable/nothing_backspace.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/fonts.xml b/app/src/main/res/font/fonts.xml new file mode 100644 index 00000000..944d050e --- /dev/null +++ b/app/src/main/res/font/fonts.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/nothing.ttf b/app/src/main/res/font/nothing.ttf new file mode 100644 index 0000000000000000000000000000000000000000..36667c31269f7907b4526ee40c55f795333f29f7 GIT binary patch literal 32164 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7f9759fd..18068204 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,7 @@ + @@ -10,6 +11,7 @@ + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1872255f..ca8f59cc 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -39,4 +39,38 @@ #EFEFEF #fff #D3D3D3 + + + #C5312D + #C5312D + #C5312D + #C5312D + + + #E5E2E3 + #FFF + #E5E2E3 + #000 + #E5E2E3 + #E5E2E3 + #FFF + #E5E2E3 + #E5E2E3 + #E5E2E3 + #fff + + + #141414 + #141414 + #141414 + #FFF + #DEE3F1 + #BDBDBD + #BDBDBD + #000 + #302F32 + #302F32 + #DEE3F1 + #000 + #000 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c2e75f5c..a9162031 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -133,4 +133,6 @@ Infinity SettingsActivity Real number required + Nothing Light + Nothing Dark diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ecbfb41b..dff5c605 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,11 +20,14 @@ @color/background_color @color/history_background_color + sans-serif-medium + sans-serif-medium @color/text_color @color/text_second_color @color/text_third_color @color/text_category_color + @color/text_color @color/button_color @color/button_symbol_color @color/button_clear_color @@ -98,6 +101,73 @@ @style/Widget.App.Switch.Light_Material + + + + + + @@ -129,9 +199,9 @@