diff options
Diffstat (limited to '')
| -rw-r--r-- | app/src/main/res/layout/activity_comment_filter_usage_listing.xml | 49 | ||||
| -rw-r--r-- | app/src/main/res/layout/dialog_edit_post_or_comment_filter_name_of_usage.xml (renamed from app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml) | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml | 52 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml | 52 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 9 |
5 files changed, 157 insertions, 10 deletions
diff --git a/app/src/main/res/layout/activity_comment_filter_usage_listing.xml b/app/src/main/res/layout/activity_comment_filter_usage_listing.xml index 6b268520..75cfc4e3 100644 --- a/app/src/main/res/layout/activity_comment_filter_usage_listing.xml +++ b/app/src/main/res/layout/activity_comment_filter_usage_listing.xml @@ -1,9 +1,52 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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:context=".activities.CommentFilterUsageListingActivity"> + tools:context=".activities.PostFilterUsageListingActivity"> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_comment_filter_usage_listing_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <com.google.android.material.appbar.CollapsingToolbarLayout + android:id="@+id/collapsing_toolbar_layout_comment_filter_usage_listing_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_scrollFlags="scroll|enterAlways" + app:titleEnabled="false" + app:toolbarId="@+id/toolbar_comment_filter_usage_listing_activity"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_comment_filter_usage_listing_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?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_comment_filter_usage_listing_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab_comment_filter_usage_listing_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/fab_margin" + android:layout_gravity="bottom|end" + app:backgroundTint="?attr/colorPrimaryLightTheme" + app:srcCompat="@drawable/ic_add_day_night_24dp" + app:tint="@android:color/white" /> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml b/app/src/main/res/layout/dialog_edit_post_or_comment_filter_name_of_usage.xml index 48ee48f1..df776bae 100644 --- a/app/src/main/res/layout/dialog_edit_post_filter_name_of_usage.xml +++ b/app/src/main/res/layout/dialog_edit_post_or_comment_filter_name_of_usage.xml @@ -5,6 +5,7 @@ android:orientation="vertical"> <TextView + android:id="@+id/message_text_view_edit_post_or_comment_filter_name_of_usage_dialog" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="16dp" @@ -17,7 +18,7 @@ android:fontFamily="?attr/font_family" /> <com.google.android.material.textfield.TextInputLayout - android:id="@+id/text_input_layout_edit_post_filter_name_of_usage_dialog" + android:id="@+id/text_input_layout_edit_post_or_comment_filter_name_of_usage_dialog" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="8dp" @@ -27,7 +28,7 @@ style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> <com.google.android.material.textfield.TextInputEditText - android:id="@+id/text_input_edit_text_edit_post_filter_name_of_usage_dialog" + android:id="@+id/text_input_edit_text_edit_post_or_comment_filter_name_of_usage_dialog" android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="?attr/font_family" diff --git a/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml new file mode 100644 index 00000000..cc9e4926 --- /dev/null +++ b/app/src/main/res/layout/fragment_comment_filter_usage_options_bottom_sheet.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:paddingBottom="8dp" + android:overScrollMode="never"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/edit_text_view_comment_filter_usage_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/edit" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + app:drawableStartCompat="@drawable/ic_edit_24dp" + android:drawablePadding="48dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/delete_text_view_comment_filter_usage_options_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/delete" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + app:drawableStartCompat="@drawable/ic_delete_24dp" + android:drawablePadding="48dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> + +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml b/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml new file mode 100644 index 00000000..2cd5e545 --- /dev/null +++ b/app/src/main/res/layout/fragment_new_comment_filter_usage_bottom_sheet.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:paddingBottom="8dp" + android:overScrollMode="never"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:id="@+id/subreddit_text_view_new_comment_filter_usage_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/subreddit" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + app:drawableStartCompat="@drawable/ic_subreddit_24dp" + android:drawablePadding="48dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/user_text_view_new_comment_filter_usage_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/user" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + app:drawableStartCompat="@drawable/ic_user_24dp" + android:drawablePadding="48dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> + +</androidx.core.widget.NestedScrollView>
\ 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 9090da33..6f97b59f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1159,11 +1159,15 @@ <string name="subreddit">Subreddit</string> <string name="user">User</string> <string name="edit_post_filter_name_of_usage_info">Leave it blank to apply this post filter to all the subreddits / users / multireddits</string> + <string name="click_to_apply_post_filter">Click here to apply it to some post feeds</string> + <string name="post_filter_usage_embedded_more_count">and %1$d more</string> <string name="comment_filter_name_hint">Comment Filter Name</string> <string name="comment_filter_requires_a_name">What is the name of this comment filter?</string> <string name="duplicate_comment_filter_dialog_title">\'%1$s\' Already Exists</string> <string name="duplicate_comment_filter_dialog_message">Override it?</string> + <string name="comment_filter_applied_to_all_subreddits">Applied to all subreddits</string> + <string name="comment_filter_usage_embedded_more_count">and %1$d more</string> <string name="read_all_messages_time_limit">You are doing this too frequently. Try again later. This is Reddit API\'s rate limit.</string> <string name="read_all_messages_success">Read all messages successfully</string> @@ -1383,9 +1387,4 @@ Otherwise, Infinity may not load posts at all. Sorry for the inconvenience.</string> <string name="i_understand">I understand</string> - <string name="click_to_apply_post_filter">Click here to apply it to some post feeds</string> - <string name="post_filter_usage_embedded_more_count">and %1$d more</string> - <string name="comment_filter_applied_to_all_subreddits">Applied to all subreddits</string> - <string name="comment_filter_usage_embedded_more_count">and %1$d more</string> - </resources> |