mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-10-05 21:39:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Optimize some layouts.

Browse Source
This commit is contained in:
Alex Ning
2021-11-01 21:46:37 +08:00
parent d6a66749d3
commit be9bc8d014
13 changed files with 77 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
View File

@@ -1776,7 +1776,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
} else if (holder instanceof PostCard2WithPreviewViewHolder) { } else if (holder instanceof PostCard2WithPreviewViewHolder) {
mGlide.clear(((PostCard2WithPreviewViewHolder) holder).imageView); mGlide.clear(((PostCard2WithPreviewViewHolder) holder).imageView);
((PostCard2WithPreviewViewHolder) holder).imageView.setVisibility(View.GONE); ((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).noPreviewImageView.setVisibility(View.GONE);
((PostCard2WithPreviewViewHolder) holder).progressBar.setVisibility(View.GONE); ((PostCard2WithPreviewViewHolder) holder).progressBar.setVisibility(View.GONE);
((PostCard2WithPreviewViewHolder) holder).videoOrGifIndicatorImageView.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); mGlide.clear(((PostGalleryViewHolder) holder).imageView);
((PostGalleryViewHolder) holder).imageView.setVisibility(View.GONE); ((PostGalleryViewHolder) holder).imageView.setVisibility(View.GONE);
((PostGalleryViewHolder) holder).progressBar.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).videoOrGifIndicatorImageView.setVisibility(View.GONE);
((PostGalleryViewHolder) holder).noPreviewImageView.setVisibility(View.GONE); ((PostGalleryViewHolder) holder).noPreviewImageView.setVisibility(View.GONE);
} }
@@ -3720,8 +3720,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
ImageView videoOrGifIndicatorImageView; ImageView videoOrGifIndicatorImageView;
@BindView(R.id.image_view_item_post_gallery) @BindView(R.id.image_view_item_post_gallery)
AspectRatioGifImageView imageView; 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) @BindView(R.id.load_image_error_text_view_item_gallery)
TextView errorTextView; TextView errorTextView;
@BindView(R.id.image_view_no_preview_item_post_gallery) @BindView(R.id.image_view_no_preview_item_post_gallery)
@@ -3783,9 +3781,9 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
return true; return true;
}); });
errorRelativeLayout.setOnClickListener(view -> { errorTextView.setOnClickListener(view -> {
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
errorRelativeLayout.setVisibility(View.GONE); errorTextView.setVisibility(View.GONE);
loadImage(this); loadImage(this);
}); });
@@ -3797,13 +3795,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) { public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
errorRelativeLayout.setVisibility(View.VISIBLE); errorTextView.setVisibility(View.VISIBLE);
return false; return false;
} }
@Override @Override
public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) { 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); progressBar.setVisibility(View.GONE);
return false; return false;
} }
@@ -4116,8 +4114,6 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
ProgressBar progressBar; ProgressBar progressBar;
@BindView(R.id.image_view_item_post_card_2_with_preview) @BindView(R.id.image_view_item_post_card_2_with_preview)
AspectRatioGifImageView imageView; 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) @BindView(R.id.load_image_error_text_view_item_post_card_2_with_preview)
TextView errorTextView; TextView errorTextView;
@BindView(R.id.image_view_no_preview_gallery_item_post_card_2_with_preview) @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); progressBar.setVisibility(View.VISIBLE);
errorRelativeLayout.setVisibility(View.GONE); errorTextView.setVisibility(View.GONE);
loadImage(this); loadImage(this);
}); });
@@ -4202,13 +4198,13 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
@Override @Override
public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) { public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
errorRelativeLayout.setVisibility(View.VISIBLE); errorTextView.setVisibility(View.VISIBLE);
return false; return false;
} }
@Override @Override
public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) { 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); progressBar.setVisibility(View.GONE);
return false; return false;
} }

3
app/src/main/res/layout/activity_view_post_detail.xml
View File

@@ -54,7 +54,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:visibility="gone" android:visibility="gone"
app:cardElevation="16dp"> app:cardElevation="16dp"
style="?attr/materialCardViewElevatedStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

