From 2172916bfea15bf7f7b82c898312ab922a5adf06 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Thu, 24 Nov 2022 21:58:45 +0200
Subject: [PATCH] Create view text media post
---
app/src/main/res/layout/image_post_view.xml | 31 ----------
.../res/layout/list_item_gallery_image.xml | 19 -------
..._video.xml => list_item_gallery_media.xml} | 29 +++++++++-
.../main/res/layout/view_text_media_post.xml | 57 +++++++++++++++++++
app/src/main/res/layout/view_text_post.xml | 20 -------
app/src/main/res/layout/view_video_post.xml | 49 ----------------
6 files changed, 83 insertions(+), 122 deletions(-)
delete mode 100644 app/src/main/res/layout/image_post_view.xml
delete mode 100644 app/src/main/res/layout/list_item_gallery_image.xml
rename app/src/main/res/layout/{list_item_gallery_video.xml => list_item_gallery_media.xml} (52%)
create mode 100644 app/src/main/res/layout/view_text_media_post.xml
delete mode 100644 app/src/main/res/layout/view_text_post.xml
delete mode 100644 app/src/main/res/layout/view_video_post.xml
diff --git a/app/src/main/res/layout/image_post_view.xml b/app/src/main/res/layout/image_post_view.xml
deleted file mode 100644
index 9b0d08f79..000000000
--- a/app/src/main/res/layout/image_post_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/lImagePost"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <include
- android:id="@+id/imageItem"
- layout="@layout/list_item_gallery_image"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <org.futo.circles.view.LoadingView
- android:id="@+id/vLoadingImage"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginHorizontal="16dp"
- android:background="@color/white"
- android:padding="16dp"
- android:visibility="gone"
- tools:visibility="visible" />
-
- </FrameLayout>
-
-</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_gallery_image.xml b/app/src/main/res/layout/list_item_gallery_image.xml
deleted file mode 100644
index 562e15617..000000000
--- a/app/src/main/res/layout/list_item_gallery_image.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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_height="wrap_content">
-
- <ImageView
- android:id="@+id/ivGalleryImage"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:foreground="?attr/selectableItemBackground"
- android:scaleType="centerCrop"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintDimensionRatio="w,1:1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_gallery_video.xml b/app/src/main/res/layout/list_item_gallery_media.xml
similarity index 52%
rename from app/src/main/res/layout/list_item_gallery_video.xml
rename to app/src/main/res/layout/list_item_gallery_media.xml
index 34c163c60..16feade1a 100644
--- a/app/src/main/res/layout/list_item_gallery_video.xml
+++ b/app/src/main/res/layout/list_item_gallery_media.xml
@@ -4,10 +4,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:id="@+id/lMedia"
android:foreground="?attr/selectableItemBackground">
<ImageView
- android:id="@+id/ivVideoCover"
+ android:id="@+id/ivCover"
android:layout_width="0dp"
android:layout_height="0dp"
android:scaleType="centerCrop"
@@ -17,6 +18,22 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+ <com.google.android.material.imageview.ShapeableImageView
+ android:id="@+id/ivVideoIndicator"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_gravity="center"
+ android:background="@color/white"
+ android:src="@drawable/ic_play_round"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintDimensionRatio="w,1:1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintWidth_percent="0.15"
+ app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent"
+ app:tint="@color/blue" />
+
<TextView
android:id="@+id/tvDuration"
android:layout_width="wrap_content"
@@ -28,8 +45,14 @@
android:shadowDy="1"
android:shadowRadius="2"
android:textColor="@color/white"
- app:layout_constraintBottom_toBottomOf="@+id/ivVideoCover"
- app:layout_constraintEnd_toEndOf="@+id/ivVideoCover"
+ app:layout_constraintBottom_toBottomOf="@+id/ivCover"
+ app:layout_constraintEnd_toEndOf="@+id/ivCover"
tools:text="00:00" />
+ <androidx.constraintlayout.widget.Group
+ android:id="@+id/videoGroup"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:constraint_referenced_ids="ivVideoIndicator, tvDuration" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_text_media_post.xml b/app/src/main/res/layout/view_text_media_post.xml
new file mode 100644
index 000000000..acd463dae
--- /dev/null
+++ b/app/src/main/res/layout/view_text_media_post.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/lPost"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <org.futo.circles.view.read_more.ReadMoreTextView
+ android:id="@+id/tvTextContent"
+ style="@style/postMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/post_text_side_margin"
+ android:autoLink="web"
+ android:textIsSelectable="true"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:readMoreMaxLines="7"
+ app:readMoreText="@string/show_more"
+ app:readMoreTextColor="@color/blue" />
+
+ <include
+ android:id="@+id/vMediaContent"
+ layout="@layout/list_item_gallery_media"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/tvTextContent"
+ app:layout_goneMarginTop="0dp" />
+
+
+ <org.futo.circles.view.LoadingView
+ android:id="@+id/vLoadingView"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginHorizontal="16dp"
+ android:background="@color/white"
+ android:padding="16dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="@id/vMediaContent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/vMediaContent"
+ tools:visibility="visible" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_text_post.xml b/app/src/main/res/layout/view_text_post.xml
deleted file mode 100644
index fcf69dbe2..000000000
--- a/app/src/main/res/layout/view_text_post.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/lTextPost"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <org.futo.circles.view.read_more.ReadMoreTextView
- android:id="@+id/tvContent"
- style="@style/postMessage"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/post_text_side_margin"
- android:autoLink="web"
- android:textIsSelectable="true"
- app:readMoreMaxLines="7"
- app:readMoreText="@string/show_more"
- app:readMoreTextColor="@color/blue" />
-
-</org.futo.circles.view.PostLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_video_post.xml b/app/src/main/res/layout/view_video_post.xml
deleted file mode 100644
index 68756466b..000000000
--- a/app/src/main/res/layout/view_video_post.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.futo.circles.view.PostLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/lVideoPost"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
-
- <include
- android:id="@+id/videoItem"
- layout="@layout/list_item_gallery_video"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
-
- <com.google.android.material.imageview.ShapeableImageView
- android:layout_width="52dp"
- android:layout_height="52dp"
- android:layout_gravity="center"
- android:background="@color/white"
- android:src="@drawable/ic_play_round"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintDimensionRatio="w,1:1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent"
- app:tint="@color/blue" />
-
-
- <org.futo.circles.view.LoadingView
- android:id="@+id/vLoadingView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginHorizontal="16dp"
- android:background="@color/white"
- android:padding="16dp"
- android:visibility="gone"
- tools:visibility="visible" />
-
- </FrameLayout>
-
-</org.futo.circles.view.PostLayout>
\ No newline at end of file
--
GitLab