Skip to content

Commit f27244e

Browse files
Docile-AlligatorDocile-Alligator
committed
New UI design in ViewUserDetailActivity.
1 parent 02f4359 commit f27244e

File tree

27 files changed

+218
-184
lines changed

27 files changed

+218
-184
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ public void onGlobalLayout() {
614614
collapsedTabTextColor = mCustomThemeWrapper.getTabLayoutWithCollapsedCollapsingToolbarTextColor();
615615
collapsedTabIndicatorColor = mCustomThemeWrapper.getTabLayoutWithCollapsedCollapsingToolbarTabIndicator();
616616
collapsedTabBackgroundColor = mCustomThemeWrapper.getTabLayoutWithCollapsedCollapsingToolbarTabBackground();
617-
binding.toolbarLinearLayoutViewUserDetailActivity.setBackgroundColor(expandedTabBackgroundColor);
617+
binding.toolbarConstraintLayoutViewUserDetailActivity.setBackgroundColor(expandedTabBackgroundColor);
618618
unsubscribedColor = mCustomThemeWrapper.getUnsubscribed();
619619
subscribedColor = mCustomThemeWrapper.getSubscribed();
620620
binding.userNameTextViewViewUserDetailActivity.setTextColor(mCustomThemeWrapper.getUsername());

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

Lines changed: 72 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
<com.google.android.material.appbar.CollapsingToolbarLayout
1616
android:id="@+id/collapsing_toolbar_layout_view_user_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_view_user_detail_activity">
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_user_detail_activity"
@@ -31,81 +32,99 @@
3132
android:layout_height="160dp"
3233
android:contentDescription="@string/content_description_banner_imageview" />
3334

34-
<pl.droidsonroids.gif.GifImageView
35-
android:id="@+id/icon_gif_image_view_view_user_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_user_detail_activity"
40-
android:layout_centerHorizontal="true"
41-
android:elevation="4dp" />
42-
43-
<LinearLayout
44-
android:id="@+id/toolbar_linear_layout_view_user_detail_activity"
35+
<androidx.constraintlayout.widget.ConstraintLayout
36+
android:id="@+id/toolbar_constraint_layout_view_user_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_user_detail_activity">
39+
android:padding="16dp">
40+
41+
<pl.droidsonroids.gif.GifImageView
42+
android:id="@+id/icon_gif_image_view_view_user_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/karma_text_view_view_user_detail_activity" />
5248

5349
<TextView
5450
android:id="@+id/user_name_text_view_view_user_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"
5955
android:textSize="?attr/font_18"
6056
android:fontFamily="?attr/font_family"
61-
android:layout_gravity="center_horizontal"/>
57+
app:layout_constraintVertical_chainStyle="packed"
58+
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_view_user_detail_activity"
59+
app:layout_constraintTop_toTopOf="@id/icon_gif_image_view_view_user_detail_activity"
60+
app:layout_constraintBottom_toTopOf="@id/subscribe_user_chip_view_user_detail_activity" />
6261

6362
<com.google.android.material.chip.Chip
6463
android:id="@+id/subscribe_user_chip_view_user_detail_activity"
6564
android:layout_width="wrap_content"
6665
android:layout_height="wrap_content"
67-
android:layout_marginBottom="16dp"
68-
android:layout_gravity="center_horizontal"
66+
android:layout_marginStart="16dp"
6967
android:visibility="gone"
70-
app:chipStrokeColor="#00000000" />
68+
app:chipStrokeColor="#00000000"
69+
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_view_user_detail_activity"
70+
app:layout_constraintTop_toBottomOf="@id/user_name_text_view_view_user_detail_activity"
71+
app:layout_constraintBottom_toBottomOf="@id/icon_gif_image_view_view_user_detail_activity"
72+
tools:visibility="visible" />
7173

72-
<RelativeLayout
73-
android:layout_width="match_parent"
74+
<TextView
75+
android:id="@+id/karma_text_view_view_user_detail_activity"
76+
android:layout_width="0dp"
77+
android:layout_height="wrap_content"
78+
android:layout_marginTop="16dp"
79+
android:textSize="?attr/font_default"
80+
android:fontFamily="?attr/font_family"
81+
app:layout_constraintEnd_toStartOf="@id/cakeday_text_view_view_user_detail_activity"
82+
app:layout_constraintStart_toStartOf="parent"
83+
app:layout_constraintTop_toBottomOf="@id/barrier5"
84+
app:layout_constraintHorizontal_bias="0" />
85+
86+
<TextView
87+
android:id="@+id/cakeday_text_view_view_user_detail_activity"
88+
android:layout_width="0dp"
7489
android:layout_height="wrap_content"
75-
android:layout_marginBottom="16dp">
76-
77-
<TextView
78-
android:id="@+id/karma_text_view_view_user_detail_activity"
79-
android:layout_width="wrap_content"
80-
android:layout_height="wrap_content"
81-
android:layout_alignParentStart="true"
82-
android:layout_toStartOf="@id/cakeday_text_view_view_user_detail_activity"
83-
android:textSize="?attr/font_default"
84-
android:fontFamily="?attr/font_family" />
85-
86-
<TextView
87-
android:id="@+id/cakeday_text_view_view_user_detail_activity"
88-
android:layout_width="wrap_content"
89-
android:layout_height="wrap_content"
90-
android:gravity="end"
91-
android:layout_alignParentEnd="true"
92-
android:textSize="?attr/font_default"
93-
android:fontFamily="?attr/font_family" />
94-
95-
</RelativeLayout>
90+
android:layout_marginTop="16dp"
91+
android:gravity="end"
92+
android:textSize="?attr/font_default"
93+
android:fontFamily="?attr/font_family"
94+
app:layout_constraintEnd_toEndOf="parent"
95+
app:layout_constraintTop_toBottomOf="@id/barrier5" />
9696

9797
<TextView
9898
android:id="@+id/description_text_view_view_user_detail_activity"
99-
android:layout_width="wrap_content"
99+
android:layout_width="match_parent"
100100
android:layout_height="wrap_content"
101-
android:layout_marginBottom="16dp"
101+
android:layout_marginTop="16dp"
102102
android:textSize="?attr/font_default"
103103
android:fontFamily="?attr/font_family"
104-
android:visibility="gone" />
104+
android:visibility="gone"
105+
app:layout_constraintTop_toBottomOf="@id/barrier6"
106+
app:layout_constraintStart_toStartOf="parent"
107+
app:layout_constraintEnd_toEndOf="parent"
108+
app:layout_constraintBottom_toBottomOf="parent"
109+
tools:visibility="visible" />
110+
111+
<androidx.constraintlayout.widget.Barrier
112+
android:id="@+id/barrier5"
113+
android:layout_width="wrap_content"
114+
android:layout_height="wrap_content"
115+
app:barrierDirection="bottom"
116+
app:constraint_referenced_ids="icon_gif_image_view_view_user_detail_activity,subscribe_user_chip_view_user_detail_activity" />
117+
118+
<androidx.constraintlayout.widget.Barrier
119+
android:id="@+id/barrier6"
120+
android:layout_width="wrap_content"
121+
android:layout_height="wrap_content"
122+
app:barrierDirection="bottom"
123+
app:constraint_referenced_ids="karma_text_view_view_user_detail_activity,cakeday_text_view_view_user_detail_activity" />
105124

106-
</LinearLayout>
125+
</androidx.constraintlayout.widget.ConstraintLayout>
107126

108-
</RelativeLayout>
127+
</LinearLayout>
109128

110129
<com.google.android.material.appbar.MaterialToolbar
111130
android:id="@+id/toolbar_view_user_detail_activity"

‎app/src/main/res/layout-sw600dp/activity_view_user_detail.xml

Lines changed: 72 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
<com.google.android.material.appbar.CollapsingToolbarLayout
1616
android:id="@+id/collapsing_toolbar_layout_view_user_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_view_user_detail_activity">
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_user_detail_activity"
@@ -31,81 +32,99 @@
3132
android:layout_height="160dp"
3233
android:contentDescription="@string/content_description_banner_imageview" />
3334

34-
<pl.droidsonroids.gif.GifImageView
35-
android:id="@+id/icon_gif_image_view_view_user_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_user_detail_activity"
40-
android:layout_centerHorizontal="true"
41-
android:elevation="4dp" />
42-
43-
<LinearLayout
44-
android:id="@+id/toolbar_linear_layout_view_user_detail_activity"
35+
<androidx.constraintlayout.widget.ConstraintLayout
36+
android:id="@+id/toolbar_constraint_layout_view_user_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_user_detail_activity">
39+
android:padding="16dp">
40+
41+
<pl.droidsonroids.gif.GifImageView
42+
android:id="@+id/icon_gif_image_view_view_user_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/karma_text_view_view_user_detail_activity" />
5248

5349
<TextView
5450
android:id="@+id/user_name_text_view_view_user_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"
5955
android:textSize="?attr/font_18"
6056
android:fontFamily="?attr/font_family"
61-
android:layout_gravity="center_horizontal"/>
57+
app:layout_constraintVertical_chainStyle="packed"
58+
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_view_user_detail_activity"
59+
app:layout_constraintTop_toTopOf="@id/icon_gif_image_view_view_user_detail_activity"
60+
app:layout_constraintBottom_toTopOf="@id/subscribe_user_chip_view_user_detail_activity" />
6261

6362
<com.google.android.material.chip.Chip
6463
android:id="@+id/subscribe_user_chip_view_user_detail_activity"
6564
android:layout_width="wrap_content"
6665
android:layout_height="wrap_content"
67-
android:layout_marginBottom="16dp"
68-
android:layout_gravity="center_horizontal"
66+
android:layout_marginStart="16dp"
6967
android:visibility="gone"
70-
app:chipStrokeColor="#00000000" />
68+
app:chipStrokeColor="#00000000"
69+
app:layout_constraintStart_toEndOf="@id/icon_gif_image_view_view_user_detail_activity"
70+
app:layout_constraintTop_toBottomOf="@id/user_name_text_view_view_user_detail_activity"
71+
app:layout_constraintBottom_toBottomOf="@id/icon_gif_image_view_view_user_detail_activity"
72+
tools:visibility="visible" />
7173

72-
<RelativeLayout
73-
android:layout_width="match_parent"
74+
<TextView
75+
android:id="@+id/karma_text_view_view_user_detail_activity"
76+
android:layout_width="0dp"
77+
android:layout_height="wrap_content"
78+
android:layout_marginTop="16dp"
79+
android:textSize="?attr/font_default"
80+
android:fontFamily="?attr/font_family"
81+
app:layout_constraintEnd_toStartOf="@id/cakeday_text_view_view_user_detail_activity"
82+
app:layout_constraintStart_toStartOf="parent"
83+
app:layout_constraintTop_toBottomOf="@id/barrier5"
84+
app:layout_constraintHorizontal_bias="0" />
85+
86+
<TextView
87+
android:id="@+id/cakeday_text_view_view_user_detail_activity"
88+
android:layout_width="0dp"
7489
android:layout_height="wrap_content"
75-
android:layout_marginBottom="16dp">
76-
77-
<TextView
78-
android:id="@+id/karma_text_view_view_user_detail_activity"
79-
android:layout_width="wrap_content"
80-
android:layout_height="wrap_content"
81-
android:layout_alignParentStart="true"
82-
android:layout_toStartOf="@id/cakeday_text_view_view_user_detail_activity"
83-
android:textSize="?attr/font_default"
84-
android:fontFamily="?attr/font_family" />
85-
86-
<TextView
87-
android:id="@+id/cakeday_text_view_view_user_detail_activity"
88-
android:layout_width="wrap_content"
89-
android:layout_height="wrap_content"
90-
android:gravity="end"
91-
android:layout_alignParentEnd="true"
92-
android:textSize="?attr/font_default"
93-
android:fontFamily="?attr/font_family" />
94-
95-
</RelativeLayout>
90+
android:layout_marginTop="16dp"
91+
android:gravity="end"
92+
android:textSize="?attr/font_default"
93+
android:fontFamily="?attr/font_family"
94+
app:layout_constraintEnd_toEndOf="parent"
95+
app:layout_constraintTop_toBottomOf="@id/barrier5" />
9696

9797
<TextView
9898
android:id="@+id/description_text_view_view_user_detail_activity"
99-
android:layout_width="wrap_content"
99+
android:layout_width="match_parent"
100100
android:layout_height="wrap_content"
101-
android:layout_marginBottom="16dp"
101+
android:layout_marginTop="16dp"
102102
android:textSize="?attr/font_default"
103103
android:fontFamily="?attr/font_family"
104-
android:visibility="gone" />
104+
android:visibility="gone"
105+
app:layout_constraintTop_toBottomOf="@id/barrier6"
106+
app:layout_constraintStart_toStartOf="parent"
107+
app:layout_constraintEnd_toEndOf="parent"
108+
app:layout_constraintBottom_toBottomOf="parent"
109+
tools:visibility="visible" />
110+
111+
<androidx.constraintlayout.widget.Barrier
112+
android:id="@+id/barrier5"
113+
android:layout_width="wrap_content"
114+
android:layout_height="wrap_content"
115+
app:barrierDirection="bottom"
116+
app:constraint_referenced_ids="icon_gif_image_view_view_user_detail_activity,subscribe_user_chip_view_user_detail_activity" />
117+
118+
<androidx.constraintlayout.widget.Barrier
119+
android:id="@+id/barrier6"
120+
android:layout_width="wrap_content"
121+
android:layout_height="wrap_content"
122+
app:barrierDirection="bottom"
123+
app:constraint_referenced_ids="karma_text_view_view_user_detail_activity,cakeday_text_view_view_user_detail_activity" />
105124

106-
</LinearLayout>
125+
</androidx.constraintlayout.widget.ConstraintLayout>
107126

108-
</RelativeLayout>
127+
</LinearLayout>
109128

110129
<com.google.android.material.appbar.MaterialToolbar
111130
android:id="@+id/toolbar_view_user_detail_activity"

0 commit comments

Comments
 (0)