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

Lists

Browse Source 
closes #89, closes #279
This commit is contained in:
Grishka
2023-10-08 22:03:16 +03:00
parent 6c1c5b7759
commit dff2217e80
90 changed files with 3025 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/res/drawable/bg_spinner.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/ic_arrow_drop_down_24px"
android:gravity="end|center_vertical"
android:left="12dp"
android:right="12dp"/>
</layer-list>

9
mastodon/src/main/res/drawable/ic_arrow_drop_down_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,15 L7,10H17Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_arrow_right_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="M10,17V7L15,12Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_list_alt_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="M8,17Q8.425,17 8.713,16.712Q9,16.425 9,16Q9,15.575 8.713,15.287Q8.425,15 8,15Q7.575,15 7.287,15.287Q7,15.575 7,16Q7,16.425 7.287,16.712Q7.575,17 8,17ZM8,13Q8.425,13 8.713,12.712Q9,12.425 9,12Q9,11.575 8.713,11.287Q8.425,11 8,11Q7.575,11 7.287,11.287Q7,11.575 7,12Q7,12.425 7.287,12.712Q7.575,13 8,13ZM8,9Q8.425,9 8.713,8.712Q9,8.425 9,8Q9,7.575 8.713,7.287Q8.425,7 8,7Q7.575,7 7.287,7.287Q7,7.575 7,8Q7,8.425 7.287,8.712Q7.575,9 8,9ZM11,17H17V15H11ZM11,13H17V11H11ZM11,9H17V7H11ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
</vector>

9
mastodon/src/main/res/drawable/ic_more_vert_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,20Q11.175,20 10.588,19.413Q10,18.825 10,18Q10,17.175 10.588,16.587Q11.175,16 12,16Q12.825,16 13.413,16.587Q14,17.175 14,18Q14,18.825 13.413,19.413Q12.825,20 12,20ZM12,14Q11.175,14 10.588,13.412Q10,12.825 10,12Q10,11.175 10.588,10.587Q11.175,10 12,10Q12.825,10 13.413,10.587Q14,11.175 14,12Q14,12.825 13.413,13.412Q12.825,14 12,14ZM12,8Q11.175,8 10.588,7.412Q10,6.825 10,6Q10,5.175 10.588,4.588Q11.175,4 12,4Q12.825,4 13.413,4.588Q14,5.175 14,6Q14,6.825 13.413,7.412Q12.825,8 12,8Z"/>
</vector>

20
mastodon/src/main/res/layout/floating_hint_spinner.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<org.joinmastodon.android.ui.views.FloatingHintEditTextLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dp"
android:paddingBottom="12dp"
app:labelTextColor="@color/m3_outlined_text_field_label"
android:foreground="@drawable/bg_m3_outlined_text_field">
<Spinner
android:id="@+id/spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:elevation="0dp"/>
</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>

11
mastodon/src/main/res/layout/item_account_list.xml
View File

@@ -119,6 +119,17 @@
android:layout_marginTop="2dp"
android:duplicateParentState="true"
android:visibility="gone"/>
<ImageButton
android:id="@+id/options_btn"
android:layout_width="40dp"
android:layout_height="36dp"
android:layout_gravity="top"
android:background="?android:actionBarItemBackground"
android:tint="?colorM3OnSurfaceVariant"
android:contentDescription="@string/more_options"
android:src="@drawable/ic_more_vert_24px"
android:visibility="gone"/>
</FrameLayout>

17
mastodon/src/main/res/layout/item_dropdown_menu.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="56dp"
android:paddingStart="16dp"
android:paddingEnd="24dp"
android:drawablePadding="16dp"
android:maxLines="2"
android:gravity="center_vertical"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:drawableTint="?colorM3OnSurface"
android:ellipsize="end"
tools:text="Menu item">
</TextView>

25
mastodon/src/main/res/layout/item_generic_list_options.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:minHeight="56dp"
android:paddingHorizontal="16dp"
android:paddingVertical="12dp"
android:gravity="center_vertical">
<include layout="@layout/item_generic_list_content"/>
<ImageButton
android:id="@+id/options_btn"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:layout_gravity="top"
android:contentDescription="@string/more_options"
android:src="@drawable/ic_more_vert_24px"
android:tint="?colorM3OnSurface"
android:background="?android:actionBarItemBackground"/>
</LinearLayout>

9
mastodon/src/main/res/layout/item_spinner.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurface"
android:singleLine="true"/>

4
mastodon/src/main/res/menu/edit_list_action_mode.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/delete" android:showAsAction="always" android:icon="@drawable/ic_delete_24px" android:title="@string/delete"/>
</menu>

5
mastodon/src/main/res/menu/home.xml
View File

@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/edit_list"
android:icon="@drawable/ic_edit_24px"
android:showAsAction="always"
android:title="@string/edit_list"/>
<item
android:id="@+id/settings"
android:icon="@drawable/ic_settings_24px"

2
mastodon/src/main/res/menu/post.xml
View File

@@ -9,7 +9,7 @@
<item android:id="@+id/delete" android:title="@string/delete"/>
</group>
<group android:id="@+id/menu_group2">
<!-- TODO add to list -->
<item android:id="@+id/add_to_list" android:title="@string/add_user_to_list"/>
<item android:id="@+id/follow" android:title="@string/follow_user"/>
<item android:id="@+id/mute" android:title="@string/mute_user"/>
<item android:id="@+id/block" android:title="@string/block_user"/>