30
app/src/main/res/layout/activity_view_user_detail.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/coordinator_layout_view_user_detail_activity" 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 <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar_layout_view_user_detail" android:id="@+id/appbar_layout_view_user_detail"
@@ -113,25 +113,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:layout_collapseMode="pin" app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed" app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay" app:popupTheme="@style/AppTheme.PopupOverlay"
app:navigationIcon="?attr/homeAsUpIndicator"/> app:navigationIcon="?attr/homeAsUpIndicator" />
</com.google.android.material.appbar.CollapsingToolbarLayout> </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 </com.google.android.material.appbar.AppBarLayout>
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" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager_view_user_detail_activity" android:id="@+id/view_pager_view_user_detail_activity"

3
app/src/main/res/layout/fragment_theme_preview_posts.xml
View File

@@ -11,7 +11,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardCornerRadius="16dp" app:cardCornerRadius="16dp"
app:cardElevation="2dp"> app:cardElevation="2dp"
style="?attr/materialCardViewElevatedStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout/item_post_card_2_video_autoplay.xml
View File

@@ -16,7 +16,8 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp"
style="?attr/materialCardViewElevatedStyle">
<com.google.android.exoplayer2.ui.AspectRatioFrameLayout <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay" android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay"

3
app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml
View File

@@ -16,7 +16,8 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp"
style="?attr/materialCardViewElevatedStyle">
<com.google.android.exoplayer2.ui.AspectRatioFrameLayout <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay" android:id="@+id/aspect_ratio_frame_layout_item_post_card_2_video_autoplay"

32
app/src/main/res/layout/item_post_card_2_with_preview.xml
View File

@@ -16,7 +16,8 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp"
style="?attr/materialCardViewElevatedStyle">
<ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView <ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
android:id="@+id/image_view_item_post_card_2_with_preview" android:id="@+id/image_view_item_post_card_2_with_preview"
@@ -42,25 +43,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center" />
<RelativeLayout <TextView
android:id="@+id/load_image_error_relative_layout_item_post_card_2_with_preview" android:id="@+id/load_image_error_text_view_item_post_card_2_with_preview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:visibility="gone"> android:drawableTop="@drawable/ic_error_outline_black_24dp"
android:layout_gravity="center"
<TextView android:paddingStart="16dp"
android:id="@+id/load_image_error_text_view_item_post_card_2_with_preview" android:paddingEnd="16dp"
android:layout_width="match_parent" android:text="@string/error_loading_image_tap_to_retry"
android:layout_height="wrap_content" android:textSize="?attr/font_default"
android:drawableTop="@drawable/ic_error_outline_black_24dp" android:fontFamily="?attr/font_family"
android:layout_centerInParent="true" android:visibility="gone" />
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>
<ImageView <ImageView
android:id="@+id/image_view_no_preview_gallery_item_post_card_2_with_preview" android:id="@+id/image_view_no_preview_gallery_item_post_card_2_with_preview"

34
app/src/main/res/layout/item_post_gallery.xml
View File

@@ -7,7 +7,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp"
style="?attr/materialCardViewElevatedStyle">
<ProgressBar <ProgressBar
android:id="@+id/progress_bar_item_post_gallery" android:id="@+id/progress_bar_item_post_gallery"
@@ -40,26 +41,19 @@
android:background="@drawable/play_button_round_background" android:background="@drawable/play_button_round_background"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <TextView
android:id="@+id/load_image_error_relative_layout_item_post_gallery" android:id="@+id/load_image_error_text_view_item_gallery"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:visibility="gone" android:layout_gravity="center"
tools:visibility="visible"> android:paddingStart="16dp"
android:paddingEnd="16dp"
<TextView app:drawableTopCompat="@drawable/ic_error_outline_black_24dp"
android:id="@+id/load_image_error_text_view_item_gallery" android:layout_centerInParent="true"
android:layout_width="match_parent" android:text="@string/error_loading_image_tap_to_retry"
android:layout_height="wrap_content" android:textSize="?attr/font_default"
android:paddingStart="16dp" android:fontFamily="?attr/font_family"
android:paddingEnd="16dp" android:visibility="gone" />
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>
<TextView <TextView
android:id="@+id/title_text_view_item_post_gallery" android:id="@+id/title_text_view_item_post_gallery"

