diff options
author | Alex Ning <chineseperson5@gmail.com> | 2020-02-18 10:16:04 +0000 |
---|---|---|
committer | Alex Ning <chineseperson5@gmail.com> | 2020-02-18 10:16:04 +0000 |
commit | bc043c442f4069157cf608e1b71d9c3ab3d0389e (patch) | |
tree | a566114a46b7b37c2b8c418ba993b3f6eaee0497 /app/src/main/res | |
parent | af6d3643229ac54adfc9ce42a2bdf0f31b16e743 (diff) | |
download | infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.tar infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.tar.gz infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.tar.bz2 infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.tar.lz infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.tar.xz infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.tar.zst infinity-for-reddit-bc043c442f4069157cf608e1b71d9c3ab3d0389e.zip |
Selecting subreddits when creating multireddits is now available.
Diffstat (limited to '')
5 files changed, 141 insertions, 0 deletions
diff --git a/app/src/main/res/drawable/ic_check_circle_menu_item_24dp.xml b/app/src/main/res/drawable/ic_check_circle_menu_item_24dp.xml new file mode 100644 index 00000000..191a8e4c --- /dev/null +++ b/app/src/main/res/drawable/ic_check_circle_menu_item_24dp.xml @@ -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="#FFFFFFFF" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM16.59,7.58L10,14.17l-2.59,-2.58L6,13l4,4 8,-8z"/> +</vector> diff --git a/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml new file mode 100644 index 00000000..bb58b2a6 --- /dev/null +++ b/app/src/main/res/layout/activity_subscribed_subreddits_multiselection.xml @@ -0,0 +1,74 @@ +<?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" + tools:application=".SubscribedSubredditsListingFragment"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_subreddits_multiselection_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_subscribed_subreddits_multiselection_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_subscribed_subreddits_multiselection_activity" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:layout_collapseMode="pin" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + + </com.google.android.material.appbar.AppBarLayout> + + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swipe_refresh_layout_subscribed_subscribed_subreddits_multiselection_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view_subscribed_subscribed_subreddits_multiselection_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" /> + + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + + <LinearLayout + android:id="@+id/no_subscriptions_linear_layout_subscribed_subreddits_multiselection_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginBottom="48dp" + android:gravity="center" + android:orientation="vertical" + android:visibility="gone" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <ImageView + android:id="@+id/no_subscriptions_image_view_subscribed_subreddits_multiselection_activity" + android:layout_width="150dp" + android:layout_height="wrap_content" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:gravity="center" + android:text="@string/no_subreddits" + android:textSize="?attr/font_default" /> + + </LinearLayout> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml new file mode 100644 index 00000000..22327517 --- /dev/null +++ b/app/src/main/res/layout/item_subscribed_subreddit_multi_selection.xml @@ -0,0 +1,37 @@ +<?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:paddingStart="16dp" + android:paddingEnd="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <pl.droidsonroids.gif.GifImageView + android:id="@+id/icon_gif_image_view_item_subscribed_subreddit_multiselection" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center_vertical" + android:layout_marginEnd="32dp" /> + + <TextView + android:id="@+id/name_text_view_item_subscribed_subreddit_multiselection" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:layout_marginEnd="32dp" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + <CheckBox + android:id="@+id/checkbox_item_subscribed_subreddit_multiselection" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" /> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/subreddit_multiselection_activity.xml b/app/src/main/res/menu/subreddit_multiselection_activity.xml new file mode 100644 index 00000000..0a9d4ff3 --- /dev/null +++ b/app/src/main/res/menu/subreddit_multiselection_activity.xml @@ -0,0 +1,17 @@ +<?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_subreddit_multiselection_activity" + android:orderInCategory="1" + android:title="@string/action_save" + android:icon="@drawable/ic_check_circle_menu_item_24dp" + app:showAsAction="ifRoom" /> + + <item + android:id="@+id/action_search_subreddit_multiselection_activity" + android:orderInCategory="2" + android:title="@string/action_search" + android:icon="@drawable/ic_search_white_24dp" + app:showAsAction="ifRoom" /> +</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 0a57087b..9e8351f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ <string name="account_saved_thing_activity_label">Saved</string> <string name="multi_reddit_listing_activity_label">Multireddit</string> <string name="create_multi_reddit_activity_label">Create Multireddit</string> + <string name="subreddit_multiselection_activity_label">Select Subreddits</string> <string name="navigation_drawer_open">Open navigation drawer</string> <string name="navigation_drawer_close">Close navigation drawer</string> @@ -45,6 +46,7 @@ <string name="action_edit_flair">Edit Flair</string> <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="parse_json_response_error">Error occurred when parsing the JSON response</string> <string name="retrieve_token_error">Error Retrieving the token</string> @@ -436,4 +438,6 @@ <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="logged_out">You are logged out</string> + <string name="subreddit_selected">%1$s selected</string> </resources> |