diff options
Diffstat (limited to 'app/src')
7 files changed, 576 insertions, 529 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java index 23bd0cd1..e5f8c2f3 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/PostFragment.java @@ -269,7 +269,6 @@ public class PostFragment extends Fragment implements FragmentCommunicator { } int postType = getArguments().getInt(EXTRA_POST_TYPE); - //String sortType = getArguments().getString(EXTRA_SORT_TYPE); int filter = getArguments().getInt(EXTRA_FILTER); String accessToken = getArguments().getString(EXTRA_ACCESS_TOKEN); @@ -491,6 +490,10 @@ public class PostFragment extends Fragment implements FragmentCommunicator { } public void changeSortType(SortType sortType) { + if (mFetchPostInfoLinearLayout.getVisibility() != View.GONE) { + mFetchPostInfoLinearLayout.setVisibility(View.GONE); + mGlide.clear(mFetchPostInfoImageView); + } mPostViewModel.changeSortType(sortType); } diff --git a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml index 7673abba..7f7fae31 100644 --- a/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_comment_sort_type_bottom_sheet.xml @@ -1,144 +1,151 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" + android:layout_height="wrap_content" + android:overScrollMode="never" tools:context=".Fragment.PostCommentSortTypeBottomSheetFragment"> - <TextView - android:id="@+id/best_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/sort_best" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + android:orientation="vertical"> - <TextView - android:id="@+id/confidence_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_confidence" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/best_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_best" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/top_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/confidence_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_confidence" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/new_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/top_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_top" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/controversial_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/new_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_new" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/old_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_old" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/controversial_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_controversial" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/random_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_random" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/old_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_old" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/qa_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_qa" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/random_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_random" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> - <TextView - android:id="@+id/live_type_text_view_post_comment_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_live" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/qa_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_qa" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + <TextView + android:id="@+id/live_type_text_view_post_comment_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:paddingStart="32dp" + android:paddingTop="16dp" + android:paddingEnd="32dp" + android:paddingBottom="16dp" + android:text="@string/sort_live" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml index aa15e791..8025c8d0 100644 --- a/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_post_type_bottom_sheet.xml @@ -1,128 +1,135 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:paddingBottom="8dp" - android:orientation="vertical"> + android:overScrollMode="never"> <LinearLayout - android:id="@+id/text_type_linear_layout_post_type_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" > - - <ImageView - android:layout_width="18dp" - android:layout_height="18dp" - android:layout_gravity="center_vertical" - android:layout_marginEnd="48dp" - android:src="@drawable/ic_outline_text_24px" - android:tint="@color/primaryTextColor" /> - - <TextView + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/text_type_linear_layout_post_type_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/bottom_sheet_post_text" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/link_type_linear_layout_post_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" > - - <ImageView - android:layout_width="18dp" - android:layout_height="18dp" - android:layout_gravity="center_vertical" - android:layout_marginEnd="48dp" - android:src="@drawable/ic_link" - android:tint="@color/primaryTextColor" /> - - <TextView + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" > + + <ImageView + android:layout_width="18dp" + android:layout_height="18dp" + android:layout_gravity="center_vertical" + android:layout_marginEnd="48dp" + android:src="@drawable/ic_outline_text_24px" + android:tint="@color/primaryTextColor" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/bottom_sheet_post_text" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/link_type_linear_layout_post_type_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/bottom_sheet_post_link" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/image_type_linear_layout_post_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" > - - <ImageView - android:layout_width="18dp" - android:layout_height="18dp" - android:layout_gravity="center_vertical" - android:layout_marginEnd="48dp" - android:src="@drawable/ic_menu_gallery" - android:tint="@color/primaryTextColor" /> - - <TextView + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" > + + <ImageView + android:layout_width="18dp" + android:layout_height="18dp" + android:layout_gravity="center_vertical" + android:layout_marginEnd="48dp" + android:src="@drawable/ic_link" + android:tint="@color/primaryTextColor" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/bottom_sheet_post_link" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/image_type_linear_layout_post_type_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/bottom_sheet_post_image" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" /> - - </LinearLayout> - - <LinearLayout - android:id="@+id/video_type_linear_layout_post_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" > - - <ImageView - android:layout_width="18dp" - android:layout_height="18dp" - android:layout_marginEnd="48dp" - android:layout_gravity="center_vertical" - android:src="@drawable/ic_outline_video_label_24px" - android:tint="@color/primaryTextColor" /> - - <TextView + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" > + + <ImageView + android:layout_width="18dp" + android:layout_height="18dp" + android:layout_gravity="center_vertical" + android:layout_marginEnd="48dp" + android:src="@drawable/ic_menu_gallery" + android:tint="@color/primaryTextColor" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/bottom_sheet_post_image" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/video_type_linear_layout_post_type_bottom_sheet_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/bottom_sheet_post_video" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" /> + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" > + + <ImageView + android:layout_width="18dp" + android:layout_height="18dp" + android:layout_marginEnd="48dp" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_outline_video_label_24px" + android:tint="@color/primaryTextColor" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/bottom_sheet_post_video" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" /> + + </LinearLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml index 8b615fc8..88b5391f 100644 --- a/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_post_sort_type_bottom_sheet.xml @@ -1,82 +1,90 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="8dp"> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:overScrollMode="never"> - <TextView - android:id="@+id/relevance_type_text_view_search_sort_type_bottom_sheet_fragment" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/sort_relevance" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + android:orientation="vertical"> - <TextView - android:id="@+id/hot_type_text_view_search_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/relevance_type_text_view_search_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_relevance" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/top_type_text_view_search_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/hot_type_text_view_search_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_hot" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/new_type_text_view_search_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/top_type_text_view_search_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_top" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/comments_type_text_view_search_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_comments" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/new_type_text_view_search_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_new" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/comments_type_text_view_search_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_comments" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml index 79579bfa..852cfc6c 100644 --- a/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_search_user_and_subreddit_sort_type_bottom_sheet.xml @@ -1,38 +1,45 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:paddingBottom="8dp" - android:orientation="vertical"> + android:overScrollMode="never"> - <TextView - android:id="@+id/relevance_type_text_view_search_user_and_subreddit_sort_type_bottom_sheet_fragment" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/sort_relevance" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + android:orientation="vertical"> - <TextView - android:id="@+id/activity_type_text_view_search_user_and_subreddit_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_activity" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/relevance_type_text_view_search_user_and_subreddit_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_relevance" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/activity_type_text_view_search_user_and_subreddit_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_activity" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml index d08066e0..5975b2cc 100644 --- a/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_time_bottom_sheet.xml @@ -1,100 +1,107 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" + android:layout_height="wrap_content" android:paddingBottom="8dp" + android:overScrollMode="never" tools:context=".Fragment.SortTimeBottomSheetFragment"> - <TextView - android:id="@+id/hour_text_view_sort_time_bottom_sheet_fragment" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/sort_time_hour" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + android:orientation="vertical"> - <TextView - android:id="@+id/day_text_view_sort_time_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_time_day" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/hour_text_view_sort_time_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_time_hour" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/week_text_view_sort_time_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_time_week" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/day_text_view_sort_time_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_time_day" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/month_text_view_sort_time_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_time_month" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/week_text_view_sort_time_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_time_week" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/year_text_view_sort_time_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_time_year" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/month_text_view_sort_time_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_time_month" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/all_time_text_view_sort_time_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_time_all_time" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/year_text_view_sort_time_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_time_year" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/all_time_text_view_sort_time_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_time_all_time" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</androidx.core.widget.NestedScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml index a92cfc2c..731f35df 100644 --- a/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_sort_type_bottom_sheet.xml @@ -1,112 +1,120 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="8dp"> +<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:overScrollMode="never"> - <TextView - android:id="@+id/best_type_text_view_sort_type_bottom_sheet_fragment" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/sort_best" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + android:orientation="vertical"> - <TextView - android:id="@+id/hot_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_hot" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/best_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_best" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/new_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_new" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/hot_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_hot" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/random_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_random" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/new_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_new" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/rising_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_rising" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/random_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_random" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/top_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_top" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/rising_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_rising" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> - <TextView - android:id="@+id/controversial_type_text_view_sort_type_bottom_sheet_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sort_controversial" - android:textColor="@color/primaryTextColor" - android:textSize="?attr/font_default" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingStart="32dp" - android:paddingEnd="32dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground" /> + <TextView + android:id="@+id/top_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_top" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + <TextView + android:id="@+id/controversial_type_text_view_sort_type_bottom_sheet_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/sort_controversial" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground" /> + + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</androidx.core.widget.NestedScrollView>
\ No newline at end of file |