mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2024-11-10 20:57:25 +01:00
Continue adding Gallery Layout.
This commit is contained in:
parent
83ffdb5511
commit
538827f11e
@ -3424,11 +3424,29 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
|
|||||||
super(itemView);
|
super(itemView);
|
||||||
ButterKnife.bind(this, itemView);
|
ButterKnife.bind(this, itemView);
|
||||||
|
|
||||||
|
itemView.setBackgroundTintList(ColorStateList.valueOf(mCardViewBackgroundColor));
|
||||||
titleTextView.setTextColor(mPostTitleColor);
|
titleTextView.setTextColor(mPostTitleColor);
|
||||||
progressBar.setIndeterminateTintList(ColorStateList.valueOf(mColorAccent));
|
progressBar.setIndeterminateTintList(ColorStateList.valueOf(mColorAccent));
|
||||||
noPreviewImageView.setBackgroundColor(mNoPreviewPostTypeBackgroundColor);
|
noPreviewImageView.setBackgroundColor(mNoPreviewPostTypeBackgroundColor);
|
||||||
noPreviewImageView.setColorFilter(mNoPreviewPostTypeIconTint, android.graphics.PorterDuff.Mode.SRC_IN);
|
noPreviewImageView.setColorFilter(mNoPreviewPostTypeIconTint, android.graphics.PorterDuff.Mode.SRC_IN);
|
||||||
errorTextView.setTextColor(mPrimaryTextColor);
|
errorTextView.setTextColor(mPrimaryTextColor);
|
||||||
|
|
||||||
|
itemView.setOnClickListener(view -> {
|
||||||
|
int position = getBindingAdapterPosition();
|
||||||
|
if (position >= 0 && canStartActivity) {
|
||||||
|
Post post = getItem(position);
|
||||||
|
if (post != null) {
|
||||||
|
//markPostRead(post, true);
|
||||||
|
canStartActivity = false;
|
||||||
|
|
||||||
|
Intent intent = new Intent(mActivity, ViewPostDetailActivity.class);
|
||||||
|
intent.putExtra(ViewPostDetailActivity.EXTRA_POST_DATA, post);
|
||||||
|
intent.putExtra(ViewPostDetailActivity.EXTRA_POST_LIST_POSITION, getBindingAdapterPosition());
|
||||||
|
intent.putExtra(ViewPostDetailActivity.EXTRA_POST_FRAGMENT_ID, mFragment.getPostFragmentId());
|
||||||
|
mActivity.startActivity(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1711,9 +1711,9 @@ public class PostFragment extends Fragment implements FragmentCommunicator {
|
|||||||
int halfOffset = mItemOffset / 2;
|
int halfOffset = mItemOffset / 2;
|
||||||
|
|
||||||
if (spanIndex == 0) {
|
if (spanIndex == 0) {
|
||||||
outRect.set(0, 0, halfOffset, 0);
|
outRect.set(halfOffset, 0, halfOffset, 0);
|
||||||
} else {
|
} else {
|
||||||
outRect.set(halfOffset, 0, 0, 0);
|
outRect.set(halfOffset, 0, halfOffset, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,67 +1,80 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
android:layout_marginTop="8dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
app:cardElevation="2dp"
|
||||||
|
app:cardCornerRadius="8dp">
|
||||||
|
|
||||||
<ProgressBar
|
<FrameLayout
|
||||||
android:id="@+id/progress_bar_item_post_gallery"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/video_or_gif_indicator_image_view_item_post_gallery"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="16dp"
|
|
||||||
android:layout_gravity="start"
|
|
||||||
android:background="@drawable/play_button_round_background"
|
|
||||||
android:src="@drawable/ic_play_circle_36dp"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/load_image_error_relative_layout_item_post_gallery"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content">
|
||||||
android:layout_gravity="center"
|
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<TextView
|
<ProgressBar
|
||||||
android:id="@+id/load_image_error_text_view_item_gallery"
|
android:id="@+id/progress_bar_item_post_gallery"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/video_or_gif_indicator_image_view_item_post_gallery"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="16dp"
|
||||||
|
android:layout_gravity="start"
|
||||||
|
android:background="@drawable/play_button_round_background"
|
||||||
|
android:src="@drawable/ic_play_circle_36dp"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/load_image_error_relative_layout_item_post_gallery"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:visibility="gone">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/load_image_error_text_view_item_gallery"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:drawableTopCompat="@drawable/ic_error_outline_black_24dp"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="@string/error_loading_image_tap_to_retry"
|
||||||
|
android:textSize="?attr/font_default"
|
||||||
|
android:fontFamily="?attr/font_family" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
|
||||||
|
android:id="@+id/image_view_item_post_gallery"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:drawableTopCompat="@drawable/ic_error_outline_black_24dp"
|
android:visibility="gone" />
|
||||||
android:layout_gravity="center"
|
|
||||||
android:gravity="center"
|
|
||||||
android:text="@string/error_loading_image_tap_to_retry"
|
|
||||||
android:textSize="?attr/font_default"
|
|
||||||
android:fontFamily="?attr/font_family" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
<ImageView
|
||||||
|
android:id="@+id/image_view_no_preview_item_post_gallery"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="150dp"
|
||||||
|
android:scaleType="center"
|
||||||
|
android:background="@drawable/thumbnail_compact_layout_rounded_edge"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView
|
<TextView
|
||||||
android:id="@+id/image_view_item_post_gallery"
|
android:id="@+id/title_text_view_item_post_gallery"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:visibility="gone" />
|
android:paddingTop="16dp"
|
||||||
|
android:paddingBottom="16dp"
|
||||||
|
android:paddingStart="16dp"
|
||||||
|
android:paddingEnd="16dp"
|
||||||
|
android:textSize="?attr/title_font_18"
|
||||||
|
android:fontFamily="?attr/title_font_family"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<ImageView
|
</FrameLayout>
|
||||||
android:id="@+id/image_view_no_preview_item_post_gallery"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="150dp"
|
|
||||||
android:scaleType="center"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<TextView
|
</com.google.android.material.card.MaterialCardView>
|
||||||
android:id="@+id/title_text_view_item_post_gallery"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingStart="16dp"
|
|
||||||
android:paddingEnd="16dp"
|
|
||||||
android:textSize="?attr/title_font_18"
|
|
||||||
android:fontFamily="?attr/title_font_family"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
</FrameLayout>
|
|
@ -7,7 +7,6 @@
|
|||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:id="@+id/card_view_item_post_text_type"
|
android:id="@+id/card_view_item_post_text_type"
|
||||||
app:cardBackgroundColor="?attr/cardViewBackgroundColor"
|
|
||||||
app:cardElevation="2dp"
|
app:cardElevation="2dp"
|
||||||
app:cardCornerRadius="16dp">
|
app:cardCornerRadius="16dp">
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:id="@+id/card_view_item_post_video_type_autoplay"
|
android:id="@+id/card_view_item_post_video_type_autoplay"
|
||||||
app:cardBackgroundColor="?attr/cardViewBackgroundColor"
|
|
||||||
app:cardElevation="2dp"
|
app:cardElevation="2dp"
|
||||||
app:cardCornerRadius="16dp">
|
app:cardCornerRadius="16dp">
|
||||||
|
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:id="@+id/card_view_item_post_with_preview"
|
android:id="@+id/card_view_item_post_with_preview"
|
||||||
app:cardBackgroundColor="?attr/cardViewBackgroundColor"
|
|
||||||
app:cardElevation="2dp"
|
app:cardElevation="2dp"
|
||||||
app:cardCornerRadius="16dp">
|
app:cardCornerRadius="16dp">
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user