diff options
Diffstat (limited to '')
13 files changed, 77 insertions, 84 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java index 11d4145b..448013f1 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java @@ -1776,7 +1776,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } else if (holder instanceof PostCard2WithPreviewViewHolder) { mGlide.clear(((PostCard2WithPreviewViewHolder) holder).imageView); ((PostCard2WithPreviewViewHolder) holder).imageView.setVisibility(View.GONE); - ((PostCard2WithPreviewViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE); + ((PostCard2WithPreviewViewHolder) holder).errorTextView.setVisibility(View.GONE); ((PostCard2WithPreviewViewHolder) holder).noPreviewImageView.setVisibility(View.GONE); ((PostCard2WithPreviewViewHolder) holder).progressBar.setVisibility(View.GONE); ((PostCard2WithPreviewViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.GONE); @@ -1847,7 +1847,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie mGlide.clear(((PostGalleryViewHolder) holder).imageView); ((PostGalleryViewHolder) holder).imageView.setVisibility(View.GONE); ((PostGalleryViewHolder) holder).progressBar.setVisibility(View.GONE); - ((PostGalleryViewHolder) holder).errorRelativeLayout.setVisibility(View.GONE); + ((PostGalleryViewHolder) holder).errorTextView.setVisibility(View.GONE); ((PostGalleryViewHolder) holder).videoOrGifIndicatorImageView.setVisibility(View.GONE); ((PostGalleryViewHolder) holder).noPreviewImageView.setVisibility(View.GONE); } @@ -3720,8 +3720,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ImageView videoOrGifIndicatorImageView; @BindView(R.id.image_view_item_post_gallery) AspectRatioGifImageView imageView; - @BindView(R.id.load_image_error_relative_layout_item_post_gallery) - RelativeLayout errorRelativeLayout; @BindView(R.id.load_image_error_text_view_item_gallery) TextView errorTextView; @BindView(R.id.image_view_no_preview_item_post_gallery) @@ -3783,9 +3781,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie return true; }); - errorRelativeLayout.setOnClickListener(view -> { + errorTextView.setOnClickListener(view -> { progressBar.setVisibility(View.VISIBLE); - errorRelativeLayout.setVisibility(View.GONE); + errorTextView.setVisibility(View.GONE); loadImage(this); }); @@ -3797,13 +3795,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) { progressBar.setVisibility(View.GONE); - errorRelativeLayout.setVisibility(View.VISIBLE); + errorTextView.setVisibility(View.VISIBLE); return false; } @Override public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) { - errorRelativeLayout.setVisibility(View.GONE); + errorTextView.setVisibility(View.GONE); progressBar.setVisibility(View.GONE); return false; } @@ -4116,8 +4114,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie ProgressBar progressBar; @BindView(R.id.image_view_item_post_card_2_with_preview) AspectRatioGifImageView imageView; - @BindView(R.id.load_image_error_relative_layout_item_post_card_2_with_preview) - RelativeLayout errorRelativeLayout; @BindView(R.id.load_image_error_text_view_item_post_card_2_with_preview) TextView errorTextView; @BindView(R.id.image_view_no_preview_gallery_item_post_card_2_with_preview) @@ -4188,9 +4184,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie } }); - errorRelativeLayout.setOnClickListener(view -> { + errorTextView.setOnClickListener(view -> { progressBar.setVisibility(View.VISIBLE); - errorRelativeLayout.setVisibility(View.GONE); + errorTextView.setVisibility(View.GONE); loadImage(this); }); @@ -4202,13 +4198,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie @Override public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) { progressBar.setVisibility(View.GONE); - errorRelativeLayout.setVisibility(View.VISIBLE); + errorTextView.setVisibility(View.VISIBLE); return false; } @Override public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) { - errorRelativeLayout.setVisibility(View.GONE); + errorTextView.setVisibility(View.GONE); progressBar.setVisibility(View.GONE); return false; } diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml index 2b6052ed..3746f5c6 100644 --- a/app/src/main/res/layout/activity_view_post_detail.xml +++ b/app/src/main/res/layout/activity_view_post_detail.xml @@ -54,7 +54,8 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:visibility="gone" - app:cardElevation="16dp"> + app:cardElevation="16dp" + style="?attr/materialCardViewElevatedStyle"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index aae1c85a..c312e808 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_user_detail_activity" - tools:application=".ViewUserDetailActivity"> + tools:application="ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_user_detail" @@ -113,25 +113,25 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" app:layout_collapseMode="pin" - app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed" + app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay" - app:navigationIcon="?attr/homeAsUpIndicator"/> + app:navigationIcon="?attr/homeAsUpIndicator" /> </com.google.android.material.appbar.CollapsingToolbarLayout> - </com.google.android.material.appbar.AppBarLayout> + <com.google.android.material.tabs.TabLayout + android:id="@+id/tab_layout_view_user_detail_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + app:layout_scrollFlags="scroll|enterAlways" + app:tabGravity="fill" + app:tabMode="fixed" + app:tabIndicatorHeight="3dp" + app:tabRippleColor="?attr/colorControlHighlight" + app:tabUnboundedRipple="false" /> - <com.google.android.material.tabs.TabLayout - android:id="@+id/tab_layout_view_user_detail_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - app:layout_scrollFlags="scroll|enterAlways" - app:tabGravity="fill" - app:tabMode="fixed" - app:tabIndicatorHeight="3dp" - app:tabRippleColor="?attr/colorControlHighlight" - app:tabUnboundedRipple="false" /> + </com.google.android.material.appbar.AppBarLayout> <androidx.viewpager2.widget.ViewPager2 android:id="@+id/view_pager_view_user_detail_activity" diff --git a/app/src/main/res/layout/fragment_theme_preview_posts.xml b/app/src/main/res/layout/fragment_theme_preview_posts.xml index aaf14a30..8c0169cf 100644 --- a/app/src/main/res/layout/fragment_theme_preview_posts.xml +++ b/app/src/main/res/layout/fragment_theme_preview_posts.xml @@ -11,7 +11,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardCornerRadius="16dp" - app:cardElevation="2dp"> + app:cardElevation="2dp" + style="?attr/materialCardViewElevatedStyle"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml index 1846c3df..ef8794ce 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml @@ -16,7 +16,8 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:cardElevation="2dp" - app:cardCornerRadius="8dp"> + app:cardCornerRadius="8dp" + style="?attr/materialCardViewElevatedStyle"> <com.google.android.exoplayer2.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay" diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml index 81030a91..4f5dc4f2 100644 --- a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml @@ -16,7 +16,8 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:cardElevation="2dp" - app:cardCornerRadius="8dp"> + app:cardCornerRadius="8dp" + style="?attr/materialCardViewElevatedStyle"> <com.google.android.exoplayer2.ui.AspectRatioFrameLayout android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay" diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml index 0accab55..298e77ce 100644 --- a/app/src/main/res/layout/item_post_card_2_with_preview.xml +++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml @@ -16,7 +16,8 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:cardElevation="2dp" - app:cardCornerRadius="8dp"> + app:cardCornerRadius="8dp" + style="?attr/materialCardViewElevatedStyle"> <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView android:id="@+id/image_view_item_post_card_2_with_preview" @@ -42,25 +43,18 @@ android:layout_height="wrap_content" android:layout_gravity="center" /> - <RelativeLayout - android:id="@+id/load_image_error_relative_layout_item_post_card_2_with_preview" + <TextView + android:id="@+id/load_image_error_text_view_item_post_card_2_with_preview" android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone"> - - <TextView - android:id="@+id/load_image_error_text_view_item_post_card_2_with_preview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:drawableTop="@drawable/ic_error_outline_black_24dp" - android:layout_centerInParent="true" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> - - </RelativeLayout> + android:layout_height="wrap_content" + android:drawableTop="@drawable/ic_error_outline_black_24dp" + android:layout_gravity="center" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:text="@string/error_loading_image_tap_to_retry" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:visibility="gone" /> <ImageView android:id="@+id/image_view_no_preview_gallery_item_post_card_2_with_preview" diff --git a/app/src/main/res/layout/item_post_gallery.xml b/app/src/main/res/layout/item_post_gallery.xml index 19a2e418..128b65dc 100644 --- a/app/src/main/res/layout/item_post_gallery.xml +++ b/app/src/main/res/layout/item_post_gallery.xml @@ -7,7 +7,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardElevation="2dp" - app:cardCornerRadius="8dp"> + app:cardCornerRadius="8dp" + style="?attr/materialCardViewElevatedStyle"> <ProgressBar android:id="@+id/progress_bar_item_post_gallery" @@ -40,26 +41,19 @@ android:background="@drawable/play_button_round_background" android:visibility="gone" /> - <RelativeLayout - android:id="@+id/load_image_error_relative_layout_item_post_gallery" + <TextView + android:id="@+id/load_image_error_text_view_item_gallery" android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - tools:visibility="visible"> - - <TextView - android:id="@+id/load_image_error_text_view_item_gallery" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="16dp" - android:paddingEnd="16dp" - app:drawableTopCompat="@drawable/ic_error_outline_black_24dp" - android:layout_centerInParent="true" - android:text="@string/error_loading_image_tap_to_retry" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> - - </RelativeLayout> + android:layout_height="wrap_content" + android:layout_gravity="center" + android:paddingStart="16dp" + android:paddingEnd="16dp" + app:drawableTopCompat="@drawable/ic_error_outline_black_24dp" + android:layout_centerInParent="true" + android:text="@string/error_loading_image_tap_to_retry" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:visibility="gone" /> <TextView android:id="@+id/title_text_view_item_post_gallery" diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml index cd9eb21b..b2b979b1 100644 --- a/app/src/main/res/layout/item_post_text.xml +++ b/app/src/main/res/layout/item_post_text.xml @@ -7,7 +7,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardElevation="2dp" - app:cardCornerRadius="16dp"> + app:cardCornerRadius="16dp" + style="?attr/materialCardViewElevatedStyle"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml index 33bdf97f..5afde9c1 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml @@ -7,7 +7,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardElevation="2dp" - app:cardCornerRadius="16dp"> + app:cardCornerRadius="16dp" + style="?attr/materialCardViewElevatedStyle"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml index bb3a07e2..b8f4a27c 100644 --- a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml +++ b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml @@ -7,7 +7,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardElevation="2dp" - app:cardCornerRadius="16dp"> + app:cardCornerRadius="16dp" + style="?attr/materialCardViewElevatedStyle"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml index a6ad895c..91014578 100644 --- a/app/src/main/res/layout/item_post_with_preview.xml +++ b/app/src/main/res/layout/item_post_with_preview.xml @@ -7,7 +7,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" app:cardElevation="2dp" - app:cardCornerRadius="16dp"> + app:cardCornerRadius="16dp" + style="?attr/materialCardViewElevatedStyle"> <LinearLayout android:layout_width="match_parent" @@ -113,10 +114,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="4dp" - android:text="@string/gallery" android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -130,7 +130,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -143,7 +143,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -156,7 +156,7 @@ android:fontFamily="?attr/font_family" android:padding="4dp" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -168,7 +168,7 @@ android:textSize="?attr/font_12" android:fontFamily="?attr/font_family" android:visibility="gone" - app:lib_setRadius="3dp" + app:lib_setRadius="6dp" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -243,7 +243,8 @@ android:gravity="center" android:text="@string/error_loading_image_tap_to_retry" android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> + android:fontFamily="?attr/font_family" + android:visibility="gone" /> </FrameLayout> diff --git a/app/src/main/res/layout/item_trending_search.xml b/app/src/main/res/layout/item_trending_search.xml index d1cdbded..8a14922a 100644 --- a/app/src/main/res/layout/item_trending_search.xml +++ b/app/src/main/res/layout/item_trending_search.xml @@ -8,7 +8,8 @@ android:layout_marginStart="16dp" android:layout_marginEnd="16dp" app:cardCornerRadius="16dp" - app:cardElevation="2dp"> + app:cardElevation="2dp" + style="?attr/materialCardViewElevatedStyle"> <RelativeLayout android:id="@+id/image_wrapper_relative_layout_item_trending_search" |