Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accent: rename all light accents to deep accents

Browse source 
The way Material3 uses an initial light accent seeds is...odd. It more
closely resembles deep purple [darker on light mode, lighter on dark
mode] in behavior. Therefore we simply rename the light accents to
this. This does mess up translations a lot, but I'll fix it when I
update the rest of the translations.
This commit is contained in:
OxygenCobalt 2021-11-13 19:14:54 -07:00
parent c30c0d7fb3
commit f66dea9469
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
27 changed files with 265 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
app/src/main/java/org/oxycblt/auxio/accent/Accent.kt
View file

@ -20,75 +20,20 @@ package org.oxycblt.auxio.accent
import org.oxycblt.auxio.R
val ACCENT_PRIMARY_COLORS = arrayOf(
R.color.red_primary,
R.color.pink_primary,
R.color.purple_primary,
R.color.deep_purple_primary,
R.color.indigo_primary,
R.color.blue_primary,
R.color.light_blue_primary,
R.color.cyan_primary,
R.color.teal_primary,
R.color.green_primary,
R.color.light_green_primary,
R.color.lime_primary,
R.color.yellow_primary,
R.color.orange_primary,
R.color.brown_primary,
R.color.grey_primary,
)
val ACCENT_COUNT: Int get() = ACCENT_NAMES.size
val ACCENT_THEMES = arrayOf(
R.style.Theme_Auxio_Red,
R.style.Theme_Auxio_Pink,
R.style.Theme_Auxio_Purple,
R.style.Theme_Auxio_DeepPurple,
R.style.Theme_Auxio_Indigo,
R.style.Theme_Auxio_Blue,
R.style.Theme_Auxio_LightBlue,
R.style.Theme_Auxio_Cyan,
R.style.Theme_Auxio_Teal,
R.style.Theme_Auxio_Green,
R.style.Theme_Auxio_LightGreen,
R.style.Theme_Auxio_Lime,
R.style.Theme_Auxio_Yellow,
R.style.Theme_Auxio_Orange,
R.style.Theme_Auxio_Brown,
R.style.Theme_Auxio_Grey,
)
val ACCENT_BLACK_THEMES = arrayOf(
R.style.Theme_Auxio_Black_Red,
R.style.Theme_Auxio_Black_Pink,
R.style.Theme_Auxio_Black_Purple,
R.style.Theme_Auxio_Black_DeepPurple,
R.style.Theme_Auxio_Black_Indigo,
R.style.Theme_Auxio_Black_Blue,
R.style.Theme_Auxio_Black_LightBlue,
R.style.Theme_Auxio_Black_Cyan,
R.style.Theme_Auxio_Black_Teal,
R.style.Theme_Auxio_Black_Green,
R.style.Theme_Auxio_Black_LightGreen,
R.style.Theme_Auxio_Black_Lime,
R.style.Theme_Auxio_Black_Yellow,
R.style.Theme_Auxio_Black_Orange,
R.style.Theme_Auxio_Black_Brown,
R.style.Theme_Auxio_Black_Grey,
)
val ACCENT_NAMES = arrayOf(
private val ACCENT_NAMES = arrayOf(
R.string.clr_red,
R.string.clr_pink,
R.string.clr_purple,
R.string.clr_deep_purple,
R.string.clr_indigo,
R.string.clr_blue,
R.string.clr_light_blue,
R.string.clr_deep_blue,
R.string.clr_cyan,
R.string.clr_teal,
R.string.clr_green,
R.string.clr_light_green,
R.string.clr_deep_green,
R.string.clr_lime,
R.string.clr_yellow,
R.string.clr_orange,
@ -96,8 +41,65 @@ val ACCENT_NAMES = arrayOf(
R.string.clr_grey,
)
private val ACCENT_THEMES = arrayOf(
R.style.Theme_Auxio_Red,
R.style.Theme_Auxio_Pink,
R.style.Theme_Auxio_Purple,
R.style.Theme_Auxio_DeepPurple,
R.style.Theme_Auxio_Indigo,
R.style.Theme_Auxio_Blue,
R.style.Theme_Auxio_DeepBlue,
R.style.Theme_Auxio_Cyan,
R.style.Theme_Auxio_Teal,
R.style.Theme_Auxio_Green,
R.style.Theme_Auxio_DeepGreen,
R.style.Theme_Auxio_Lime,
R.style.Theme_Auxio_Yellow,
R.style.Theme_Auxio_Orange,
R.style.Theme_Auxio_Brown,
R.style.Theme_Auxio_Grey,
)
private val ACCENT_BLACK_THEMES = arrayOf(
R.style.Theme_Auxio_Black_Red,
R.style.Theme_Auxio_Black_Pink,
R.style.Theme_Auxio_Black_Purple,
R.style.Theme_Auxio_Black_DeepPurple,
R.style.Theme_Auxio_Black_Indigo,
R.style.Theme_Auxio_Black_Blue,
R.style.Theme_Auxio_Black_DeepBlue,
R.style.Theme_Auxio_Black_Cyan,
R.style.Theme_Auxio_Black_Teal,
R.style.Theme_Auxio_Black_Green,
R.style.Theme_Auxio_Black_DeepGreen,
R.style.Theme_Auxio_Black_Lime,
R.style.Theme_Auxio_Black_Yellow,
R.style.Theme_Auxio_Black_Orange,
R.style.Theme_Auxio_Black_Brown,
R.style.Theme_Auxio_Black_Grey,
)
private val ACCENT_PRIMARY_COLORS = arrayOf(
R.color.red_primary,
R.color.pink_primary,
R.color.purple_primary,
R.color.deep_purple_primary,
R.color.indigo_primary,
R.color.blue_primary,
R.color.deep_blue_primary,
R.color.cyan_primary,
R.color.teal_primary,
R.color.green_primary,
R.color.deep_green_primary,
R.color.lime_primary,
R.color.yellow_primary,
R.color.orange_primary,
R.color.brown_primary,
R.color.grey_primary,
)
/**
* The data object for an accent.
* The data object for an accent. In the UI this is known as a "Color Scheme."
* @property name The name of this accent
* @property theme The theme resource for this accent
* @property blackTheme The black theme resource for this accent

2
app/src/main/java/org/oxycblt/auxio/accent/AccentAdapter.kt
View file

@ -40,7 +40,7 @@ class AccentAdapter(
) : RecyclerView.Adapter<AccentAdapter.ViewHolder>() {
private var selectedViewHolder: ViewHolder? = null
override fun getItemCount(): Int = ACCENT_PRIMARY_COLORS.size
override fun getItemCount(): Int = ACCENT_COUNT
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return ViewHolder(ItemAccentBinding.inflate(parent.context.inflater))

6
app/src/main/java/org/oxycblt/auxio/playback/state/LoopMode.kt
View file

@ -41,7 +41,11 @@ enum class LoopMode {
* @return The int constant for this mode
*/
fun toInt(): Int {
return CONST_NONE + ordinal
return when (this) {
NONE -> CONST_NONE
ALL -> CONST_ALL
TRACK -> CONST_TRACK
}
}
companion object {

2
app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
View file

@ -104,7 +104,7 @@ class SearchFragment : Fragment() {
binding.searchEditText.apply {
addTextChangedListener { text ->
// Run the search with the updated text as the query
searchModel.doSearch(text?.toString() ?: "")
searchModel.search(text?.toString() ?: "")
}
// Auto-open the keyboard when this view is shown

9
app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt
View file

@ -36,6 +36,7 @@ import java.text.Normalizer
/**
* The [ViewModel] for the search functionality
* TODO: Implement fuzzy search?
* @author OxygenCobalt
*/
class SearchViewModel : ViewModel(), MusicStore.MusicCallback {
@ -44,7 +45,7 @@ class SearchViewModel : ViewModel(), MusicStore.MusicCallback {
private var mFilterMode: DisplayMode? = null
private var mLastQuery = ""
/** Current search results from the last [doSearch] call. */
/** Current search results from the last [search] call. */
val searchResults: LiveData<List<BaseModel>> get() = mSearchResults
val isNavigating: Boolean get() = mIsNavigating
val filterMode: DisplayMode? get() = mFilterMode
@ -61,7 +62,7 @@ class SearchViewModel : ViewModel(), MusicStore.MusicCallback {
* Use [query] to perform a search of the music library.
* Will push results to [searchResults].
*/
fun doSearch(query: String) {
fun search(query: String) {
val musicStore = MusicStore.maybeGetInstance()
mLastQuery = query
@ -124,7 +125,7 @@ class SearchViewModel : ViewModel(), MusicStore.MusicCallback {
settingsManager.searchFilterMode = mFilterMode
doSearch(mLastQuery)
search(mLastQuery)
}
/**
@ -183,7 +184,7 @@ class SearchViewModel : ViewModel(), MusicStore.MusicCallback {
// --- OVERRIDES ---
override fun onLoaded(musicStore: MusicStore) {
doSearch(mLastQuery)
search(mLastQuery)
}
override fun onCleared() {

6
app/src/main/java/org/oxycblt/auxio/settings/SettingsCompat.kt
View file

@ -21,7 +21,7 @@ package org.oxycblt.auxio.settings
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatDelegate
import androidx.core.content.edit
import org.oxycblt.auxio.accent.ACCENT_PRIMARY_COLORS
import org.oxycblt.auxio.accent.ACCENT_COUNT
import org.oxycblt.auxio.accent.Accent
import org.oxycblt.auxio.playback.state.PlaybackMode
@ -70,8 +70,8 @@ fun handleAccentCompat(prefs: SharedPreferences): Accent {
}
// If there are still any issues with indices, just correct them so a crash doesnt occur.
if (accent > ACCENT_PRIMARY_COLORS.lastIndex) {
accent = ACCENT_PRIMARY_COLORS.lastIndex
if (accent >= ACCENT_COUNT) {
accent = ACCENT_COUNT - 1
}
// Move this to the [also legacy] ACCENT2 field. This makes it easier to convert in the

28
app/src/main/java/org/oxycblt/auxio/ui/SortMode.kt
View file

@ -161,15 +161,21 @@ enum class SortMode(@IdRes val itemId: Int) {
* to storage, as it will be more efficent.
*/
fun toInt(): Int {
return ordinal + INT_ASCENDING
return when (this) {
ASCENDING -> CONST_ASCENDING
DESCENDING -> CONST_DESCENDING
ARTIST -> CONST_ARTIST
ALBUM -> CONST_ALBUM
YEAR -> CONST_YEAR
}
}
companion object {
private const val INT_ASCENDING = 0xA10C
private const val INT_DESCENDING = 0xA10D
private const val INT_ARTIST = 0xA10E
private const val INT_ALBUM = 0xA10F
private const val INT_YEAR = 0xA110
private const val CONST_ASCENDING = 0xA10C
private const val CONST_DESCENDING = 0xA10D
private const val CONST_ARTIST = 0xA10E
private const val CONST_ALBUM = 0xA10F
private const val CONST_YEAR = 0xA110
/**
* Returns a [SortMode] depending on the integer constant, use this when restoring
@ -177,11 +183,11 @@ enum class SortMode(@IdRes val itemId: Int) {
*/
fun fromInt(value: Int): SortMode? {
return when (value) {
INT_ASCENDING -> ASCENDING
INT_DESCENDING -> DESCENDING
INT_ARTIST -> ARTIST
INT_ALBUM -> ALBUM
INT_YEAR -> YEAR
CONST_ASCENDING -> ASCENDING
CONST_DESCENDING -> DESCENDING
CONST_ARTIST -> ARTIST
CONST_ALBUM -> ALBUM
CONST_YEAR -> YEAR
else -> null
}
}

2
app/src/main/res/layout/dialog_excluded.xml
View file

@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="@dimen/spacing_medium">
android:paddingTop="@dimen/spacing_small">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/excluded_recycler"

4
app/src/main/res/values-cs/strings.xml
View file

@ -126,11 +126,11 @@
<string name="clr_deep_purple">"Tmavě fialová"</string>
<string name="clr_indigo">"Indigo"</string>
<string name="clr_blue">"Modrá"</string>
<string name="clr_light_blue">"Světle modrá"</string>
<string name="clr_deep_blue">"Světle modrá"</string>
<string name="clr_cyan">"Azurová"</string>
<string name="clr_teal">"Čajová"</string>
<string name="clr_green">"Zelená"</string>
<string name="clr_light_green">"Světle zelená"</string>
<string name="clr_deep_green">"Světle zelená"</string>
<string name="clr_lime">"Limetková"</string>
<string name="clr_yellow">"Žlutá"</string>
<string name="clr_orange">"Oranžová"</string>

4
app/src/main/res/values-de/strings.xml
View file

@ -125,11 +125,11 @@
<string name="clr_deep_purple">Dunkellila</string>
<string name="clr_indigo">Indigoblau</string>
<string name="clr_blue">Blau</string>
<string name="clr_light_blue">Hellblau</string>
<string name="clr_deep_blue">Hellblau</string>
<string name="clr_cyan">Cyan</string>
<string name="clr_teal">Blaugrün</string>
<string name="clr_green">Grün</string>
<string name="clr_light_green">Hellgrün</string>
<string name="clr_deep_green">Hellgrün</string>
<string name="clr_lime">Lindgrün</string>
<string name="clr_yellow">Gelb</string>
<string name="clr_orange">Orange</string>

4
app/src/main/res/values-el/strings.xml
View file

@ -65,10 +65,10 @@
<string name="clr_pink">Ροζ</string>
<string name="clr_purple">Ερυθροκυανός</string>
<string name="clr_blue">Γαλάζιος</string>
<string name="clr_light_blue">Ανοιχτός Γαλάζιος</string>
<string name="clr_deep_blue">Ανοιχτός Γαλάζιος</string>
<string name="clr_teal">Γαλάζιος Πράσινος</string>
<string name="clr_green">Πράσινος</string>
<string name="clr_light_green">Ανοιχτός Πράσινος</string>
<string name="clr_deep_green">Ανοιχτός Πράσινος</string>
<string name="clr_lime">Πράσινος Κίτρινος</string>
<string name="clr_yellow">Κίτρινος</string>
<string name="clr_orange">Πορτοκαλής</string>

4
app/src/main/res/values-es/strings.xml
View file

@ -129,11 +129,11 @@
<string name="clr_deep_purple">Púrpura Profundo</string>
<string name="clr_indigo">Índigo</string>
<string name="clr_blue">Azul</string>
<string name="clr_light_blue">Azul Claro</string>
<string name="clr_deep_blue">Azul Claro</string>
<string name="clr_cyan">Cyan</string>
<string name="clr_teal">Teal</string>
<string name="clr_green">Verde</string>
<string name="clr_light_green">Verde Claro</string>
<string name="clr_deep_green">Verde Claro</string>
<string name="clr_lime">Lima</string>
<string name="clr_yellow">Amarillo</string>
<string name="clr_orange">Naranja</string>

4
app/src/main/res/values-fr/strings.xml
View file

@ -74,10 +74,10 @@
<string name="clr_purple">Violet</string>
<string name="clr_indigo">Indigo</string>
<string name="clr_blue">Bleu</string>
<string name="clr_light_blue">Bleu Clair</string>
<string name="clr_deep_blue">Bleu Clair</string>
<string name="clr_teal">Bleu Vert</string>
<string name="clr_green">Vert</string>
<string name="clr_light_green">Vert Clair</string>
<string name="clr_deep_green">Vert Clair</string>
<string name="clr_lime">Vert Citron</string>
<string name="clr_yellow">Jaune</string>
<string name="clr_orange">Orange</string>

4
app/src/main/res/values-hu/strings.xml
View file

@ -74,10 +74,10 @@
<string name="clr_deep_purple">Sötétlila</string>
<string name="clr_indigo">Indigókék</string>
<string name="clr_blue">Kék</string>
<string name="clr_light_blue">Világoskék</string>
<string name="clr_deep_blue">Világoskék</string>
<string name="clr_teal">Kékeszöld</string>
<string name="clr_green">Zöld</string>
<string name="clr_light_green">Világoszöld</string>
<string name="clr_deep_green">Világoszöld</string>
<string name="clr_lime">Sárgazöld</string>
<string name="clr_yellow">Sárga</string>
<string name="clr_orange">Narancs</string>

4
app/src/main/res/values-it/strings.xml
View file

@ -75,10 +75,10 @@
<string name="clr_purple">Viola</string>
<string name="clr_indigo">Indaco</string>
<string name="clr_blue">Azzurro</string>
<string name="clr_light_blue">Azzurro Chiaro</string>
<string name="clr_deep_blue">Azzurro Chiaro</string>
<string name="clr_teal">Azzurro Verde</string>
<string name="clr_green">Verde</string>
<string name="clr_light_green">Verde Chiaro</string>
<string name="clr_deep_green">Verde Chiaro</string>
<string name="clr_lime">Verde Giallo</string>
<string name="clr_yellow">Giallo</string>
<string name="clr_orange">Arancio</string>

92
app/src/main/res/values-night/colors.xml
View file

@ -146,29 +146,29 @@
<color name="blue_surface_inverse">#E2E2E6</color>
<color name="blue_on_surface_inverse">#1B1B1B</color>
<color name="light_blue_primary">#62D3FF</color>
<color name="light_blue_on_primary">#003546</color>
<color name="light_blue_primary_container">#004D64</color>
<color name="light_blue_on_primary_container">#BAE9FF</color>
<color name="light_blue_primary_inverse">#006684</color>
<color name="light_blue_secondary">#B4CAD6</color>
<color name="light_blue_on_secondary">#1F333C</color>
<color name="light_blue_secondary_container">#354A53</color>
<color name="light_blue_on_secondary_container">#D0E6F2</color>
<color name="light_blue_tertiary">#C5C2EA</color>
<color name="light_blue_on_tertiary">#2E2D4C</color>
<color name="light_blue_tertiary_container">#454365</color>
<color name="light_blue_on_tertiary_container">#E3DFFF</color>
<color name="light_blue_error">#FFB4A9</color>
<color name="light_blue_on_error">#680003</color>
<color name="light_blue_error_container">#930006</color>
<color name="light_blue_on_error_container">#FFDAD4</color>
<color name="light_blue_surface">#191C1E</color>
<color name="light_blue_on_surface">#E1E2E4</color>
<color name="light_blue_surface_variant">#40484C</color>
<color name="light_blue_on_surface_variant">#C0C8CD</color>
<color name="light_blue_surface_inverse">#E1E2E4</color>
<color name="light_blue_on_surface_inverse">#191C1E</color>
<color name="deep_blue_primary">#62D3FF</color>
<color name="deep_blue_on_primary">#003546</color>
<color name="deep_blue_primary_container">#004D64</color>
<color name="deep_blue_on_primary_container">#BAE9FF</color>
<color name="deep_blue_primary_inverse">#006684</color>
<color name="deep_blue_secondary">#B4CAD6</color>
<color name="deep_blue_on_secondary">#1F333C</color>
<color name="deep_blue_secondary_container">#354A53</color>
<color name="deep_blue_on_secondary_container">#D0E6F2</color>
<color name="deep_blue_tertiary">#C5C2EA</color>
<color name="deep_blue_on_tertiary">#2E2D4C</color>
<color name="deep_blue_tertiary_container">#454365</color>
<color name="deep_blue_on_tertiary_container">#E3DFFF</color>
<color name="deep_blue_error">#FFB4A9</color>
<color name="deep_blue_on_error">#680003</color>
<color name="deep_blue_error_container">#930006</color>
<color name="deep_blue_on_error_container">#FFDAD4</color>
<color name="deep_blue_surface">#191C1E</color>
<color name="deep_blue_on_surface">#E1E2E4</color>
<color name="deep_blue_surface_variant">#40484C</color>
<color name="deep_blue_on_surface_variant">#C0C8CD</color>
<color name="deep_blue_surface_inverse">#E1E2E4</color>
<color name="deep_blue_on_surface_inverse">#191C1E</color>
<color name="cyan_primary">#44D8F1</color>
<color name="cyan_on_primary">#00363F</color>
@ -242,29 +242,29 @@
<color name="green_surface_inverse">#E2E3DD</color>
<color name="green_on_surface_inverse">#1A1C19</color>
<color name="light_green_primary">#9ED75C</color>
<color name="light_green_on_primary">#1C3700</color>
<color name="light_green_primary_container">#2C5000</color>
<color name="light_green_on_primary_container">#B9F475</color>
<color name="light_green_primary_inverse">#3C6A00</color>
<color name="light_green_secondary">#BFCAAD</color>
<color name="light_green_on_secondary">#2A331E</color>
<color name="light_green_secondary_container">#404A34</color>
<color name="light_green_on_secondary_container">#DBE7C7</color>
<color name="light_green_tertiary">#A0D0CC</color>
<color name="light_green_on_tertiary">#003735</color>
<color name="light_green_tertiary_container">#1E4E4B</color>
<color name="light_green_on_tertiary_container">#BCECE8</color>
<color name="light_green_error">#FFB4A9</color>
<color name="light_green_on_error">#680003</color>
<color name="light_green_error_container">#930006</color>
<color name="light_green_on_error_container">#FFDAD4</color>
<color name="light_green_surface">#1A1C17</color>
<color name="light_green_on_surface">#E3E3DB</color>
<color name="light_green_surface_variant">#44483D</color>
<color name="light_green_on_surface_variant">#C4C8B9</color>
<color name="light_green_surface_inverse">#E3E3DB</color>
<color name="light_green_on_surface_inverse">#1A1C17</color>
<color name="deep_green_primary">#9ED75C</color>
<color name="deep_green_on_primary">#1C3700</color>
<color name="deep_green_primary_container">#2C5000</color>
<color name="deep_green_on_primary_container">#B9F475</color>
<color name="deep_green_primary_inverse">#3C6A00</color>
<color name="deep_green_secondary">#BFCAAD</color>
<color name="deep_green_on_secondary">#2A331E</color>
<color name="deep_green_secondary_container">#404A34</color>
<color name="deep_green_on_secondary_container">#DBE7C7</color>
<color name="deep_green_tertiary">#A0D0CC</color>
<color name="deep_green_on_tertiary">#003735</color>
<color name="deep_green_tertiary_container">#1E4E4B</color>
<color name="deep_green_on_tertiary_container">#BCECE8</color>
<color name="deep_green_error">#FFB4A9</color>
<color name="deep_green_on_error">#680003</color>
<color name="deep_green_error_container">#930006</color>
<color name="deep_green_on_error_container">#FFDAD4</color>
<color name="deep_green_surface">#1A1C17</color>
<color name="deep_green_on_surface">#E3E3DB</color>
<color name="deep_green_surface_variant">#44483D</color>
<color name="deep_green_on_surface_variant">#C4C8B9</color>
<color name="deep_green_surface_inverse">#E3E3DB</color>
<color name="deep_green_on_surface_inverse">#1A1C17</color>
<color name="lime_primary">#C1D02C</color>
<color name="lime_on_primary">#2E3400</color>

4
app/src/main/res/values-nl/strings.xml
View file

@ -127,10 +127,10 @@
<string name="clr_deep_purple">Donkerpaars</string>
<string name="clr_indigo">Indigoblauw</string>
<string name="clr_blue">Blauw</string>
<string name="clr_light_blue">Lichtblauw</string>
<string name="clr_deep_blue">Lichtblauw</string>
<string name="clr_teal">Blauwgroen</string>
<string name="clr_green">Groen</string>
<string name="clr_light_green">Lichtgroen</string>
<string name="clr_deep_green">Lichtgroen</string>
<string name="clr_cyan">Cyaan</string>
<string name="clr_lime">Geelgroen</string>
<string name="clr_yellow">Geel</string>

4
app/src/main/res/values-pl/strings.xml
View file

@ -73,9 +73,9 @@
<string name="clr_purple">Purpura</string>
<string name="clr_indigo">Błękit Indygowy</string>
<string name="clr_blue">Błękit</string>
<string name="clr_light_blue">Jasnobłękit</string>
<string name="clr_deep_blue">Jasnobłękit</string>
<string name="clr_green">Zielony</string>
<string name="clr_light_green">Jasnozielony</string>
<string name="clr_deep_green">Jasnozielony</string>
<string name="clr_lime">Żółtyzielony</string>
<string name="clr_yellow">Żółty</string>
<string name="clr_orange">Pomarańczowy</string>

4
app/src/main/res/values-pt-rBR/strings.xml
View file

@ -73,10 +73,10 @@
<string name="clr_pink">Rosa</string>
<string name="clr_purple">Roxo</string>
<string name="clr_blue">Azul</string>
<string name="clr_light_blue">Azul-claro</string>
<string name="clr_deep_blue">Azul-claro</string>
<string name="clr_teal">Azul-verde</string>
<string name="clr_green">Verde</string>
<string name="clr_light_green">Verde-claro</string>
<string name="clr_deep_green">Verde-claro</string>
<string name="clr_lime">Verde-amarelo</string>
<string name="clr_yellow">Amarelo</string>
<string name="clr_orange">Laranja</string>

4
app/src/main/res/values-pt-rPT/strings.xml
View file

@ -74,10 +74,10 @@
<string name="clr_pink">Rosa</string>
<string name="clr_purple">Roxo</string>
<string name="clr_blue">Azul</string>
<string name="clr_light_blue">Azul-claro</string>
<string name="clr_deep_blue">Azul-claro</string>
<string name="clr_teal">Azul-verde</string>
<string name="clr_green">Verde</string>
<string name="clr_light_green">Verde-claro</string>
<string name="clr_deep_green">Verde-claro</string>
<string name="clr_lime">Verde-amarelo</string>
<string name="clr_yellow">Amarelo</string>
<string name="clr_orange">Laranja</string>

4
app/src/main/res/values-ro/strings.xml
View file

@ -73,10 +73,10 @@
<string name="clr_pink">Roz</string>
<string name="clr_purple">Violet</string>
<string name="clr_blue">Albastru</string>
<string name="clr_light_blue">Albastru Deschis</string>
<string name="clr_deep_blue">Albastru Deschis</string>
<string name="clr_teal">Albastru Verde</string>
<string name="clr_green">Verde</string>
<string name="clr_light_green">Verde Deschis</string>
<string name="clr_deep_green">Verde Deschis</string>
<string name="clr_lime">Verde Galben</string>
<string name="clr_yellow">Galben</string>
<string name="clr_orange">Portocaliu</string>

4
app/src/main/res/values-ru/strings.xml
View file

@ -72,11 +72,11 @@
<string name="clr_red">Расный</string>
<string name="clr_pink">Розовый</string>
<string name="clr_purple">Пурпурный</string>
<string name="clr_light_blue">Голубой</string>
<string name="clr_deep_blue">Голубой</string>
<string name="clr_teal">Зелёный</string>
<string name="clr_green">Светло-Зелёный</string>
<string name="clr_yellow">Оранжевый</string>
<string name="clr_light_green">Жёлтый</string>
<string name="clr_deep_green">Жёлтый</string>
<string name="clr_orange">Коричневый</string>
<string name="clr_brown">Седой</string>

92
app/src/main/res/values/colors.xml
View file

@ -146,29 +146,29 @@
<color name="blue_surface_inverse">#2F3033</color>
<color name="blue_on_surface_inverse">#F1F0F4</color>
<color name="light_blue_primary">#006684</color>
<color name="light_blue_on_primary">#FFFFFF</color>
<color name="light_blue_primary_container">#BAE9FF</color>
<color name="light_blue_on_primary_container">#001F2A</color>
<color name="light_blue_primary_inverse">#62D3FF</color>
<color name="light_blue_secondary">#4D616B</color>
<color name="light_blue_on_secondary">#FFFFFF</color>
<color name="light_blue_secondary_container">#D0E6F2</color>
<color name="light_blue_on_secondary_container">#081E27</color>
<color name="light_blue_tertiary">#5D5B7E</color>
<color name="light_blue_on_tertiary">#FFFFFF</color>
<color name="light_blue_tertiary_container">#E3DFFF</color>
<color name="light_blue_on_tertiary_container">#191836</color>
<color name="light_blue_error">#BA1B1B</color>
<color name="light_blue_on_error">#FFFFFF</color>
<color name="light_blue_error_container">#FFDAD4</color>
<color name="light_blue_on_error_container">#410001</color>
<color name="light_blue_surface">#FBFCFE</color>
<color name="light_blue_on_surface">#191C1E</color>
<color name="light_blue_surface_variant">#DCE4E9</color>
<color name="light_blue_on_surface_variant">#40484C</color>
<color name="light_blue_surface_inverse">#2E3133</color>
<color name="light_blue_on_surface_inverse">#F0F1F3</color>
<color name="deep_blue_primary">#006684</color>
<color name="deep_blue_on_primary">#FFFFFF</color>
<color name="deep_blue_primary_container">#BAE9FF</color>
<color name="deep_blue_on_primary_container">#001F2A</color>
<color name="deep_blue_primary_inverse">#62D3FF</color>
<color name="deep_blue_secondary">#4D616B</color>
<color name="deep_blue_on_secondary">#FFFFFF</color>
<color name="deep_blue_secondary_container">#D0E6F2</color>
<color name="deep_blue_on_secondary_container">#081E27</color>
<color name="deep_blue_tertiary">#5D5B7E</color>
<color name="deep_blue_on_tertiary">#FFFFFF</color>
<color name="deep_blue_tertiary_container">#E3DFFF</color>
<color name="deep_blue_on_tertiary_container">#191836</color>
<color name="deep_blue_error">#BA1B1B</color>
<color name="deep_blue_on_error">#FFFFFF</color>
<color name="deep_blue_error_container">#FFDAD4</color>
<color name="deep_blue_on_error_container">#410001</color>
<color name="deep_blue_surface">#FBFCFE</color>
<color name="deep_blue_on_surface">#191C1E</color>
<color name="deep_blue_surface_variant">#DCE4E9</color>
<color name="deep_blue_on_surface_variant">#40484C</color>
<color name="deep_blue_surface_inverse">#2E3133</color>
<color name="deep_blue_on_surface_inverse">#F0F1F3</color>
<color name="cyan_primary">#006877</color>
<color name="cyan_on_primary">#FFFFFF</color>
@ -242,29 +242,29 @@
<color name="green_surface_inverse">#2F312D</color>
<color name="green_on_surface_inverse">#F0F1EB</color>
<color name="light_green_primary">#3C6A00</color>
<color name="light_green_on_primary">#FFFFFF</color>
<color name="light_green_primary_container">#B9F475</color>
<color name="light_green_on_primary_container">#0E2000</color>
<color name="light_green_primary_inverse">#9ED75C</color>
<color name="light_green_secondary">#58624A</color>
<color name="light_green_on_secondary">#FFFFFF</color>
<color name="light_green_secondary_container">#DBE7C7</color>
<color name="light_green_on_secondary_container">#151E0B</color>
<color name="light_green_tertiary">#386663</color>
<color name="light_green_on_tertiary">#FFFFFF</color>
<color name="light_green_tertiary_container">#BCECE8</color>
<color name="light_green_on_tertiary_container">#00201E</color>
<color name="light_green_error">#BA1B1B</color>
<color name="light_green_on_error">#FFFFFF</color>
<color name="light_green_error_container">#FFDAD4</color>
<color name="light_green_on_error_container">#410001</color>
<color name="light_green_surface">#FDFCF5</color>
<color name="light_green_on_surface">#1A1C17</color>
<color name="light_green_surface_variant">#E1E4D6</color>
<color name="light_green_on_surface_variant">#44483D</color>
<color name="light_green_surface_inverse">#30312D</color>
<color name="light_green_on_surface_inverse">#F2F1EA</color>
<color name="deep_green_primary">#3C6A00</color>
<color name="deep_green_on_primary">#FFFFFF</color>
<color name="deep_green_primary_container">#B9F475</color>
<color name="deep_green_on_primary_container">#0E2000</color>
<color name="deep_green_primary_inverse">#9ED75C</color>
<color name="deep_green_secondary">#58624A</color>
<color name="deep_green_on_secondary">#FFFFFF</color>
<color name="deep_green_secondary_container">#DBE7C7</color>
<color name="deep_green_on_secondary_container">#151E0B</color>
<color name="deep_green_tertiary">#386663</color>
<color name="deep_green_on_tertiary">#FFFFFF</color>
<color name="deep_green_tertiary_container">#BCECE8</color>
<color name="deep_green_on_tertiary_container">#00201E</color>
<color name="deep_green_error">#BA1B1B</color>
<color name="deep_green_on_error">#FFFFFF</color>
<color name="deep_green_error_container">#FFDAD4</color>
<color name="deep_green_on_error_container">#410001</color>
<color name="deep_green_surface">#FDFCF5</color>
<color name="deep_green_on_surface">#1A1C17</color>
<color name="deep_green_surface_variant">#E1E4D6</color>
<color name="deep_green_on_surface_variant">#44483D</color>
<color name="deep_green_surface_inverse">#30312D</color>
<color name="deep_green_on_surface_inverse">#F2F1EA</color>
<color name="lime_primary">#5A6400</color>
<color name="lime_on_primary">#FFFFFF</color>

7
app/src/main/res/values/strings.xml
View file

@ -59,14 +59,12 @@
<!-- Settings namespace | Settings-related labels -->
<string name="set_title">Settings</string>
<string name="set_ui">Appearance</string>
<string name="set_theme">Theme</string>
<string name="set_theme_auto">Automatic</string>
<string name="set_theme_day">Light</string>
<string name="set_theme_night">Dark</string>
<string name="set_accent">Color scheme</string>
<string name="set_accent_desc">Colors to be used in the app</string>
<string name="set_black_mode">Black theme</string>
<string name="setting_black_mode_desc">Use a pure-black dark theme</string>
@ -150,11 +148,11 @@
<string name="clr_deep_purple">Deep Purple</string>
<string name="clr_indigo">Indigo</string>
<string name="clr_blue">Blue</string>
<string name="clr_light_blue">Deep Blue</string>
<string name="clr_deep_blue">Deep Blue</string>
<string name="clr_cyan">Cyan</string>
<string name="clr_teal">Teal</string>
<string name="clr_green">Green</string>
<string name="clr_light_green">Light Green</string>
<string name="clr_deep_green">Deep Green</string>
<string name="clr_lime">Lime</string>
<string name="clr_yellow">Yellow</string>
<string name="clr_orange">Orange</string>
@ -165,7 +163,6 @@
<string name="fmt_next_from">Next From: %s</string>
<string name="fmt_songs_loaded">Songs loaded: %d</string>
<plurals name="fmt_song_count">
<item quantity="one">%d Song</item>
<item quantity="other">%d Songs</item>

96
app/src/main/res/values/themes.xml
View file

@ -183,34 +183,34 @@
<item name="colorOnSurfaceVariant">@color/blue_on_surface_variant</item>
</style>
<style name="Theme.Auxio.LightBlue" parent="Theme.Auxio.App">
<item name="colorPrimary">@color/light_blue_primary</item>
<item name="colorOnPrimary">@color/light_blue_on_primary</item>
<item name="colorPrimaryInverse">@color/light_blue_primary_inverse</item>
<item name="colorPrimaryContainer">@color/light_blue_primary_container</item>
<item name="colorOnPrimaryContainer">@color/light_blue_on_primary_container</item>
<style name="Theme.Auxio.DeepBlue" parent="Theme.Auxio.App">
<item name="colorPrimary">@color/deep_blue_primary</item>
<item name="colorOnPrimary">@color/deep_blue_on_primary</item>
<item name="colorPrimaryInverse">@color/deep_blue_primary_inverse</item>
<item name="colorPrimaryContainer">@color/deep_blue_primary_container</item>
<item name="colorOnPrimaryContainer">@color/deep_blue_on_primary_container</item>
<item name="colorSecondary">@color/light_blue_secondary</item>
<item name="colorOnSecondary">@color/light_blue_on_secondary</item>
<item name="colorSecondaryContainer">@color/light_blue_secondary_container</item>
<item name="colorOnSecondaryContainer">@color/light_blue_on_secondary_container</item>
<item name="colorSecondary">@color/deep_blue_secondary</item>
<item name="colorOnSecondary">@color/deep_blue_on_secondary</item>
<item name="colorSecondaryContainer">@color/deep_blue_secondary_container</item>
<item name="colorOnSecondaryContainer">@color/deep_blue_on_secondary_container</item>
<item name="colorTertiary">@color/light_blue_tertiary</item>
<item name="colorOnTertiary">@color/light_blue_on_tertiary</item>
<item name="colorTertiaryContainer">@color/light_blue_tertiary_container</item>
<item name="colorOnTertiaryContainer">@color/light_blue_on_tertiary_container</item>
<item name="colorTertiary">@color/deep_blue_tertiary</item>
<item name="colorOnTertiary">@color/deep_blue_on_tertiary</item>
<item name="colorTertiaryContainer">@color/deep_blue_tertiary_container</item>
<item name="colorOnTertiaryContainer">@color/deep_blue_on_tertiary_container</item>
<item name="colorError">@color/light_blue_error</item>
<item name="colorOnError">@color/light_blue_on_error</item>
<item name="colorErrorContainer">@color/light_blue_error_container</item>
<item name="colorOnErrorContainer">@color/light_blue_on_error_container</item>
<item name="colorError">@color/deep_blue_error</item>
<item name="colorOnError">@color/deep_blue_on_error</item>
<item name="colorErrorContainer">@color/deep_blue_error_container</item>
<item name="colorOnErrorContainer">@color/deep_blue_on_error_container</item>
<item name="colorSurface">@color/light_blue_surface</item>
<item name="colorOnSurface">@color/light_blue_on_surface</item>
<item name="colorSurfaceInverse">@color/light_blue_surface_inverse</item>
<item name="colorOnSurfaceInverse">@color/light_blue_on_surface_inverse</item>
<item name="colorSurfaceVariant">@color/light_blue_surface_variant</item>
<item name="colorOnSurfaceVariant">@color/light_blue_on_surface_variant</item>
<item name="colorSurface">@color/deep_blue_surface</item>
<item name="colorOnSurface">@color/deep_blue_on_surface</item>
<item name="colorSurfaceInverse">@color/deep_blue_surface_inverse</item>
<item name="colorOnSurfaceInverse">@color/deep_blue_on_surface_inverse</item>
<item name="colorSurfaceVariant">@color/deep_blue_surface_variant</item>
<item name="colorOnSurfaceVariant">@color/deep_blue_on_surface_variant</item>
</style>
<style name="Theme.Auxio.Cyan" parent="Theme.Auxio.App">
@ -303,34 +303,34 @@
<item name="colorOnSurfaceVariant">@color/green_on_surface_variant</item>
</style>
<style name="Theme.Auxio.LightGreen" parent="Theme.Auxio.App">
<item name="colorPrimary">@color/light_green_primary</item>
<item name="colorOnPrimary">@color/light_green_on_primary</item>
<item name="colorPrimaryInverse">@color/light_green_primary_inverse</item>
<item name="colorPrimaryContainer">@color/light_green_primary_container</item>
<item name="colorOnPrimaryContainer">@color/light_green_on_primary_container</item>
<style name="Theme.Auxio.DeepGreen" parent="Theme.Auxio.App">
<item name="colorPrimary">@color/deep_green_primary</item>
<item name="colorOnPrimary">@color/deep_green_on_primary</item>
<item name="colorPrimaryInverse">@color/deep_green_primary_inverse</item>
<item name="colorPrimaryContainer">@color/deep_green_primary_container</item>
<item name="colorOnPrimaryContainer">@color/deep_green_on_primary_container</item>
<item name="colorSecondary">@color/light_green_secondary</item>
<item name="colorOnSecondary">@color/light_green_on_secondary</item>
<item name="colorSecondaryContainer">@color/light_green_secondary_container</item>
<item name="colorOnSecondaryContainer">@color/light_green_on_secondary_container</item>
<item name="colorSecondary">@color/deep_green_secondary</item>
<item name="colorOnSecondary">@color/deep_green_on_secondary</item>
<item name="colorSecondaryContainer">@color/deep_green_secondary_container</item>
<item name="colorOnSecondaryContainer">@color/deep_green_on_secondary_container</item>
<item name="colorTertiary">@color/light_green_tertiary</item>
<item name="colorOnTertiary">@color/light_green_on_tertiary</item>
<item name="colorTertiaryContainer">@color/light_green_tertiary_container</item>
<item name="colorOnTertiaryContainer">@color/light_green_on_tertiary_container</item>
<item name="colorTertiary">@color/deep_green_tertiary</item>
<item name="colorOnTertiary">@color/deep_green_on_tertiary</item>
<item name="colorTertiaryContainer">@color/deep_green_tertiary_container</item>
<item name="colorOnTertiaryContainer">@color/deep_green_on_tertiary_container</item>
<item name="colorError">@color/light_green_error</item>
<item name="colorOnError">@color/light_green_on_error</item>
<item name="colorErrorContainer">@color/light_green_error_container</item>
<item name="colorOnErrorContainer">@color/light_green_on_error_container</item>
<item name="colorError">@color/deep_green_error</item>
<item name="colorOnError">@color/deep_green_on_error</item>
<item name="colorErrorContainer">@color/deep_green_error_container</item>
<item name="colorOnErrorContainer">@color/deep_green_on_error_container</item>
<item name="colorSurface">@color/light_green_surface</item>
<item name="colorOnSurface">@color/light_green_on_surface</item>
<item name="colorSurfaceInverse">@color/light_green_surface_inverse</item>
<item name="colorOnSurfaceInverse">@color/light_green_on_surface_inverse</item>
<item name="colorSurfaceVariant">@color/light_green_surface_variant</item>
<item name="colorOnSurfaceVariant">@color/light_green_on_surface_variant</item>
<item name="colorSurface">@color/deep_green_surface</item>
<item name="colorOnSurface">@color/deep_green_on_surface</item>
<item name="colorSurfaceInverse">@color/deep_green_surface_inverse</item>
<item name="colorOnSurfaceInverse">@color/deep_green_on_surface_inverse</item>
<item name="colorSurfaceVariant">@color/deep_green_surface_variant</item>
<item name="colorOnSurfaceVariant">@color/deep_green_on_surface_variant</item>
</style>
<style name="Theme.Auxio.Lime" parent="Theme.Auxio.App">

4
app/src/main/res/values/themes_black.xml
View file

@ -24,7 +24,7 @@
<item name="colorSurface">@android:color/black</item>
</style>
<style name="Theme.Auxio.Black.LightBlue" parent="Theme.Auxio.LightBlue">
<style name="Theme.Auxio.Black.DeepBlue" parent="Theme.Auxio.DeepBlue">
<item name="colorSurface">@android:color/black</item>
</style>
@ -40,7 +40,7 @@
<item name="colorSurface">@android:color/black</item>
</style>
<style name="Theme.Auxio.Black.LightGreen" parent="Theme.Auxio.LightGreen">
<style name="Theme.Auxio.Black.DeepGreen" parent="Theme.Auxio.DeepGreen">
<item name="colorSurface">@android:color/black</item>
</style>

1
app/src/main/res/xml/prefs_main.xml
View file

@ -17,7 +17,6 @@
<Preference
app:icon="@drawable/ic_accent"
app:key="KEY_ACCENT3"
app:summary="@string/set_accent_desc"
app:title="@string/set_accent" />
<SwitchPreferenceCompat