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

Compose: language selection

Browse Source
This commit is contained in:
Grishka
2023-05-12 22:21:21 +03:00
parent 89501271ce
commit 15883f2138
9 changed files with 512 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/res/color/text_on_surface_disableable.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorM3OnSurface" android:state_enabled="true"/>
<item android:color="?colorM3Secondary"/>
</selector>

9
mastodon/src/main/res/drawable/ic_language_24px.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.788,8.113Q3.575,6.3 4.938,4.938Q6.3,3.575 8.125,2.787Q9.95,2 12,2Q14.075,2 15.887,2.787Q17.7,3.575 19.062,4.938Q20.425,6.3 21.212,8.113Q22,9.925 22,12Q22,14.05 21.212,15.875Q20.425,17.7 19.062,19.062Q17.7,20.425 15.887,21.212Q14.075,22 12,22ZM15.95,8H18.9Q18.175,6.75 17.087,5.825Q16,4.9 14.6,4.45Q15.05,5.275 15.388,6.162Q15.725,7.05 15.95,8ZM10.1,8H13.9Q13.6,6.9 13.125,5.925Q12.65,4.95 12,4.05Q11.35,4.95 10.875,5.925Q10.4,6.9 10.1,8ZM4.25,14H7.65Q7.575,13.5 7.537,13.012Q7.5,12.525 7.5,12Q7.5,11.475 7.537,10.988Q7.575,10.5 7.65,10H4.25Q4.125,10.5 4.062,10.988Q4,11.475 4,12Q4,12.525 4.062,13.012Q4.125,13.5 4.25,14ZM9.4,19.55Q8.95,18.725 8.613,17.837Q8.275,16.95 8.05,16H5.1Q5.825,17.25 6.912,18.175Q8,19.1 9.4,19.55ZM5.1,8H8.05Q8.275,7.05 8.613,6.162Q8.95,5.275 9.4,4.45Q8,4.9 6.912,5.825Q5.825,6.75 5.1,8ZM12,19.95Q12.65,19.05 13.125,18.075Q13.6,17.1 13.9,16H10.1Q10.4,17.1 10.875,18.075Q11.35,19.05 12,19.95ZM9.65,14H14.35Q14.425,13.5 14.463,13.012Q14.5,12.525 14.5,12Q14.5,11.475 14.463,10.988Q14.425,10.5 14.35,10H9.65Q9.575,10.5 9.538,10.988Q9.5,11.475 9.5,12Q9.5,12.525 9.538,13.012Q9.575,13.5 9.65,14ZM14.6,19.55Q16,19.1 17.087,18.175Q18.175,17.25 18.9,16H15.95Q15.725,16.95 15.388,17.837Q15.05,18.725 14.6,19.55ZM16.35,14H19.75Q19.875,13.5 19.938,13.012Q20,12.525 20,12Q20,11.475 19.938,10.988Q19.875,10.5 19.75,10H16.35Q16.425,10.5 16.462,10.988Q16.5,11.475 16.5,12Q16.5,12.525 16.462,13.012Q16.425,13.5 16.35,14Z"/>
</vector>

13
mastodon/src/main/res/layout/fragment_compose.xml
View File

@@ -388,6 +388,19 @@
android:tooltipText="@string/content_warning"
android:src="@drawable/ic_compose_cw"/>
<ImageButton
android:id="@+id/btn_language"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="12dp"
android:background="@drawable/bg_compose_button"
android:padding="0px"
android:tint="@color/compose_button"
android:tintMode="src_in"
android:contentDescription="@string/language"
android:tooltipText="@string/language"
android:src="@drawable/ic_language_24px"/>
<Space
android:layout_width="0px"
android:layout_height="1px"

16
mastodon/src/main/res/layout/item_alert_single_choice_1line.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp"
android:paddingEnd="24dp"
android:paddingStart="12dp"
android:drawablePadding="12dp"
android:gravity="center_vertical"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:singleLine="true"
android:ellipsize="end"
tools:text="Item text">
</CheckedTextView>

46
mastodon/src/main/res/layout/item_alert_single_choice_2lines.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<org.joinmastodon.android.ui.views.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="52dp"
android:orientation="horizontal"
android:paddingStart="12dp"
android:paddingEnd="24dp">
<View
android:id="@+id/radiobutton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:duplicateParentState="true"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:orientation="vertical"
android:gravity="center_vertical">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="16dp"
android:textAppearance="@style/m3_label_medium"
android:textColor="?colorM3OnSurfaceVariant"
android:singleLine="true"
android:ellipsize="end"
tools:text="Title"/>
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="24dp"
android:textAppearance="@style/m3_body_large"
android:textColor="@color/text_on_surface_disableable"
android:singleLine="true"
android:ellipsize="end"
tools:text="Text"/>
</LinearLayout>
</org.joinmastodon.android.ui.views.CheckableLinearLayout>

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

@@ -484,4 +484,10 @@
<string name="compose_autocomplete_emoji_empty">Browse emoji</string>
<string name="compose_autocomplete_users_empty">Find who you\'re looking for</string>
<string name="no_search_results">Could not find anything for these search terms</string>
<string name="language">Language</string>
<string name="language_default">Default</string>
<string name="language_system">System</string>
<string name="language_detecting">Detecting language</string>
<string name="language_cant_detect">Unable to detect language</string>
<string name="language_detected">Detected</string>
</resources>