18
mastodon/src/main/res/menu/profile.xml
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/share" android:title="@string/share_user"/>
<!-- TODO add to list -->
<item android:id="@+id/mute" android:title="@string/mute_user"/>
<item android:id="@+id/block" android:title="@string/block_user"/>
<item android:id="@+id/report" android:title="@string/report_user"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user"/>
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
<group android:orderInCategory="1">
<item android:id="@+id/share" android:title="@string/share_user"/>
<item android:id="@+id/add_to_list" android:title="@string/add_user_to_list"/>
<item android:id="@+id/mute" android:title="@string/mute_user"/>
<item android:id="@+id/block" android:title="@string/block_user"/>
<item android:id="@+id/report" android:title="@string/report_user"/>
<item android:id="@+id/block_domain" android:title="@string/block_domain"/>
<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user"/>
<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser"/>
</group>
</menu>

0
mastodon/src/main/res/menu/settings_filter_words.xml → mastodon/src/main/res/menu/selectable_list.xml
View File

13
mastodon/src/main/res/menu/standalone_list_timeline.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/members"
android:icon="@drawable/ic_group_24px"
android:title="@string/list_members"
android:showAsAction="always"/>
<item
android:id="@+id/edit_list"
android:icon="@drawable/ic_edit_24px"
android:showAsAction="always"
android:title="@string/edit_list"/>
</menu>

3
mastodon/src/main/res/values/ids.xml
View File

@@ -16,6 +16,7 @@
<item name="notifications_mentions" type="id"/>
<item name="save" type="id"/>
<item name="remove_from_list" type="id"/>
<item name="list_item_simple" type="id"/>
<item name="list_item_simple_tinted" type="id"/>
@@ -23,6 +24,8 @@
<item name="list_item_checkbox" type="id"/>
<item name="list_item_radio" type="id"/>
<item name="list_item_account" type="id"/>
<item name="list_item_options" type="id"/>
<item name="list_item_avatar_pile" type="id"/>
<item name="server_about" type="id"/>
<item name="server_rules" type="id"/>

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

@@ -610,4 +610,39 @@
</plurals>
<string name="error_playing_video">Error playing video</string>
<string name="timeline_following">Following</string>
<string name="lists">Lists</string>
<string name="followed_hashtags">Followed hashtags</string>
<string name="no_lists">You don\'t have any lists yet.</string>
<string name="no_followed_hashtags">You don\'t follow any hashtags.</string>
<string name="manage_lists">Manage lists</string>
<string name="manage_hashtags">Manage hashtags</string>
<!-- Screen reader description for the menu on the home timeline screen -->
<string name="dropdown_menu">Dropdown menu</string>
<string name="edit_list">Edit list</string>
<string name="list_members">List members</string>
<string name="delete_list">Delete list</string>
<!-- %s is the name of the list -->
<string name="delete_list_confirm">Delete “%s”?</string>
<string name="list_exclusive">Hide members in Following</string>
<string name="list_exclusive_subtitle">If someone is on this list, hide them in your Following timeline to avoid seeing their posts twice.</string>
<string name="list_name">List name</string>
<string name="list_show_replies_to">Show replies to</string>
<string name="list_replies_no_one">No one</string>
<string name="list_replies_members">Members of the list</string>
<string name="list_replies_anyone">Anyone I follow</string>
<string name="confirm_remove_list_members">Remove members?</string>
<string name="remove">Remove</string>
<string name="add_list_member">Add member</string>
<string name="search_among_people_you_follow">Search among people you follow</string>
<string name="add_user_to_list">Add to list…</string>
<string name="add_user_to_list_title">Add to list</string>
<!-- %s is a username -->
<string name="manage_user_lists">Manage the lists %s appears on</string>
<string name="remove_from_list">Remove from list</string>
<string name="confirm_remove_list_member">Remove member?</string>
<plurals name="x_posts_recently">
<item quantity="one">%,d post recently</item>
<item quantity="other">%,d posts recently</item>
</plurals>
</resources>

15
mastodon/src/main/res/values/styles.xml
View File

@@ -7,6 +7,8 @@
<item name="android:splitMotionEvents">false</item>
<item name="android:windowBackground">@color/m3_sys_light_surface</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
<item name="android:spinnerStyle">@style/Widget.Mastodon.Spinner</item>
<item name="android:actionModeCloseButtonStyle">@style/action_mode_close</item>
<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button.Filled</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
@@ -73,6 +75,8 @@
<item name="android:splitMotionEvents">false</item>
<item name="android:windowBackground">@color/m3_sys_dark_surface</item>
<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
<item name="android:spinnerStyle">@style/Widget.Mastodon.Spinner</item>
<item name="android:actionModeCloseButtonStyle">@style/action_mode_close</item>
<item name="android:buttonStyle">@style/Widget.Mastodon.M3.Button</item>
<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar</item>
@@ -165,7 +169,12 @@
<item name="android:titleTextStyle">@style/action_mode_title</item>
</style>
<style name="action_mode_close" parent="@android:style/Widget.Material.ActionButton.CloseMode">
<item name="android:layout_margin">0dp</item>
</style>
<style name="action_mode_title" parent="android:TextAppearance.Material.Widget.ActionMode.Title">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">?colorM3OnPrimary</item>
</style>
@@ -192,6 +201,12 @@
<item name="android:textAppearance">@style/m3_body_large</item>
</style>
<style name="Widget.Mastodon.Spinner" parent="android:Widget.Material.Light.Spinner">
<item name="android:popupBackground">@drawable/bg_popup</item>
<item name="android:background">@drawable/bg_spinner</item>
<item name="android:backgroundTint">?colorM3OnSurface</item>
</style>
<style name="Theme.Mastodon.Dialog.Alert" parent="android:Theme.Material.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/alert_title</item>
<item name="android:dialogPreferredPadding">24dp</item>