diff options
Diffstat (limited to 'app/src/main/res')
11 files changed, 243 insertions, 13 deletions
diff --git a/app/src/main/res/layout/activity_create_multi_reddit.xml b/app/src/main/res/layout/activity_create_multi_reddit.xml index 07bbcea1..be4bdeda 100644 --- a/app/src/main/res/layout/activity_create_multi_reddit.xml +++ b/app/src/main/res/layout/activity_create_multi_reddit.xml @@ -108,7 +108,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:text="@string/select_subreddit" + android:text="@string/select_subreddits" android:textSize="?attr/font_default" android:textColor="?attr/primaryTextColor" android:clickable="true" @@ -119,5 +119,4 @@ </androidx.core.widget.NestedScrollView> - </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_edit_multi_reddit.xml b/app/src/main/res/layout/activity_edit_multi_reddit.xml new file mode 100644 index 00000000..2cc7af50 --- /dev/null +++ b/app/src/main/res/layout/activity_edit_multi_reddit.xml @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/coordinator_layout_edit_multi_reddit_activity" + tools:context=".Activity.CreateMultiRedditActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/toolbarAndTabBackgroundColor" + android:theme="@style/AppTheme.AppBarOverlay"> + + <com.google.android.material.appbar.CollapsingToolbarLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_edit_multi_reddit_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + + </com.google.android.material.appbar.AppBarLayout> + + <ProgressBar + android:id="@+id/progress_bar_edit_multi_reddit_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> + + <androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <LinearLayout + android:id="@+id/linear_layout_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"> + + <EditText + android:id="@+id/multi_reddit_name_edit_text_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:hint="@string/multi_reddit_name_hint" + android:inputType="textMultiLine" + android:textSize="?attr/font_default" + android:background="#00000000" + android:textColor="?attr/primaryTextColor" + android:maxLength="50" /> + + <View + android:id="@+id/divider_1_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/dividerColor" /> + + <EditText + android:id="@+id/description_edit_text_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:hint="@string/multi_reddit_description_hint" + android:inputType="textMultiLine" + android:textSize="?attr/font_default" + android:background="#00000000" + android:textColor="?attr/primaryTextColor" /> + + <View + android:id="@+id/divider_2_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/dividerColor" /> + + <LinearLayout + android:id="@+id/visibility_wrapper_linear_layout_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:id="@+id/visibility_text_view_edit_multi_reddit_activity" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/private_multi_reddit" + android:textSize="?attr/font_default" + android:textColor="?attr/primaryTextColor" /> + + <Switch + android:id="@+id/visibility_switch_edit_multi_reddit_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:checked="true" /> + + </LinearLayout> + + <TextView + android:id="@+id/select_subreddit_text_view_edit_multi_reddit_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:text="@string/select_subreddits" + android:textSize="?attr/font_default" + android:textColor="?attr/primaryTextColor" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> + + </androidx.core.widget.NestedScrollView> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_selected_subreddits.xml b/app/src/main/res/layout/activity_selected_subreddits.xml new file mode 100644 index 00000000..8484ae58 --- /dev/null +++ b/app/src/main/res/layout/activity_selected_subreddits.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/backgroundColor" + android:id="@+id/coordinator_layout_selected_subreddits_activity" + tools:context=".Activity.AccountPostsActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_selected_subreddits_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/toolbarAndTabBackgroundColor" + android:theme="@style/AppTheme.AppBarOverlay"> + + <com.google.android.material.appbar.CollapsingToolbarLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_selected_subreddits_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_selected_subreddits_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + + </com.google.android.material.appbar.AppBarLayout> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view_selected_subreddits_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab_selected_subreddits_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/fab_margin" + android:layout_gravity="bottom|end" /> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_selected_subreddit.xml b/app/src/main/res/layout/item_selected_subreddit.xml new file mode 100644 index 00000000..9653e179 --- /dev/null +++ b/app/src/main/res/layout/item_selected_subreddit.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="72dp" + android:paddingEnd="16dp"> + + <TextView + android:id="@+id/subreddit_name_item_selected_subreddit" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:layout_marginEnd="16dp" /> + + <ImageView + android:id="@+id/delete_image_view_item_selected_subreddit" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_delete_24dp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/create_multi_reddit_activity.xml b/app/src/main/res/menu/create_multi_reddit_activity.xml index bf151fe6..93a7f1ff 100644 --- a/app/src/main/res/menu/create_multi_reddit_activity.xml +++ b/app/src/main/res/menu/create_multi_reddit_activity.xml @@ -2,9 +2,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/action_create_create_multi_reddit_activity" + android:id="@+id/action_save_create_multi_reddit_activity" android:orderInCategory="1" - android:title="@string/action_send" + android:title="@string/action_save" android:icon="@drawable/ic_add_day_night_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/edit_multi_reddit_activity.xml b/app/src/main/res/menu/edit_multi_reddit_activity.xml new file mode 100644 index 00000000..fc6a5f0d --- /dev/null +++ b/app/src/main/res/menu/edit_multi_reddit_activity.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_save_edit_multi_reddit_activity" + android:orderInCategory="1" + android:title="@string/action_save" + android:icon="@drawable/ic_check_circle_toolbar_24dp" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/selected_subreddits_activity.xml b/app/src/main/res/menu/selected_subreddits_activity.xml new file mode 100644 index 00000000..b24e3e51 --- /dev/null +++ b/app/src/main/res/menu/selected_subreddits_activity.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_save_selected_subreddits_activity" + android:orderInCategory="1" + android:title="@string/action_save" + android:icon="@drawable/ic_check_circle_toolbar_24dp" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml index abaf8a6a..0da0d682 100644 --- a/app/src/main/res/menu/view_multi_reddit_detail_activity.xml +++ b/app/src/main/res/menu/view_multi_reddit_detail_activity.xml @@ -35,8 +35,14 @@ app:showAsAction="never" /> <item - android:id="@+id/action_delte_view_multi_reddit_detail_activity" + android:id="@+id/action_edit_view_multi_reddit_detail_activity" android:orderInCategory="6" + android:title="@string/action_edit_multi_reddit" + app:showAsAction="never" /> + + <item + android:id="@+id/action_delete_view_multi_reddit_detail_activity" + android:orderInCategory="7" android:title="@string/action_delete_multi_reddit" app:showAsAction="never" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e87d9a60..ede07ee1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,6 +23,8 @@ <string name="customize_theme_activity_label">Customize Theme</string> <string name="customize_theme_activity_create_theme_label">Create Theme</string> <string name="theme_preview_activity_label">Theme Preview</string> + <string name="edit_multi_reddit_activity_label">Edit Multireddit</string> + <string name="selected_subeddits_activity_label">Selected Subreddits</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> @@ -51,6 +53,7 @@ <string name="action_change_post_layout">Change Post Layout</string> <string name="action_view_side_bar">View Sidebar</string> <string name="action_save">Save</string> + <string name="action_edit_multi_reddit">Edit MultiReddit</string> <string name="action_delete_multi_reddit">Delete Multireddit</string> <string name="action_share">Share</string> @@ -103,6 +106,7 @@ <string name="cannot_fetch_subreddit_info">Cannot fetch subreddit info</string> <string name="cannot_fetch_user_info">Cannot fetch user info</string> <string name="cannot_fetch_sidebar">Cannot fetch sidebar</string> + <string name="cannot_fetch_multireddit">Cannot fetch multireddit info</string> <string name="gilded_count">x%1$d</string> <string name="title_activity_view_user_detail">ViewUserDetailActivity</string> @@ -308,6 +312,7 @@ <string name="settings_open_link_in_app_title">Open Link In App</string> <string name="settings_immersive_interface_title">Immersive Interface</string> <string name="settings_enable_bottom_app_bar_title">Enable Bottom Navigation</string> + <string name="settings_enable_bottom_app_bar_summary">Has No Effect in Anonymous Mode</string> <string name="settings_vote_buttons_on_the_right_title">Vote Buttons on the Right</string> <string name="settings_volume_keys_navigate_comments_title">Use Volume Keys to Navigate Comments in Posts</string> <string name="settings_volume_keys_navigate_posts_title">Use Volume Keys to Navigate Posts</string> @@ -461,10 +466,11 @@ <string name="multi_reddit_name_hint">Name (Max 50 Characters)</string> <string name="multi_reddit_description_hint">Description</string> <string name="private_multi_reddit">Private</string> - <string name="select_subreddit">Select Subreddit</string> + <string name="select_subreddits">Select Subreddits</string> <string name="no_multi_reddit_name">Where is the name?</string> <string name="create_multi_reddit_failed">Cannot create this multireddit</string> <string name="duplicate_multi_reddit">This multireddit already exists</string> + <string name="edit_multi_reddit_failed">Cannot edit this multireddit</string> <string name="logged_out">You are logged out</string> <string name="subreddit_selected">%1$s selected</string> <string name="delete_multi_reddit_success">Delete successfully</string> diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml index 0ddedb98..c23b977d 100644 --- a/app/src/main/res/xml/interface_preference.xml +++ b/app/src/main/res/xml/interface_preference.xml @@ -16,7 +16,8 @@ <SwitchPreference app:defaultValue="false" app:key="bottom_app_bar" - app:title="@string/settings_enable_bottom_app_bar_title" /> + app:title="@string/settings_enable_bottom_app_bar_title" + app:summary="@string/settings_enable_bottom_app_bar_summary" /> <SwitchPreference app:defaultValue="false" diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml deleted file mode 100644 index 4512198f..00000000 --- a/app/src/main/res/xml/searchable.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<searchable xmlns:android="http://schemas.android.com/apk/res/android" - android:value="@string/app_label" - android:hint="@string/search_hint" - android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" > -</searchable>
\ No newline at end of file |