owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename color theme to color palette

Browse Source
This commit is contained in:
sk
2022-12-20 12:23:59 +01:00
parent ec7235c03a
commit aec4479e19
4 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mastodon/src/main/res/layout/item_settings_color_picker.xml
View File

@@ -27,10 +27,10 @@
android:textSize="16sp"
android:singleLine="true"
android:ellipsize="end"
android:text="@string/sk_settings_color_picker"/>
android:text="@string/sk_settings_color_palette"/>
<Button
android:id="@+id/color_picker_button"
android:id="@+id/color_palette_button"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:background="@drawable/bg_inline_button"
@@ -41,6 +41,6 @@
android:stateListAnimator="@null"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
tools:text="@string/sk_color_theme_pink" />
tools:text="@string/sk_color_palette_pink" />
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>

16
mastodon/src/main/res/menu/color_picker.xml → mastodon/src/main/res/menu/color_palettes.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/m3_color" android:title="@string/sk_color_theme_material3"/>
<item android:id="@+id/pink_color" android:title="@string/sk_color_theme_pink"/>
<item android:id="@+id/purple_color" android:title="@string/sk_color_theme_purple"/>
<item android:id="@+id/green_color" android:title="@string/sk_color_theme_green"/>
<item android:id="@+id/blue_color" android:title="@string/sk_color_theme_blue"/>
<item android:id="@+id/brown_color" android:title="@string/sk_color_theme_brown"/>
<item android:id="@+id/red_color" android:title="@string/sk_color_theme_red"/>
<item android:id="@+id/yellow_color" android:title="@string/sk_color_theme_yellow"/>
<item android:id="@+id/m3_color" android:title="@string/sk_color_palette_material3"/>
<item android:id="@+id/pink_color" android:title="@string/sk_color_palette_pink"/>
<item android:id="@+id/purple_color" android:title="@string/sk_color_palette_purple"/>
<item android:id="@+id/green_color" android:title="@string/sk_color_palette_green"/>
<item android:id="@+id/blue_color" android:title="@string/sk_color_palette_blue"/>
<item android:id="@+id/brown_color" android:title="@string/sk_color_palette_brown"/>
<item android:id="@+id/red_color" android:title="@string/sk_color_palette_red"/>
<item android:id="@+id/yellow_color" android:title="@string/sk_color_palette_yellow"/>
</menu>

18
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -40,15 +40,15 @@
<string name="sk_settings_show_federated_timeline">Show federated timeline</string>
<string name="sk_notification_type_status">Posts</string>
<string name="sk_notify_posts">Post notifications</string>
<string name="sk_settings_color_picker">Color theme</string>
<string name="sk_color_theme_material3">System</string>
<string name="sk_color_theme_pink">Pink</string>
<string name="sk_color_theme_purple">Purple</string>
<string name="sk_color_theme_green">Green</string>
<string name="sk_color_theme_blue">Blue</string>
<string name="sk_color_theme_brown">Brown</string>
<string name="sk_color_theme_red">Red</string>
<string name="sk_color_theme_yellow">Yellow</string>
<string name="sk_settings_color_palette">Color palette</string>
<string name="sk_color_palette_material3">System</string>
<string name="sk_color_palette_pink">Pink</string>
<string name="sk_color_palette_purple">Purple</string>
<string name="sk_color_palette_green">Green</string>
<string name="sk_color_palette_blue">Blue</string>
<string name="sk_color_palette_brown">Brown</string>
<string name="sk_color_palette_red">Red</string>
<string name="sk_color_palette_yellow">Yellow</string>
<string name="sk_poll_allow_multiple">Allow multiple choices</string>
<string name="sk_translate_post">Translate</string>
<string name="sk_translate_show_original">Show original</string>