From 09a8ec6ffa6bec99a4046cc97b7f5ce39ad4d53e Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 21 Mar 2020 22:07:04 -0400 Subject: [PATCH] Reworking themes White theme is now the base, blue theme restored to its former glory, but system default for light is now only for dark blue --- .../data/preference/PreferencesHelper.kt | 2 +- .../tachiyomi/ui/base/CenteredToolbar.kt | 6 +- .../ui/base/activity/BaseActivity.kt | 17 ++--- .../ui/library/filter/FilterBottomSheet.kt | 20 +++-- .../kanade/tachiyomi/ui/main/MainActivity.kt | 23 ++---- .../ui/manga/MangaDetailsController.kt | 48 ++++++++++-- .../tachiyomi/ui/reader/ReaderActivity.kt | 17 ++--- .../tachiyomi/ui/reader/ReaderPresenter.kt | 6 +- .../ui/setting/SettingsGeneralController.kt | 7 +- .../kanade/tachiyomi/util/system/ThemeUtil.kt | 21 ++++++ app/src/main/res/drawable/rounded_ripple.xml | 6 +- .../main/res/layout/filter_bottom_sheet.xml | 27 +++---- app/src/main/res/layout/main_activity.xml | 5 +- app/src/main/res/values-night-v29/themes.xml | 8 -- app/src/main/res/values-night/colors.xml | 5 +- app/src/main/res/values-night/styles.xml | 3 +- app/src/main/res/values-night/themes.xml | 73 +++++++++---------- app/src/main/res/values-v29/themes.xml | 10 --- app/src/main/res/values/colors.xml | 15 ++-- app/src/main/res/values/strings.xml | 11 ++- app/src/main/res/values/styles.xml | 4 +- app/src/main/res/values/themes.xml | 35 ++++----- 22 files changed, 190 insertions(+), 179 deletions(-) create mode 100644 app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt delete mode 100644 app/src/main/res/values-night-v29/themes.xml delete mode 100644 app/src/main/res/values-v29/themes.xml diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index d973f11764..b387675e22 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -55,7 +55,7 @@ class PreferencesHelper(val context: Context) { fun clear() = prefs.edit().clear().apply() - fun theme() = prefs.getInt(Keys.theme, 9) + fun theme() = prefs.getInt(Keys.theme, 5) fun rotation() = rxPrefs.getInteger(Keys.rotation, 1) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt index 1e47b1bf2b..d0826f759f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/CenteredToolbar.kt @@ -5,13 +5,13 @@ import android.util.AttributeSet import android.view.Gravity import androidx.appcompat.graphics.drawable.DrawerArrowDrawable import androidx.appcompat.widget.PopupMenu -import androidx.appcompat.widget.Toolbar +import com.google.android.material.appbar.MaterialToolbar import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible import kotlinx.android.synthetic.main.main_activity.view.* -class CenteredToolbar@JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : Toolbar - (context, attrs) { +class CenteredToolbar@JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : + MaterialToolbar(context, attrs) { override fun setTitle(resId: Int) { if (navigationIcon is DrawerArrowDrawable) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt index d28dd773a3..11a2ed4f04 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt @@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.ui.main.SearchActivity import eu.kanade.tachiyomi.ui.security.BiometricActivity import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate import eu.kanade.tachiyomi.util.system.LocaleHelper +import eu.kanade.tachiyomi.util.system.ThemeUtil import uy.kohesive.injekt.injectLazy abstract class BaseActivity : AppCompatActivity() { @@ -21,17 +22,11 @@ abstract class BaseActivity : AppCompatActivity() { } override fun onCreate(savedInstanceState: Bundle?) { - AppCompatDelegate.setDefaultNightMode( - when (preferences.theme()) { - 1, 8 -> AppCompatDelegate.MODE_NIGHT_NO - 2, 3, 4 -> AppCompatDelegate.MODE_NIGHT_YES - else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM - } - ) - setTheme(when (preferences.theme()) { - 3, 6 -> R.style.Theme_Tachiyomi_Amoled - 4, 7 -> R.style.Theme_Tachiyomi_DarkBlue - 8, 9 -> R.style.Theme_Tachiyomi_MatWhite + AppCompatDelegate.setDefaultNightMode(ThemeUtil.nightMode(preferences.theme())) + val theme = preferences.theme() + setTheme(when { + ThemeUtil.isAMOLEDTheme(theme) -> R.style.Theme_Tachiyomi_Amoled + ThemeUtil.isBlueTheme(theme) -> R.style.Theme_Tachiyomi_AllBlue else -> R.style.Theme_Tachiyomi }) super.onCreate(savedInstanceState) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt index dca9fce383..6b52296f66 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt @@ -79,7 +79,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri val shadow: View = (pagerView.parent as ViewGroup).findViewById(R.id.shadow) sheetBehavior?.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { override fun onSlide(bottomSheet: View, progress: Float) { - top_bar.alpha = 1 - max(0f, progress) + pill.alpha = (1 - max(0f, progress)) * 0.25f shadow2.alpha = (1 - max(0f, progress)) * 0.25f shadow.alpha = 1 + min(0f, progress) updateRootPadding(progress) @@ -105,12 +105,16 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri sheetBehavior?.skipCollapsed == false) sheetBehavior?.state = BottomSheetBehavior.STATE_COLLAPSED - updateRootPadding(when (sheetBehavior?.state) { - BottomSheetBehavior.STATE_HIDDEN -> -1f - BottomSheetBehavior.STATE_EXPANDED -> 1f - else -> 0f - }) - shadow.alpha = if (sheetBehavior?.state == BottomSheetBehavior.STATE_HIDDEN) 0f else 1f + post { + updateRootPadding( + when (sheetBehavior?.state) { + BottomSheetBehavior.STATE_HIDDEN -> -1f + BottomSheetBehavior.STATE_EXPANDED -> 1f + else -> 0f + } + ) + shadow.alpha = if (sheetBehavior?.state == BottomSheetBehavior.STATE_HIDDEN) 0f else 1f + } createTags() clearButton.setOnClickListener { clearFilters() } @@ -123,7 +127,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri pager?.updatePaddingRelative(bottom = sheetBehavior?.peekHeight ?: 0) } if (state == BottomSheetBehavior.STATE_EXPANDED) { - top_bar.alpha = 0f + pill.alpha = 0f } if (state == BottomSheetBehavior.STATE_HIDDEN) { reSortViews() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 73c8b0e25a..8e21479637 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -78,7 +78,8 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { protected lateinit var router: Router - protected var drawerArrow: DrawerArrowDrawable? = null + var drawerArrow: DrawerArrowDrawable? = null + private set private var searchDrawable: Drawable? = null private var currentGestureDelegate: SwipeGestureInterface? = null private lateinit var gestureDetector: GestureDetectorCompat @@ -91,8 +92,6 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { private var animationSet: AnimatorSet? = null - private var bottomNavHeight = 0 - fun setUndoSnackBar(snackBar: Snackbar?, extraViewToCheck: View? = null) { this.snackBar = snackBar canDismissSnackBar = false @@ -214,11 +213,6 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { supportActionBar?.setDisplayShowCustomEnabled(true) - window.statusBarColor = ColorUtils.setAlphaComponent( - getResourceColor( - android.R.attr.colorBackground - ), 175 - ) content.setOnApplyWindowInsetsListener { v, insets -> // if device doesn't support light nav bar window.navigationBarColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { @@ -283,11 +277,6 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR ) } - if (currentNightMode == Configuration.UI_MODE_NIGHT_NO) content.systemUiVisibility = - content.systemUiVisibility.or( - View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR - ) - // val drawerContainer: FrameLayout = findViewById(R.id.drawer_container) router = Conductor.attachRouter(this, container, savedInstanceState) @@ -377,11 +366,9 @@ open class MainActivity : BaseActivity(), DownloadServiceListener { delay(duration.toLong()) delay(100) if (Color.alpha(window?.statusBarColor ?: Color.BLACK) >= 255) window?.statusBarColor = - ColorUtils.setAlphaComponent( - getResourceColor( - android.R.attr.colorBackground - ), 175 - ) + getResourceColor( + android.R.attr.statusBarColor + ) } super.onSupportActionModeFinished(mode) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt index 0f09e24e73..ae06124708 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt @@ -88,6 +88,7 @@ import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.storage.getUriCompat +import eu.kanade.tachiyomi.util.system.ThemeUtil import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.launchUI @@ -97,8 +98,6 @@ import eu.kanade.tachiyomi.util.view.getText import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.util.view.updateLayoutParams import eu.kanade.tachiyomi.util.view.updatePaddingRelative -import java.io.File -import java.io.IOException import jp.wasabeef.glide.transformations.CropSquareTransformation import jp.wasabeef.glide.transformations.MaskTransformation import kotlinx.android.synthetic.main.main_activity.* @@ -107,6 +106,8 @@ import kotlinx.android.synthetic.main.manga_header_item.* import timber.log.Timber import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import java.io.File +import java.io.IOException class MangaDetailsController : BaseController, FlexibleAdapter.OnItemClickListener, @@ -337,23 +338,52 @@ class MangaDetailsController : BaseController, override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { super.onChangeStarted(handler, type) if (type == ControllerChangeType.PUSH_ENTER || type == ControllerChangeType.POP_ENTER) { + setActionBar(true) setStatusBarAndToolbar() } else if (type == ControllerChangeType.PUSH_EXIT || type == ControllerChangeType.POP_EXIT) { if (router.backstack.lastOrNull()?.controller() is DialogController) return if (type == ControllerChangeType.POP_EXIT) { setHasOptionsMenu(false) + setActionBar(false) presenter.cancelScope() } colorAnimator?.cancel() - val colorPrimary = activity?.getResourceColor( - android.R.attr.colorBackground + val colorOnPrimary = activity?.getResourceColor( + R.attr.colorOnPrimary ) ?: Color.BLACK - (activity as MainActivity).appbar.setBackgroundColor(colorPrimary) - (activity as MainActivity).toolbar.setBackgroundColor(colorPrimary) + (activity as MainActivity).appbar.setBackgroundColor(colorOnPrimary) + (activity as MainActivity).toolbar.setBackgroundColor(colorOnPrimary) - activity?.window?.statusBarColor = ColorUtils.setAlphaComponent(colorPrimary, 175) + activity?.window?.statusBarColor = activity?.getResourceColor(android.R.attr + .statusBarColor) ?: colorOnPrimary + } + } + + private fun setActionBar(forThis: Boolean) { + val currentNightMode = + activity!!.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + // if the theme is using inverted toolbar color + if (currentNightMode == Configuration.UI_MODE_NIGHT_NO && ThemeUtil.isBlueTheme( + presenter.preferences.theme() + ) + ) { + val iconPrimary = view?.context?.getResourceColor( + if (forThis) android.R.attr.textColorPrimary + else R.attr.actionBarTintColor + ) ?: Color.BLACK + (activity as MainActivity).toolbar.setTitleTextColor(iconPrimary) + (activity as MainActivity).drawerArrow?.color = iconPrimary + (activity as MainActivity).toolbar.overflowIcon?.setTint(iconPrimary) + if (forThis) activity!!.main_content.systemUiVisibility = + activity!!.main_content.systemUiVisibility.or( + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + ) + else activity!!.main_content.systemUiVisibility = + activity!!.main_content.systemUiVisibility.rem( + View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + ) } } @@ -501,6 +531,10 @@ class MangaDetailsController : BaseController, presenter.getNextUnreadChapter() != null && !presenter.isLockedFromSearch menu.findItem(R.id.action_mark_all_as_unread).isVisible = !presenter.allUnread() && !presenter.isLockedFromSearch + val iconPrimary = view?.context?.getResourceColor(android.R.attr.textColorPrimary) + ?: Color.BLACK + menu.findItem(R.id.action_download).icon?.mutate()?.setTint(iconPrimary) + editItem.icon?.mutate()?.setTint(iconPrimary) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index ff9b51c71f..a22422cca6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -46,6 +46,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer import eu.kanade.tachiyomi.util.lang.plusAssign import eu.kanade.tachiyomi.util.storage.getUriCompat import eu.kanade.tachiyomi.util.system.GLUtil +import eu.kanade.tachiyomi.util.system.ThemeUtil import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.launchUI import eu.kanade.tachiyomi.util.system.toast @@ -151,20 +152,14 @@ class ReaderActivity : BaseRxActivity(), /** * Called when the activity is created. Initializes the presenter and configuration. */ - override fun onCreate(savedState: Bundle?) { - AppCompatDelegate.setDefaultNightMode( - when (preferences.theme()) { - 1, 8 -> AppCompatDelegate.MODE_NIGHT_NO - 2, 3, 4 -> AppCompatDelegate.MODE_NIGHT_YES - else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM - } - ) + override fun onCreate(savedInstanceState: Bundle?) { + AppCompatDelegate.setDefaultNightMode(ThemeUtil.nightMode(preferences.theme())) setTheme(when (preferences.readerTheme().getOrDefault()) { 0 -> R.style.Theme_Base_Reader_Light 1 -> R.style.Theme_Base_Reader_Dark else -> R.style.Theme_Base_Reader }) - super.onCreate(savedState) + super.onCreate(savedInstanceState) setContentView(R.layout.reader_activity) setNotchCutoutMode() @@ -182,8 +177,8 @@ class ReaderActivity : BaseRxActivity(), else presenter.init(manga, chapterUrl) } - if (savedState != null) { - menuVisible = savedState.getBoolean(::menuVisible.name) + if (savedInstanceState != null) { + menuVisible = savedInstanceState.getBoolean(::menuVisible.name) } config = ReaderConfig() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index 6cfe288fc0..5858009ae5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -24,6 +24,9 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderPage import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.system.ImageUtil +import java.io.File +import java.util.Date +import java.util.concurrent.TimeUnit import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -36,9 +39,6 @@ import rx.schedulers.Schedulers import timber.log.Timber import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.io.File -import java.util.Date -import java.util.concurrent.TimeUnit /** * Presenter used by the activity to perform background operations. diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index fdd66ce45e..2377ff64d0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -46,11 +46,10 @@ class SettingsGeneralController : SettingsController() { key = Keys.theme titleRes = R.string.pref_theme entriesRes = arrayOf(R.string.white_theme, R.string.light_theme, R.string.dark_theme, - R.string.amoled_theme, R.string.darkblue_theme, - R.string.sysyem_white_theme, R.string.system_theme, R.string.system_amoled_theme, + R.string.amoled_theme, R.string.darkblue_theme, R.string.system_theme, R.string.system_amoled_theme, R.string.system_darkblue_theme) - entryValues = listOf(8, 1, 2, 3, 4, 9, 5, 6, 7) - defaultValue = 9 + entryValues = listOf(1, 8, 2, 3, 4, 5, 6, 7) + defaultValue = 5 onChange { activity?.recreate() diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt new file mode 100644 index 0000000000..6671eb2584 --- /dev/null +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt @@ -0,0 +1,21 @@ +package eu.kanade.tachiyomi.util.system + +import androidx.appcompat.app.AppCompatDelegate + +object ThemeUtil { + fun isBlueTheme(theme: Int): Boolean { + return theme == 4 || theme == 8 || theme == 7 + } + + fun isAMOLEDTheme(theme: Int): Boolean { + return theme == 3 || theme == 6 + } + + fun nightMode(theme: Int): Int { + return when (theme) { + 1, 8 -> AppCompatDelegate.MODE_NIGHT_NO + 2, 3, 4 -> AppCompatDelegate.MODE_NIGHT_YES + else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM + } + } +} diff --git a/app/src/main/res/drawable/rounded_ripple.xml b/app/src/main/res/drawable/rounded_ripple.xml index 01f8ad0af2..9fcec08167 100644 --- a/app/src/main/res/drawable/rounded_ripple.xml +++ b/app/src/main/res/drawable/rounded_ripple.xml @@ -1,9 +1,9 @@ + android:color="@color/colorAccent"> - + @@ -24,7 +24,7 @@ - + diff --git a/app/src/main/res/layout/filter_bottom_sheet.xml b/app/src/main/res/layout/filter_bottom_sheet.xml index 3b6b535112..1aa6b0d9df 100644 --- a/app/src/main/res/layout/filter_bottom_sheet.xml +++ b/app/src/main/res/layout/filter_bottom_sheet.xml @@ -83,26 +83,17 @@ - - - - - + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 834a7f3dc7..4974edc45d 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -24,7 +24,8 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/colorBackground" + android:theme="?attr/actionBarTheme" + android:background="?attr/colorOnPrimary" android:stateListAnimator="@null" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -34,7 +35,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?android:attr/colorBackground"> + android:background="?attr/colorOnPrimary"> - - - \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 0ba0654581..4104ec4d96 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -3,7 +3,7 @@ #212121 #212121 - + @color/md_white_1000_76 @color/md_white_1000_12 #3399FF @@ -15,9 +15,8 @@ #171717 #3399FF #212121 + #AF1C1C1D @color/md_white_1000_38 - @color/colorAccent - @color/md_white_1000_76 @color/md_white_1000 @color/md_white_1000_70 diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 4b5b89d1cb..0ada5796ae 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -1,6 +1,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index ca30343c9f..c9706a37ab 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,46 +1,45 @@ - - + - + - - - - + + @color/textColorPrimary + @color/textColorSecondary + @color/colorAccent + @color/colorAmoledPrimary + 16dp + + + \ No newline at end of file diff --git a/app/src/main/res/values-v29/themes.xml b/app/src/main/res/values-v29/themes.xml deleted file mode 100644 index 21dc9274b4..0000000000 --- a/app/src/main/res/values-v29/themes.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bb59932ed9..a30d3b37fb 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,15 +1,18 @@ - #54759E + @color/md_white_1000 #C2424242 #54759E - #54759E - @color/md_white_1000 + @color/md_white_1000 @color/md_black_1000_12 - @color/colorPrimary + @color/bluePrimary + #54759E + #AFFAFAFA + #AF54759E + #AF000000 #FFFFFF - @color/colorPrimary + @color/bluePrimary #323232 #323232 @color/md_white_1000 @@ -34,8 +37,6 @@ @color/md_black_1000_12 #B3FFFFFF @color/material_red_accent_700 - @color/md_white_1000 - @color/md_white_1000_50 @color/colorAccent #212121 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64272b289e..cad0962d64 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -174,13 +174,12 @@ App theme Light Blue Dark - AMOLED dark - Dark blue - System default (Light + Dark) + AMOLED Black + Dark Blue + System default Pure White - System default (White + Dark) - System default (Light + AMOLED) - System default (All blue) + System default (White + Black) + System default (All Blue) Start screen Language System default diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c8ad9e5dbb..3f7c58f83c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -5,7 +5,8 @@ - @@ -15,6 +16,7 @@ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b4b3940e53..7abe7d1cb2 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -10,7 +10,7 @@ false true @color/colorPrimary - @color/md_white_1000 + @color/background @color/colorPrimaryDark @color/colorAccent @color/textColorPrimary @@ -24,8 +24,8 @@ @color/divider @drawable/line_divider_light @style/CustomActionModeStyle - @color/tabBarIconHighlight - @color/tabInactive + ?colorAccent + @color/colorPrimaryInactive @@ -47,7 +47,7 @@ @color/textColorPrimary @color/badgeColor - @android:color/transparent + @color/mainStatus #B3000000 @color/colorAccent @@ -56,21 +56,23 @@ @color/textColorSecondary @color/colorAccent @color/dialog + literal 16dp + true - - -