aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--app/src/main/res/drawable/gold.xml4
-rw-r--r--app/src/main/res/layout/item_post.xml144
-rw-r--r--app/src/main/res/layout/item_post_detail.xml146
3 files changed, 104 insertions, 190 deletions
diff --git a/app/src/main/res/drawable/gold.xml b/app/src/main/res/drawable/gold.xml
index 1666013e..333984f4 100644
--- a/app/src/main/res/drawable/gold.xml
+++ b/app/src/main/res/drawable/gold.xml
@@ -1,5 +1,5 @@
-<vector android:height="16dp" android:viewportHeight="512"
- android:viewportWidth="512" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="24dp" android:viewportHeight="512"
+ android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF3636" android:pathData="M470.191,46.036L408.754,5.824c-16.42,-10.748 -38.501,-6.19 -49.334,10.141L248.83,175.589c-2.666,3.847 -2.86,8.89 -0.497,12.931l67.332,115.201c2.184,3.737 6.135,6.208 10.463,6.233c0.029,0 0.058,0 0.087,0c4.785,0 9.487,-2.287 12.388,-6.537L480.357,95.734l0.162,-0.242C491.306,79.01 486.673,56.824 470.191,46.036z"/>
<path android:fillColor="#FF712F" android:pathData="M338.563,286.469L152.591,16.703c-5.229,-7.892 -13.204,-13.301 -22.479,-15.238c-9.342,-1.95 -18.883,-0.147 -26.867,5.079L41.808,46.757C25.326,57.546 20.694,79.732 31.482,96.214l0.112,0.172l141.293,203.513c1.582,2.279 4.139,3.687 6.911,3.805l146.445,6.251c2.932,0 5.894,-0.859 8.49,-2.649C341.544,302.611 343.259,293.281 338.563,286.469z"/>
<path android:fillColor="#FFD561" android:pathData="M383.798,384.115c0,70.514 -57.37,127.885 -127.885,127.885s-127.885,-57.37 -127.885,-127.885c0,-70.524 57.37,-127.895 127.885,-127.895S383.798,313.59 383.798,384.115z"/>
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index c09582f5..c702e529 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -94,10 +94,13 @@
android:textSize="?attr/content_font_default"
android:ellipsize="end" />
- <androidx.constraintlayout.widget.ConstraintLayout
+ <com.nex3z.flowlayout.FlowLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="16dp">
+ android:padding="16dp"
+ app:flChildSpacing="16dp"
+ app:flChildSpacingForLastRow="align"
+ app:flRowSpacing="8dp">
<com.libRG.CustomTextView
android:id="@+id/type_text_view_item_post"
@@ -106,118 +109,40 @@
android:padding="4dp"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
app:lib_setRadius="3dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
- <ImageView
- android:id="@+id/gilded_image_view_item_post"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/gold"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/type_text_view_item_post"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/gilded_number_text_view_item_post"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="4dp"
- android:textColor="@color/gold"
- android:textSize="?attr/font_default"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/gilded_image_view_item_post"
- app:layout_constraintTop_toTopOf="parent" />
-
- <ImageView
- android:id="@+id/archived_image_view_item_post"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/ic_archive_outline"
- android:tint="@color/archivedTint"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/gilded_number_text_view_item_post"
- app:layout_constraintTop_toTopOf="parent" />
-
- <ImageView
- android:id="@+id/locked_image_view_item_post"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/ic_outline_lock"
- android:tint="@color/lockedIconTint"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/archived_image_view_item_post"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintHorizontal_bias="0" />
-
- <ImageView
- android:id="@+id/crosspost_image_view_item_post"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/crosspost"
- android:tint="@color/colorAccent"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/locked_image_view_item_post"
- app:layout_constraintTop_toTopOf="parent" />
-
<com.libRG.CustomTextView
- android:id="@+id/nsfw_text_view_item_post"
+ android:id="@+id/spoiler_custom_text_view_item_post"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
- android:text="@string/nsfw"
+ android:layout_gravity="center"
+ android:text="@string/spoiler"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
+ android:padding="4dp"
android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@id/crosspost_image_view_item_post"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintHorizontal_bias="1"
- app:lib_setRoundedBGColor="@color/colorAccent"
- app:lib_setRoundedBorderColor="@color/colorAccent"
app:lib_setRadius="3dp"
+ app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
+ app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
- <LinearLayout
- android:id="@+id/spoiler_flair_linear_layout_item_post"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:visibility="gone">
-
<com.libRG.CustomTextView
- android:id="@+id/spoiler_custom_text_view_item_post"
+ android:id="@+id/nsfw_text_view_item_post"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginStart="16dp"
- android:text="@string/spoiler"
+ android:padding="4dp"
+ android:text="@string/nsfw"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
- android:padding="4dp"
android:visibility="gone"
+ app:lib_setRoundedBGColor="@color/colorAccent"
+ app:lib_setRoundedBorderColor="@color/colorAccent"
app:lib_setRadius="3dp"
- app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
- app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -226,7 +151,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_marginStart="16dp"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
android:padding="4dp"
@@ -237,7 +161,41 @@
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/gilded_number_text_view_item_post"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/gold"
+ android:textSize="?attr/font_default"
+ android:drawableStart="@drawable/gold"
+ android:drawablePadding="4dp"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/archived_image_view_item_post"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:src="@drawable/ic_archive_outline"
+ android:tint="@color/archivedTint"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/locked_image_view_item_post"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:src="@drawable/ic_outline_lock"
+ android:tint="@color/lockedIconTint"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/crosspost_image_view_item_post"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:src="@drawable/crosspost"
+ android:tint="@color/colorAccent"
+ android:visibility="gone" />
+
+ </com.nex3z.flowlayout.FlowLayout>
<TextView
android:id="@+id/link_text_view_item_post"
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index dc6c4734..9d7b574b 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -85,10 +85,13 @@
android:visibility="gone"
android:textSize="?attr/content_font_default" />
- <androidx.constraintlayout.widget.ConstraintLayout
+ <com.nex3z.flowlayout.FlowLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:padding="16dp">
+ android:padding="16dp"
+ app:flChildSpacing="16dp"
+ app:flChildSpacingForLastRow="align"
+ app:flRowSpacing="8dp">
<com.libRG.CustomTextView
android:id="@+id/type_text_view_item_post_detail"
@@ -97,120 +100,40 @@
android:padding="4dp"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
- app:chipBackgroundColor="@color/backgroundColorPrimaryDark"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
app:lib_setRoundedBGColor="@color/backgroundColorPrimaryDark"
app:lib_setRoundedBorderColor="@color/backgroundColorPrimaryDark"
app:lib_setRadius="3dp"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
- <ImageView
- android:id="@+id/gilded_image_view_item_post_detail"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/gold"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/type_text_view_item_post_detail"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/gilded_number_text_view_item_post_detail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="4dp"
- android:textColor="@color/gold"
- android:textSize="?attr/font_default"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/gilded_image_view_item_post_detail"
- app:layout_constraintTop_toTopOf="parent" />
-
- <ImageView
- android:id="@+id/archived_image_view_item_post_detail"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/ic_archive_outline"
- android:tint="@color/archivedTint"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/crosspost_image_view_item_post_detail"
- app:layout_constraintTop_toTopOf="parent" />
-
- <ImageView
- android:id="@+id/locked_image_view_item_post_detail"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/ic_outline_lock"
- android:tint="@color/lockedIconTint"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/nsfw_text_view_item_post_detail"
- app:layout_constraintStart_toEndOf="@+id/archived_image_view_item_post_detail"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintHorizontal_bias="0" />
-
- <ImageView
- android:id="@+id/crosspost_image_view_item_post_detail"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_marginStart="16dp"
- android:src="@drawable/crosspost"
- android:tint="@color/colorAccent"
- android:visibility="gone"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@+id/gilded_number_text_view_item_post_detail"
- app:layout_constraintTop_toTopOf="parent" />
-
<com.libRG.CustomTextView
- android:id="@+id/nsfw_text_view_item_post_detail"
+ android:id="@+id/spoiler_custom_text_view_item_post_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="4dp"
- android:text="@string/nsfw"
+ android:layout_gravity="center"
+ android:text="@string/spoiler"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
+ android:padding="4dp"
android:visibility="gone"
- app:chipBackgroundColor="@color/colorAccent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintHorizontal_bias="1"
- app:lib_setRoundedBGColor="@color/colorAccent"
- app:lib_setRoundedBorderColor="@color/colorAccent"
app:lib_setRadius="3dp"
+ app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
+ app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
- <LinearLayout
- android:id="@+id/spoiler_flair_linear_layout_item_post_detail"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:visibility="gone">
-
<com.libRG.CustomTextView
- android:id="@+id/spoiler_custom_text_view_item_post_detail"
+ android:id="@+id/nsfw_text_view_item_post_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginStart="16dp"
- android:text="@string/spoiler"
+ android:padding="4dp"
+ android:text="@string/nsfw"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
- android:padding="4dp"
android:visibility="gone"
+ app:lib_setRoundedBGColor="@color/colorAccent"
+ app:lib_setRoundedBorderColor="@color/colorAccent"
app:lib_setRadius="3dp"
- app:lib_setRoundedBGColor="@color/spoilerBackgroundColor"
- app:lib_setRoundedBorderColor="@color/spoilerBackgroundColor"
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
@@ -219,7 +142,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_marginStart="16dp"
android:padding="4dp"
android:textSize="?attr/font_12"
android:textColor="@android:color/white"
@@ -230,7 +152,41 @@
app:lib_setRoundedView="true"
app:lib_setShape="rectangle" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/gilded_number_text_view_item_post_detail"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/gold"
+ android:textSize="?attr/font_default"
+ android:drawableStart="@drawable/gold"
+ android:drawablePadding="4dp"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/archived_image_view_item_post_detail"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/ic_archive_outline"
+ android:tint="@color/archivedTint"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/locked_image_view_item_post_detail"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/ic_outline_lock"
+ android:tint="@color/lockedIconTint"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/crosspost_image_view_item_post_detail"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:src="@drawable/crosspost"
+ android:tint="@color/colorAccent"
+ android:visibility="gone" />
+
+ </com.nex3z.flowlayout.FlowLayout>
<TextView
android:id="@+id/link_text_view_item_post_detail"
generated by cgit (git). Responsive design from responsive-cgit-css. Dark theme color palette from Dracula theme