diff options
Diffstat (limited to '')
| -rw-r--r-- | app/src/main/res/layout/activity_view_subreddit_detail.xml | 47 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_view_user_detail.xml | 42 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 |
3 files changed, 74 insertions, 18 deletions
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index da17e978..ee3f0357 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -74,7 +74,7 @@ android:textColor="@android:color/white" android:layout_gravity="center_horizontal"/> - <RelativeLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" @@ -84,20 +84,51 @@ android:id="@+id/subscriber_count_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="?attr/primaryTextColor" android:textSize="?attr/font_default" - android:layout_alignParentStart="true" - android:layout_toStartOf="@id/online_subscriber_count_text_view_view_subreddit_detail_activity" /> + app:layout_constraintBottom_toTopOf="@id/online_subscriber_count_text_view_view_subreddit_detail_activity" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/barrier" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintHorizontal_bias="0" /> <TextView android:id="@+id/online_subscriber_count_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" /> + android:textSize="?attr/font_default" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/barrier" + app:layout_constraintTop_toBottomOf="@id/subscriber_count_text_view_view_subreddit_detail_activity" + app:layout_constraintHorizontal_bias="0" /> + + <TextView + android:id="@+id/since_text_view_view_subreddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/since" + app:layout_constraintBottom_toTopOf="@id/creation_time_text_view_view_subreddit_detail_activity" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/creation_time_text_view_view_subreddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="end" + android:textSize="?attr/font_default" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/since_text_view_view_subreddit_detail_activity" /> + + <androidx.constraintlayout.widget.Barrier + android:id="@+id/barrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="start" + app:constraint_referenced_ids="creation_time_text_view_view_subreddit_detail_activity, since_text_view_view_subreddit_detail_activity" /> - </RelativeLayout> + </androidx.constraintlayout.widget.ConstraintLayout> <TextView android:id="@+id/description_text_view_view_subreddit_detail_activity" diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index 4539f50a..3499823e 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -62,16 +62,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:textSize="?attr/font_18" - android:layout_gravity="center_horizontal"/> - - <TextView - android:id="@+id/karma_text_view_view_user_detail_activity" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:textSize="?attr/font_default" + android:textSize="?attr/font_18" android:layout_gravity="center_horizontal"/> <com.google.android.material.chip.Chip @@ -79,10 +71,40 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:textColor="@android:color/white" android:layout_gravity="center_horizontal" android:visibility="gone"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp"> + + <TextView + android:id="@+id/karma_text_view_view_user_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:layout_toStartOf="@id/cakeday_text_view_view_user_detail_activity" + android:textSize="?attr/font_default" /> + + <TextView + android:id="@+id/cakeday_text_view_view_user_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="end" + android:layout_alignParentEnd="true" + android:textSize="?attr/font_default" /> + + </RelativeLayout> + + <TextView + android:id="@+id/description_text_view_view_user_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:textSize="?attr/font_default" + android:visibility="gone" /> + </LinearLayout> </RelativeLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 945805f1..2bd237f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -90,6 +90,9 @@ <string name="nsfw">NSFW</string> <string name="karma_info">Karma: %1$d</string> + <string name="karma_info_user_detail">Karma:\n%1$d (%2$d + %3$d)</string> + <string name="cakeday_info">Cakeday:\n%1$s</string> + <string name="since">Since:</string> <string name="profile">Profile</string> <string name="following">Following</string> |