aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-05-07 11:45:08 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-05-07 11:45:08 +0000
commit297db53aa3038e4486a8fc199425a77476c9cb06 (patch)
tree2948487499760869392e70c84fa5d34038a8af22 /app/src/main/res
parent1d294609f5bb472fea0d536ac381359e9d9c4dc0 (diff)
downloadinfinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.tar
infinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.tar.gz
infinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.tar.bz2
infinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.tar.lz
infinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.tar.xz
infinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.tar.zst
infinity-for-reddit-297db53aa3038e4486a8fc199425a77476c9cb06.zip
Reverse the change of unescaping HTML because it also remove all the HTML tags. Fixed subreddit name and post time overlapping. Fixed menu item text not shown in MainActivity.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_view_post_detail.xml5
-rw-r--r--app/src/main/res/layout/app_bar_main.xml5
-rw-r--r--app/src/main/res/layout/item_post.xml15
3 files changed, 17 insertions, 8 deletions
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 26239fef..1fe7d3cd 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -34,11 +34,13 @@
<LinearLayout
android:id="@+id/subreddit_icon_name_linear_layout_view_post_detail"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="16dp"
+ app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/post_time_text_view_view_post_detail"
app:layout_constraintTop_toTopOf="parent">
<CustomView.AspectRatioGifImageView
@@ -64,6 +66,7 @@
android:layout_gravity="center"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_linear_layout_view_post_detail"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index cfd4637b..483a7e55 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -26,7 +26,10 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"/>
+ android:layout_height="?attr/actionBarSize"
+ app:layout_collapseMode="pin"
+ app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
+ app:popupTheme="@style/AppTheme.PopupOverlay" />
<com.ferfalk.simplesearchview.SimpleSearchView
android:id="@+id/search_view_main_activity"
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 45024d78..02c8ce23 100644
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -19,11 +19,13 @@
<LinearLayout
android:id="@+id/subreddit_icon_name_linear_layout_view_item_best_post"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
+ app:layout_constrainedWidth="true"
android:padding="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_best_post_item"
app:layout_constraintTop_toTopOf="parent">
<CustomView.AspectRatioGifImageView
@@ -38,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_gravity="center"
- android:textColor="#E91E63" />
+ android:textColor="#E91E63"/>
</LinearLayout>
@@ -46,11 +48,11 @@
android:id="@+id/stickied_post_image_view_best_post_item"
android:layout_width="24dp"
android:layout_height="24dp"
- android:layout_gravity="center"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:tint="@color/colorPrimary"
android:visibility="gone"
+ app:layout_constraintStart_toEndOf="@id/subreddit_icon_name_linear_layout_view_item_best_post"
app:layout_constraintEnd_toStartOf="@+id/post_time_text_view_best_post_item"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@@ -58,12 +60,13 @@
<TextView
android:id="@+id/post_time_text_view_best_post_item"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
+ android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toEndOf="@id/stickied_post_image_view_best_post_item"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintHorizontal_bias="1"/>
</androidx.constraintlayout.widget.ConstraintLayout>