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

Proper implementation on the color picker.

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-01 19:42:21 -03:00
parent 9179d2198d
commit dad3b8cd6b
7 changed files with 133 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mastodon/src/main/res/layout/item_settings_color_picker.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layoutDirection="locale"
android:paddingLeft="16dp"
android:paddingRight="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginEnd="8dp"
android:gravity="center_vertical"
android:textColor="?android:textColorPrimary"
android:textSize="20dp"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:ellipsize="end"
android:text="@string/settings_color_picker"/>
<Button
android:id="@+id/color_picker_button"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:background="@drawable/bg_inline_button"
android:elevation="0dp"
android:ellipsize="middle"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:stateListAnimator="@null"
android:textColor="?android:textColorPrimary"
android:textSize="20dp"
tools:text="@string/notify_followed" />
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>

5
mastodon/src/main/res/menu/color_picker.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/pink_color" android:title="@string/pink_color" android:icon="@drawable/ic_fluent_earth_24_regular"/>
<item android:id="@+id/purple_color" android:title="@string/purple_color" android:icon="@drawable/ic_fluent_people_checkmark_24_regular"/>
</menu>

2
mastodon/src/main/res/values-pt-rBR/strings.xml
View File

@@ -22,7 +22,7 @@
<string name="time_hours">%dh</string>
<string name="time_days">%dd</string>
<string name="share_toot_title">Compartilhar</string>
<string name="settings">Confirgurações</string>
<string name="settings">Configurações</string>
<string name="publish">Publicar</string>
<string name="discard_draft">Descartar rascunho?</string>
<string name="discard">Descartar</string>

4
mastodon/src/main/res/values/strings.xml
View File

@@ -427,6 +427,8 @@
<string name="your_favorites">Your Favorites</string>
<string name="settings_always_reveal_content_warnings">Always reveal content warnings</string>
<string name="disable_marquee">Disable scrolling text in title bars</string>
<string name="enable_mastodon_original_colors">Enable mastodon original colors</string>
<string name="settings_contribute_fork">Contribute to Megalodon</string>
<string name="settings_color_picker">Color theme:</string>
<string name="pink_color">Pink</string>
<string name="purple_color">Purple</string>
</resources>