Skip to content

Commit 8246814

Browse files
Docile-AlligatorDocile-Alligator
committed
New UI design in ViewSubredditDetailActivity.
1 parent 6dd133d commit 8246814

File tree

4 files changed

+304
-271
lines changed

4 files changed

+304
-271
lines changed

‎app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewSubredditDetailActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ public void onGlobalLayout() {
524524
collapsedTabTextColor = mCustomThemeWrapper.getTabLayoutWithCollapsedCollapsingToolbarTextColor();
525525
collapsedTabIndicatorColor = mCustomThemeWrapper.getTabLayoutWithCollapsedCollapsingToolbarTabIndicator();
526526
collapsedTabBackgroundColor = mCustomThemeWrapper.getTabLayoutWithCollapsedCollapsingToolbarTabBackground();
527-
binding.toolbarLinearLayoutViewSubredditDetailActivity.setBackgroundColor(expandedTabBackgroundColor);
527+
binding.toolbarConstraintLayoutViewSubredditDetailActivity.setBackgroundColor(expandedTabBackgroundColor);
528528
binding.subredditNameTextViewViewSubredditDetailActivity.setTextColor(mCustomThemeWrapper.getSubreddit());
529529
binding.subscribeSubredditChipViewSubredditDetailActivity.setTextColor(mCustomThemeWrapper.getChipTextColor());
530530
int primaryTextColor = mCustomThemeWrapper.getPrimaryTextColor();

‎app/src/main/res/layout-land/activity_view_subreddit_detail.xml

Lines changed: 101 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -15,130 +15,141 @@
1515
<com.google.android.material.appbar.CollapsingToolbarLayout
1616
android:id="@+id/collapsing_toolbar_layout_view_subreddit_detail_activity"
1717
android:layout_width="match_parent"
18-
android:layout_height="match_parent"
18+
android:layout_height="wrap_content"
1919
app:titleEnabled="false"
2020
app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed"
2121
app:toolbarId="@+id/toolbar">
2222

23-
<RelativeLayout
23+
<LinearLayout
2424
android:layout_width="match_parent"
25-
android:layout_height="match_parent">
25+
android:layout_height="wrap_content"
26+
android:orientation="vertical">
2627

2728
<pl.droidsonroids.gif.GifImageView
2829
android:id="@+id/banner_image_view_view_subreddit_detail_activity"
2930
android:layout_width="match_parent"
30-
android:scaleType="centerCrop"
3131
android:layout_height="160dp"
32-
android:contentDescription="@string/content_description_banner_imageview" />
32+
android:contentDescription="@string/content_description_banner_imageview"
33+
android:scaleType="centerCrop" />
3334

34-
<pl.droidsonroids.gif.GifImageView
35-
android:id="@+id/icon_gif_image_view_view_subreddit_detail_activity"
36-
android:layout_width="72dp"
37-
android:layout_height="72dp"
38-
android:layout_marginTop="-36dp"
39-
android:layout_below="@id/banner_image_view_view_subreddit_detail_activity"
40-
android:layout_centerHorizontal="true"
41-
android:elevation="4dp" />
42-
43-
<LinearLayout
44-
android:id="@+id/toolbar_linear_layout_view_subreddit_detail_activity"
35+
<androidx.constraintlayout.widget.ConstraintLayout
36+
android:id="@+id/toolbar_constraint_layout_view_subreddit_detail_activity"
4537
android:layout_width="match_parent"
4638
android:layout_height="wrap_content"
47-
android:orientation="vertical"
48-
android:paddingTop="36dp"
49-
android:paddingStart="16dp"
50-
android:paddingEnd="16dp"
51-
android:layout_below="@id/banner_image_view_view_subreddit_detail_activity">
39+
android:padding="16dp">
40+
41+
<pl.droidsonroids.gif.GifImageView
42+
android:id="@+id/icon_gif_image_view_view_subreddit_detail_activity"
43+
android:layout_width="72dp"
44+
android:layout_height="72dp"
45+
app:layout_constraintStart_toStartOf="parent"
46+
app:layout_constraintTop_toTopOf="parent"
47+
app:layout_constraintBottom_toTopOf="@id/subscriber_count_text_view_view_subreddit_detail_activity" />
5248

5349
<TextView
5450
android:id="@+id/subreddit_name_text_view_view_subreddit_detail_activity"
5551
android:layout_width="wrap_content"
5652
android:layout_height="wrap_content"
57-
android:layout_marginTop="16dp"
58-
android:layout_marginBottom="16dp"
53+
android:layout_marginStart="16dp"
54+
android:paddingTop="8dp"
55+
android:fontFamily="?attr/font_family"
5956
android:textSize="?attr/font_18"
60-
android:layout_gravity="center_horizontal"
61-
android:fontFamily="?attr/font_family" />
57+
app:layout_constraintVertical_chainStyle="packed"
58+
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_view_subreddit_detail_activity"
59+
app:layout_constraintTop_toTopOf="@id/icon_gif_image_view_view_subreddit_detail_activity"
60+
app:layout_constraintBottom_toTopOf="@id/subscribe_subreddit_chip_view_subreddit_detail_activity" />
6261

6362
<com.google.android.material.chip.Chip
6463
android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity"
6564
android:layout_width="wrap_content"
6665
android:layout_height="wrap_content"
67-
android:layout_gravity="center_horizontal"
68-
app:chipStrokeColor="#00000000" />
66+
android:layout_marginStart="16dp"
67+
app:chipStrokeColor="#00000000"
68+
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_view_subreddit_detail_activity"
69+
app:layout_constraintTop_toBottomOf="@id/subreddit_name_text_view_view_subreddit_detail_activity"
70+
app:layout_constraintBottom_toBottomOf="@id/icon_gif_image_view_view_subreddit_detail_activity" />
6971

70-
<androidx.constraintlayout.widget.ConstraintLayout
71-
android:layout_width="match_parent"
72+
<TextView
73+
android:id="@+id/subscriber_count_text_view_view_subreddit_detail_activity"
74+
android:layout_width="0dp"
7275
android:layout_height="wrap_content"
7376
android:layout_marginTop="16dp"
74-
android:layout_marginBottom="16dp">
75-
76-
<TextView
77-
android:id="@+id/subscriber_count_text_view_view_subreddit_detail_activity"
78-
android:layout_width="wrap_content"
79-
android:layout_height="wrap_content"
80-
android:textSize="?attr/font_default"
81-
android:fontFamily="?attr/font_family"
82-
app:layout_constraintBottom_toTopOf="@id/online_subscriber_count_text_view_view_subreddit_detail_activity"
83-
app:layout_constraintStart_toStartOf="parent"
84-
app:layout_constraintEnd_toStartOf="@id/barrier"
85-
app:layout_constraintTop_toTopOf="parent"
86-
app:layout_constraintHorizontal_bias="0" />
87-
88-
<TextView
89-
android:id="@+id/online_subscriber_count_text_view_view_subreddit_detail_activity"
90-
android:layout_width="wrap_content"
91-
android:layout_height="wrap_content"
92-
android:textSize="?attr/font_default"
93-
android:fontFamily="?attr/font_family"
94-
app:layout_constraintBottom_toBottomOf="parent"
95-
app:layout_constraintStart_toStartOf="parent"
96-
app:layout_constraintEnd_toStartOf="@id/barrier"
97-
app:layout_constraintTop_toBottomOf="@id/subscriber_count_text_view_view_subreddit_detail_activity"
98-
app:layout_constraintHorizontal_bias="0" />
99-
100-
<TextView
101-
android:id="@+id/since_text_view_view_subreddit_detail_activity"
102-
android:layout_width="wrap_content"
103-
android:layout_height="wrap_content"
104-
android:text="@string/since"
105-
android:fontFamily="?attr/font_family"
106-
app:layout_constraintBottom_toTopOf="@id/creation_time_text_view_view_subreddit_detail_activity"
107-
app:layout_constraintEnd_toEndOf="parent"
108-
app:layout_constraintTop_toTopOf="parent" />
109-
110-
<TextView
111-
android:id="@+id/creation_time_text_view_view_subreddit_detail_activity"
112-
android:layout_width="wrap_content"
113-
android:layout_height="wrap_content"
114-
android:gravity="end"
115-
android:textSize="?attr/font_default"
116-
android:fontFamily="?attr/font_family"
117-
app:layout_constraintBottom_toBottomOf="parent"
118-
app:layout_constraintEnd_toEndOf="parent"
119-
app:layout_constraintTop_toBottomOf="@id/since_text_view_view_subreddit_detail_activity" />
120-
121-
<androidx.constraintlayout.widget.Barrier
122-
android:id="@+id/barrier"
123-
android:layout_width="wrap_content"
124-
android:layout_height="wrap_content"
125-
app:barrierDirection="start"
126-
app:constraint_referenced_ids="creation_time_text_view_view_subreddit_detail_activity, since_text_view_view_subreddit_detail_activity" />
127-
128-
</androidx.constraintlayout.widget.ConstraintLayout>
77+
android:fontFamily="?attr/font_family"
78+
android:textSize="?attr/font_default"
79+
app:layout_constraintEnd_toStartOf="@id/barrier"
80+
app:layout_constraintStart_toStartOf="parent"
81+
app:layout_constraintTop_toBottomOf="@id/barrier5"
82+
app:layout_constraintHorizontal_bias="0" />
12983

13084
<TextView
131-
android:id="@+id/description_text_view_view_subreddit_detail_activity"
132-
android:layout_width="wrap_content"
85+
android:id="@+id/online_subscriber_count_text_view_view_subreddit_detail_activity"
86+
android:layout_width="0dp"
13387
android:layout_height="wrap_content"
134-
android:layout_marginBottom="16dp"
88+
android:fontFamily="?attr/font_family"
13589
android:textSize="?attr/font_default"
90+
app:layout_constraintEnd_toStartOf="@id/barrier"
91+
app:layout_constraintHorizontal_bias="0"
92+
app:layout_constraintStart_toStartOf="parent"
93+
app:layout_constraintTop_toBottomOf="@id/subscriber_count_text_view_view_subreddit_detail_activity" />
94+
95+
<TextView
96+
android:id="@+id/since_text_view_view_subreddit_detail_activity"
97+
android:layout_width="0dp"
98+
android:layout_height="wrap_content"
99+
android:layout_marginTop="16dp"
136100
android:fontFamily="?attr/font_family"
137-
android:visibility="gone"/>
101+
android:text="@string/since"
102+
app:layout_constraintEnd_toEndOf="parent"
103+
app:layout_constraintTop_toBottomOf="@id/barrier5" />
104+
105+
<TextView
106+
android:id="@+id/creation_time_text_view_view_subreddit_detail_activity"
107+
android:layout_width="0dp"
108+
android:layout_height="wrap_content"
109+
android:fontFamily="?attr/font_family"
110+
android:gravity="end"
111+
android:textSize="?attr/font_default"
112+
app:layout_constraintEnd_toEndOf="parent"
113+
app:layout_constraintTop_toBottomOf="@id/since_text_view_view_subreddit_detail_activity" />
114+
115+
<TextView
116+
android:id="@+id/description_text_view_view_subreddit_detail_activity"
117+
android:layout_width="match_parent"
118+
android:layout_height="wrap_content"
119+
android:layout_marginTop="16dp"
120+
android:fontFamily="?attr/font_family"
121+
android:textSize="?attr/font_default"
122+
android:visibility="gone"
123+
app:layout_constraintTop_toBottomOf="@id/barrier6"
124+
app:layout_constraintStart_toStartOf="parent"
125+
app:layout_constraintEnd_toEndOf="parent"
126+
app:layout_constraintBottom_toBottomOf="parent"
127+
tools:visibility="visible" />
128+
129+
<androidx.constraintlayout.widget.Barrier
130+
android:id="@+id/barrier"
131+
android:layout_width="wrap_content"
132+
android:layout_height="wrap_content"
133+
app:barrierDirection="start"
134+
app:constraint_referenced_ids="creation_time_text_view_view_subreddit_detail_activity, since_text_view_view_subreddit_detail_activity" />
135+
136+
<androidx.constraintlayout.widget.Barrier
137+
android:id="@+id/barrier5"
138+
android:layout_width="wrap_content"
139+
android:layout_height="wrap_content"
140+
app:barrierDirection="bottom"
141+
app:constraint_referenced_ids="icon_gif_image_view_view_subreddit_detail_activity,subscribe_subreddit_chip_view_subreddit_detail_activity" />
142+
143+
<androidx.constraintlayout.widget.Barrier
144+
android:id="@+id/barrier6"
145+
android:layout_width="wrap_content"
146+
android:layout_height="wrap_content"
147+
app:barrierDirection="bottom"
148+
app:constraint_referenced_ids="creation_time_text_view_view_subreddit_detail_activity,online_subscriber_count_text_view_view_subreddit_detail_activity" />
138149

139-
</LinearLayout>
150+
</androidx.constraintlayout.widget.ConstraintLayout>
140151

141-
</RelativeLayout>
152+
</LinearLayout>
142153

143154
<com.google.android.material.appbar.MaterialToolbar
144155
android:id="@+id/toolbar"

0 commit comments

Comments
 (0)