From 9cb49547377c3a35cca96c965aa49c1d8307752f Mon Sep 17 00:00:00 2001 From: Abrynos <6608231+Abrynos@users.noreply.github.com> Date: Tue, 15 Mar 2022 18:06:59 +0100 Subject: [PATCH 1/4] Implement different color themes --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 5 +- .../shoppinglist/AbstractShoppingActivity.kt | 12 +++- .../s999844/shoppinglist/MainActivity.kt | 8 +++ .../s999844/shoppinglist/OptionsActivity.kt | 32 ++++++---- ...kt => DescriptiveSettingSpinnerAdapter.kt} | 3 +- .../SpinnerItemSelectedListener.kt} | 19 ++++-- .../s999844/shoppinglist/settings/Settings.kt | 37 +++++++++++- .../res/drawable/ic_launcher_background.xml | 2 +- .../res/drawable/ic_launcher_foreground.xml | 2 +- app/src/main/res/drawable/ic_minus.xml | 2 +- app/src/main/res/drawable/ic_plus.xml | 2 +- app/src/main/res/drawable/ic_settings.xml | 2 +- .../main/res/drawable/ic_shopping_cart.xml | 2 +- app/src/main/res/drawable/ic_trash.xml | 2 +- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/activity_options.xml | 30 +++++++++- app/src/main/res/layout/spinner_item.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 2115 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 3816 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 1479 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 2490 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 2934 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 5352 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 4099 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 8116 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 5716 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 11705 -> 0 bytes app/src/main/res/values-night/themes.xml | 2 - app/src/main/res/values/attributes.xml | 21 +++++++ app/src/main/res/values/colors.xml | 8 ++- app/src/main/res/values/strings.xml | 9 ++- app/src/main/res/values/themes.xml | 2 - app/src/main/res/values/themes_base.xml | 56 ++++++++++++------ 34 files changed, 205 insertions(+), 65 deletions(-) rename app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/{OrderSpinnerAdapter.kt => DescriptiveSettingSpinnerAdapter.kt} (91%) rename app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/{ThemeManager.kt => adapters/SpinnerItemSelectedListener.kt} (68%) delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/attributes.xml diff --git a/app/build.gradle b/app/build.gradle index a2dda84..9c04440 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,7 @@ android { defaultConfig { applicationId "pl.edu.pjwstk.s999844.shoppinglist" - minSdkVersion 24 + minSdkVersion 25 targetSdkVersion 32 versionCode 13 versionName "v1.12.0" @@ -54,7 +54,7 @@ android { } signingConfigs { release { - if(keystorePropertiesFile.exists()) { + if (keystorePropertiesFile.exists()) { def keystoreProperties = new Properties() keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d777c8a..d987cd7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,8 +21,6 @@ + android:exported="true"> diff --git a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/AbstractShoppingActivity.kt b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/AbstractShoppingActivity.kt index 05232c3..884fc0d 100644 --- a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/AbstractShoppingActivity.kt +++ b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/AbstractShoppingActivity.kt @@ -26,15 +26,25 @@ package pl.edu.pjwstk.s999844.shoppinglist +import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.app.AppCompatDelegate import pl.edu.pjwstk.s999844.shoppinglist.settings.Settings abstract class AbstractShoppingActivity : AppCompatActivity() { protected val settings: Settings by lazy { Settings(this) } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setTheme(settings.accentColor.styleResourceId) + } + override fun onStart() { super.onStart() - ThemeManager.setDark(settings.darkThemeActive) + setDark(settings.darkThemeActive) } + + protected fun setDark(dark: Boolean) = AppCompatDelegate.setDefaultNightMode(if (dark) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO) } diff --git a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/MainActivity.kt b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/MainActivity.kt index 86b2d7b..a01b8fe 100644 --- a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/MainActivity.kt +++ b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/MainActivity.kt @@ -56,6 +56,14 @@ class MainActivity : AbstractShoppingActivity() { mainListRecyclerView.adapter = ShoppingListAdapter(this::changeItemCallback) } + override fun onStart() { + super.onStart() + + supportActionBar?.setDisplayShowHomeEnabled(true) + supportActionBar?.setDisplayUseLogoEnabled(true) + } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.menu_main, menu) return true diff --git a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/OptionsActivity.kt b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/OptionsActivity.kt index 0bcee4e..9a71833 100644 --- a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/OptionsActivity.kt +++ b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/OptionsActivity.kt @@ -30,10 +30,10 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import android.view.View -import android.widget.AdapterView import android.widget.Spinner import kotlinx.android.synthetic.main.activity_options.* -import pl.edu.pjwstk.s999844.shoppinglist.adapters.OrderSpinnerAdapter +import pl.edu.pjwstk.s999844.shoppinglist.adapters.DescriptiveSettingSpinnerAdapter +import pl.edu.pjwstk.s999844.shoppinglist.adapters.SpinnerItemSelectedListener import pl.edu.pjwstk.s999844.shoppinglist.settings.Settings class OptionsActivity : AbstractShoppingActivity() { @@ -51,21 +51,30 @@ class OptionsActivity : AbstractShoppingActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_options) - listOrderDropdown.adapter = OrderSpinnerAdapter(this) - listOrderDropdown.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { - override fun onItemSelected(adapterView: AdapterView<*>?, view: View?, position: Int, id: Long) { - settings.order = listOrderDropdown.getItemAtPosition(position) as Settings.Order + listOrderDropdown.adapter = DescriptiveSettingSpinnerAdapter(this, Settings.Order.values()) + listOrderDropdown.onItemSelectedListener = SpinnerItemSelectedListener(listOrderDropdown) { + if (settings.order == it) { + return@SpinnerItemSelectedListener } - override fun onNothingSelected(p0: AdapterView<*>?) { - throw IllegalStateException() + settings.order = it + } + + accentColorDropdown.adapter = DescriptiveSettingSpinnerAdapter(this, Settings.AccentColor.values()) + accentColorDropdown.onItemSelectedListener = SpinnerItemSelectedListener(accentColorDropdown) { + if (settings.accentColor == it) { + return@SpinnerItemSelectedListener } + + settings.accentColor = it + recreate() } } - private fun getIndex(spinner: Spinner, order: Settings.Order): Int { + private fun getIndex(spinner: Spinner, order: T): Int { for (i in 0..spinner.count) { - val valueAtPosition: Settings.Order = spinner.getItemAtPosition(i) as Settings.Order + @Suppress("UNCHECKED_CAST") + val valueAtPosition: T = spinner.getItemAtPosition(i) as T if (valueAtPosition == order) { return i } @@ -79,6 +88,7 @@ class OptionsActivity : AbstractShoppingActivity() { optionsThemeSwitch.isChecked = settings.darkThemeActive listOrderDropdown.setSelection(getIndex(listOrderDropdown, settings.order)) + accentColorDropdown.setSelection(getIndex(accentColorDropdown, settings.accentColor)) title = getString(R.string.optionsTitleBarText) } @@ -87,7 +97,7 @@ class OptionsActivity : AbstractShoppingActivity() { fun onClickThemeSwitch(view: View) { val isDark = optionsThemeSwitch.isChecked settings.darkThemeActive = isDark - ThemeManager.setDark(isDark) + setDark(isDark) } @Suppress("UNUSED_PARAMETER") diff --git a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/OrderSpinnerAdapter.kt b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/DescriptiveSettingSpinnerAdapter.kt similarity index 91% rename from app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/OrderSpinnerAdapter.kt rename to app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/DescriptiveSettingSpinnerAdapter.kt index 84c0d51..1c81b1a 100644 --- a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/OrderSpinnerAdapter.kt +++ b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/DescriptiveSettingSpinnerAdapter.kt @@ -35,7 +35,7 @@ import android.widget.TextView import pl.edu.pjwstk.s999844.shoppinglist.R import pl.edu.pjwstk.s999844.shoppinglist.settings.Settings -class OrderSpinnerAdapter(context: Context) : ArrayAdapter(context, R.layout.spinner_item, Settings.Order.values()) { +class DescriptiveSettingSpinnerAdapter(context: Context, values: Array) : ArrayAdapter(context, R.layout.spinner_item, values) where T : Settings.DescriptiveSetting { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val text: TextView = (convertView ?: LayoutInflater.from(context).inflate(R.layout.spinner_item, parent, false)) as TextView @@ -46,4 +46,3 @@ class OrderSpinnerAdapter(context: Context) : ArrayAdapter(conte override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View = getView(position, convertView, parent) } - diff --git a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/ThemeManager.kt b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/SpinnerItemSelectedListener.kt similarity index 68% rename from app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/ThemeManager.kt rename to app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/SpinnerItemSelectedListener.kt index 4203d97..151f44c 100644 --- a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/ThemeManager.kt +++ b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/adapters/SpinnerItemSelectedListener.kt @@ -24,10 +24,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -package pl.edu.pjwstk.s999844.shoppinglist +package pl.edu.pjwstk.s999844.shoppinglist.adapters -import androidx.appcompat.app.AppCompatDelegate +import android.view.View +import android.widget.AdapterView +import android.widget.Spinner -object ThemeManager { - fun setDark(dark: Boolean) = AppCompatDelegate.setDefaultNightMode(if (dark) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO) + +class SpinnerItemSelectedListener(private val spinner: Spinner, private val callback: ((t: T) -> Unit)) : AdapterView.OnItemSelectedListener { + override fun onItemSelected(adapterView: AdapterView<*>?, view: View?, position: Int, id: Long) { + @Suppress("UNCHECKED_CAST") + callback(spinner.getItemAtPosition(position) as T) + } + + override fun onNothingSelected(p0: AdapterView<*>?) { + throw IllegalStateException() + } } + diff --git a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/settings/Settings.kt b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/settings/Settings.kt index c21c35a..d4874ac 100644 --- a/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/settings/Settings.kt +++ b/app/src/main/java/pl/edu/pjwstk/s999844/shoppinglist/settings/Settings.kt @@ -35,14 +35,27 @@ class Settings(context: Context) { companion object { private const val IS_DARK_THEME_NAME = "darkTheme" private const val IS_DARK_THEME_DEFAULT = true + private const val ORDER_NAME = "listOrder" private val ORDER_DEFAULT: Order = Order.Unordered + + private const val ACCENT_NAME = "accentColor" + private val ACCENT_DEFAULT: AccentColor = AccentColor.Blue } private val sharedPreferences: SharedPreferences = context.getSharedPreferences("SETTINGS", MODE_PRIVATE) private fun edit(): SharedPreferences.Editor = sharedPreferences.edit() + var accentColor: AccentColor + get() { + val value: Int = sharedPreferences.getInt(ACCENT_NAME, ACCENT_DEFAULT.value) + return AccentColor.values().firstOrNull { + it.value == value + } ?: ACCENT_DEFAULT + } + set(value) = edit().putInt(ACCENT_NAME, value.value).apply() + var darkThemeActive: Boolean get() = sharedPreferences.getBoolean(IS_DARK_THEME_NAME, IS_DARK_THEME_DEFAULT) set(value) = edit().putBoolean(IS_DARK_THEME_NAME, value).apply() @@ -52,15 +65,33 @@ class Settings(context: Context) { val value: Int = sharedPreferences.getInt(ORDER_NAME, ORDER_DEFAULT.value) return Order.values().firstOrNull { it.value == value - }?: ORDER_DEFAULT + } ?: ORDER_DEFAULT } set(value) = edit().putInt(ORDER_NAME, value.value).apply() + interface DescriptiveSetting { + val descriptionResourceId: Int + } + + enum class AccentColor(val value: Int, val styleResourceId: Int, private val description: Int) : DescriptiveSetting { + Blue(0, R.style.Theme_ShoppingList_AccentBlue, R.string.optionsAccentBlue), + Red(1, R.style.Theme_ShoppingList_AccentRed, R.string.optionsAccentRed), + Orange(2, R.style.Theme_ShoppingList_AccentOrange, R.string.optionsAccentOrange), + Teal(3, R.style.Theme_ShoppingList_AccentTeal, R.string.optionsAccentTeal), + Purple(4, R.style.Theme_ShoppingList_AccentPurple, R.string.optionsAccentPurple), + Green(5, R.style.Theme_ShoppingList_AccentGreen, R.string.optionsAccentGreen); - enum class Order(val value: Int, val descriptionResourceId: Int) { + override val descriptionResourceId: Int + get() = description + } + + enum class Order(val value: Int, private val description: Int) : DescriptiveSetting { Unordered(0, R.string.optionsUnorderedOrdering), Alphabetical(1, R.string.optionsAlphabeticalOrdering), AmountAscending(2, R.string.optionsAmountAscendingOrdering), - AmountDescending(3, R.string.optionsAmountDecendingOrdering) + AmountDescending(3, R.string.optionsAmountDecendingOrdering); + + override val descriptionResourceId: Int + get() = description } } diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 34d9877..9eba909 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -21,6 +21,6 @@ android:viewportWidth="108" android:viewportHeight="108"> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index d656c3f..ac24800 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -50,7 +50,7 @@ diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml index 1ee4c32..10e4d67 100644 --- a/app/src/main/res/drawable/ic_plus.xml +++ b/app/src/main/res/drawable/ic_plus.xml @@ -6,6 +6,6 @@ android:viewportHeight="512" tools:ignore="VectorRaster"> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index feadc07..c3d159a 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -5,7 +5,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_shopping_cart.xml b/app/src/main/res/drawable/ic_shopping_cart.xml index 0024d42..b43528f 100644 --- a/app/src/main/res/drawable/ic_shopping_cart.xml +++ b/app/src/main/res/drawable/ic_shopping_cart.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ee6013d..63b3fcc 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,11 +34,11 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/mainActionButtonMargin" android:layout_marginBottom="@dimen/mainActionButtonMargin" + android:contentDescription="@string/mainFloatingAddButtonDescription" android:onClick="onClickFloatingButton" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:srcCompat="@drawable/ic_plus" - android:contentDescription="@string/mainFloatingAddButtonDescription" /> + app:srcCompat="@drawable/ic_plus" /> + + + + + + + + + + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="2" /> diff --git a/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml index 261bfcb..6abe634 100644 --- a/app/src/main/res/layout/spinner_item.xml +++ b/app/src/main/res/layout/spinner_item.xml @@ -20,5 +20,5 @@ + android:padding="5dip" + android:textSize="@dimen/optionTextSize" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 8d77db1af64a84101aa0f6662cdd4b1410ce8207..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2115 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 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 68e8e1e22ed746e54322e96e1ecbeedc272a4577..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2490 zcmV;r2}SmaP)JSsF5TDQ4tYA5Y#9UBBLp4qT>6>Ltqyb zi8^_ynKX79tJS77V{Ck-4a7-16Q?z`#Yozy?DF;d?!CKv7k1ePs5|qUy)5UR^ZT9e z_nq^dyE|mafL|~)GxNmoxVZWddiT}Zy)6tK^5kAs!%|YJMtJ&EEeJ5U-1d)k}W-2 zQtrlwa1EW(Yv*;3;gjG48bK_u_AAocD1+i0m9fC$%W zfSnz6%sTmZu!;8umm};rriNCeFf>3BuH?}rH`Vs(^f7=xSsG(qy+edwiS1b9ab;NH z=c8Fcc*JN zorm{M|J8|?b6Xy<5SD``spd1JHmo<-KGxACH!k6Yu+M5kr0sUQ6Q@4B0J_8tkJ3s# zESE-5ChRWtVkK4)hGz^mbnLJm*ZK8Z&LHWtaN*+T(B0h)ckXn;8ygy+r0h5>FF)l% zg(sZ$ioDX3kTA2^>pns6YU6=+sdU-6K2dPazOgokw^4cQOp~+^!bHCWg*F|oU2k`b z#z67rwvW*Fb^RoD1E?og=l6;NZ`m{*Jmby#e5e!mz$8f)tXjPl9z1wBXaY)B?gp{4 z7_`P(@41k$=eMq0K<!8U}Dru z5Tz=`NYs0%ovffS)pkjB6)NZE=2(`rNeA*>Te^Pb2L`1&~(drc*>}2gB8!4XKywtg*IwGJ=s%;2n-A~JEfsUI4i^9jhX~Wsic9M^X zeg!Q$2SqG*6TwylO`w{*y_t4ret9ueYplBvi~s|ox%E#$lfQTGzmS!)-i>^OgcUGJ zIv1ifE3wS3ciY(13A;Z<&aS0YrK%c>q3H;A=S_X36~6n|-GIs4Y&K{;{s}}WvU%jQ zIP%#HBBk>{qFu#A!dV|B?Y}7$&JA@6km=r>gaZB?DEH4r}1xVx8N-%l^DR|sOoLSN+ZdWoGXRZ(pIy=Nz-Oy#-9 zSx%3|GWo1O<#cakgMqSONk?QMXuGgt;>JJaQfHb`)^rL5!ht85K)`*l5ahEBx-l*G@mvZd|?N zZH{=~9row5D&5Wyot<4^nqKa8=7~I62WKDcQ-t=JP4*el>sZMi&qj}y2-Jx+?fo4o zd&894441Eb>z0((!ykhnCd=bGKPPvyTib^ZyJ6<6bzWzlW*zNg6Dv!w&jlT$Mum$# z9_%?qqh#8ON{Rwod;5+8RijNuT-E50_aDH*f@-hpe7tcPw10ie+5WT7+d-eO+#`8T z0M331Gy4;SvwlS!y*wXsDw?RCy8BWfxez}MYoW3h*jMvDWMsYJbB9fOz6>^PI|0=@ z-@$TXg-6@a%rmpET-qI_D#1Q-E+e-{?rG`p{+`N>6iBjXYm(|81Y#vR0@4A5hzC?2 zc(Dy@onpp1DD1(r;l@nj78h3-;?JYSXC&H{Z|O`8oR$3B+^A-!1IS>I7b%w7$vR@P zjyS!VIQe|E=vtbX5Jkio)*huZD2lNAD}vh70VFbJo}c6kJd($QJ+tmdM7?y3xUii3 z{?>-c2MSeGY<$%zE)s|)zwIQ^mNCTroq5-a!`g-+AD#Ij70WD_%;CX&!7&mci7~8c zWgl}`{r-Z3&aqUx`#bZr)>FbVv&IUgg9DNTCFzjzwdaw;g1lq zlT^1F1PpQSo0L#lOvHO=wGqWGz8@}1-%4W+h`hUipiTUxgI(>gf!W` ziP18Vs9=cmY|}%v4O<=*_b@9BiiwowTne4=+&tFvG-l@TLHn9jrOG4`^dvwLr6}5< zoU*N*Cxn5wuT?e1gLo9Iw6pbmp`A7*@;GB1IT2sb9wtiNh-=Cu zgBxTtA`B558a_EKN>#W{YFKkj5x=QTHFal)I$`fW)QS7&AsD((qn6*T-nK&nNSn2@*4oBSML%2niVHh5-L^IQ(T@nqC>xb_z8!nxz9qV4V|P0>*oaj2T4H+f;~OO0ssI207*qoM6N<$ Ef(ntvmjD0& diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index cad19656ee66621d08666d0582369ea790a64bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2934 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 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index edf30f27a4cccb46efd15ea448356f7690fb9c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5352 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 3e146338588fafe422e76b955892480e0399062e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8116 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 O0000RV;XlT1=coSKXmVs> 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 P00000NkvXXu0mjfI$d;= diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index f01e3ca..7478a3c 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -22,6 +22,4 @@ @color/white - - - - - - + + + + + + + + + + + + From 33b4675138320c45377e2861845b6590fb75295c Mon Sep 17 00:00:00 2001 From: Abrynos <6608231+Abrynos@users.noreply.github.com> Date: Tue, 15 Mar 2022 18:12:05 +0100 Subject: [PATCH 2/4] Delete unused file --- .../mipmap-anydpi-v26/ic_launcher_round.xml | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 5476e22..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - From 5b3ab8d1013193a5d0083213accd02e6d892f131 Mon Sep 17 00:00:00 2001 From: Abrynos <6608231+Abrynos@users.noreply.github.com> Date: Tue, 15 Mar 2022 18:22:31 +0100 Subject: [PATCH 3/4] Make purple more purple --- app/src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b30dba5..49cc68a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -20,7 +20,7 @@ #A92616 #ED980D #359392 - #504D8E + #7B1FA2 #00A65A #000000 #161618 From d860a7e4308284f6374c75f0b359d78900394cee Mon Sep 17 00:00:00 2001 From: Abrynos <6608231+Abrynos@users.noreply.github.com> Date: Tue, 15 Mar 2022 21:05:09 +0100 Subject: [PATCH 4/4] Add changelog --- fastlane/metadata/android/en-US/changelogs/13.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt index 314210c..5f235e4 100644 --- a/fastlane/metadata/android/en-US/changelogs/13.txt +++ b/fastlane/metadata/android/en-US/changelogs/13.txt @@ -1 +1,2 @@ +* Added option to select the accent color used in the user interface. This currently supports blue, red, orange, teal, purple and green. * The usual amount of miscellaneous code improvements and optimizations