3
app/src/main/res/layout/item_post_text.xml
View File

@@ -7,7 +7,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="16dp"> app:cardCornerRadius="16dp"
style="?attr/materialCardViewElevatedStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout/item_post_video_type_autoplay.xml
View File

@@ -7,7 +7,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="16dp"> app:cardCornerRadius="16dp"
style="?attr/materialCardViewElevatedStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml
View File

@@ -7,7 +7,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="16dp"> app:cardCornerRadius="16dp"
style="?attr/materialCardViewElevatedStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

17
app/src/main/res/layout/item_post_with_preview.xml
View File

@@ -7,7 +7,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
app:cardElevation="2dp" app:cardElevation="2dp"
app:cardCornerRadius="16dp"> app:cardCornerRadius="16dp"
style="?attr/materialCardViewElevatedStyle">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -113,10 +114,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:padding="4dp"
android:text="@string/gallery"
android:textSize="?attr/font_12" android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
app:lib_setRadius="3dp" app:lib_setRadius="6dp"
app:lib_setRoundedView="true" app:lib_setRoundedView="true"
app:lib_setShape="rectangle" /> app:lib_setShape="rectangle" />
@@ -130,7 +130,7 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:padding="4dp" android:padding="4dp"
android:visibility="gone" android:visibility="gone"
app:lib_setRadius="3dp" app:lib_setRadius="6dp"
app:lib_setRoundedView="true" app:lib_setRoundedView="true"
app:lib_setShape="rectangle" /> app:lib_setShape="rectangle" />
@@ -143,7 +143,7 @@
android:textSize="?attr/font_12" android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:visibility="gone" android:visibility="gone"
app:lib_setRadius="3dp" app:lib_setRadius="6dp"
app:lib_setRoundedView="true" app:lib_setRoundedView="true"
app:lib_setShape="rectangle" /> app:lib_setShape="rectangle" />
@@ -156,7 +156,7 @@
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:padding="4dp" android:padding="4dp"
android:visibility="gone" android:visibility="gone"
app:lib_setRadius="3dp" app:lib_setRadius="6dp"
app:lib_setRoundedView="true" app:lib_setRoundedView="true"
app:lib_setShape="rectangle" /> app:lib_setShape="rectangle" />
@@ -168,7 +168,7 @@
android:textSize="?attr/font_12" android:textSize="?attr/font_12"
android:fontFamily="?attr/font_family" android:fontFamily="?attr/font_family"
android:visibility="gone" android:visibility="gone"
app:lib_setRadius="3dp" app:lib_setRadius="6dp"
app:lib_setRoundedView="true" app:lib_setRoundedView="true"
app:lib_setShape="rectangle" /> app:lib_setShape="rectangle" />
@@ -243,7 +243,8 @@
android:gravity="center" android:gravity="center"
android:text="@string/error_loading_image_tap_to_retry" android:text="@string/error_loading_image_tap_to_retry"
android:textSize="?attr/font_default" android:textSize="?attr/font_default"
android:fontFamily="?attr/font_family" /> android:fontFamily="?attr/font_family"
android:visibility="gone" />
</FrameLayout> </FrameLayout>

3
app/src/main/res/layout/item_trending_search.xml
View File

@@ -8,7 +8,8 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
app:cardCornerRadius="16dp" app:cardCornerRadius="16dp"
app:cardElevation="2dp"> app:cardElevation="2dp"
style="?attr/materialCardViewElevatedStyle">
<RelativeLayout <RelativeLayout
android:id="@+id/image_wrapper_relative_layout_item_trending_search" android:id="@+id/image_wrapper_relative_layout_item_trending_search"