From 97c35416e73c3b1f4b6f2347e072255bc62f43b2 Mon Sep 17 00:00:00 2001
From: Tim <tapetis@gmail.com>
Date: Sat, 23 Sep 2023 13:51:00 +0200
Subject: [PATCH 1/4] Improve profile layout on wide screens & with large fonts

---
 app/src/main/res/layout/fragment_profile.xml | 729 +++++++++----------
 1 file changed, 360 insertions(+), 369 deletions(-)

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index a3856b2fbc..607bbd40e3 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,411 +1,294 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:scrollbarStyle="outsideOverlay"
+    android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_max="400dp">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            app:layout_constraintWidth_max="400dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
+            android:divider="@drawable/space_24dp"
+            android:paddingBottom="16dp"
+            android:showDividers="middle">
+
+            <RelativeLayout
+                android:id="@+id/profileContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+                <ImageView
+                    android:layout_marginEnd="16dp"
+                    android:id="@+id/userAvatarImageView"
+                    android:layout_width="100dp"
+                    android:layout_height="100dp"
+                    android:scaleType="fitCenter"
+                    tools:src="@drawable/ic_osm_anon_avatar" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:layout_marginStart="@dimen/activity_horizontal_margin"
-                android:layout_marginEnd="@dimen/activity_horizontal_margin"
-                android:divider="@drawable/space_24dp"
-                android:paddingBottom="64dp"
-                android:showDividers="middle">
+                <TextView
+                    android:id="@+id/userNameTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:gravity="center_vertical"
+                    android:textAppearance="@style/TextAppearance.Title"
+                    android:textSize="32sp"
+                    app:autoSizeMaxTextSize="32sp"
+                    app:autoSizeMinTextSize="22sp"
+                    app:autoSizeTextType="uniform"
+                    android:layout_toEndOf="@id/userAvatarImageView"
+                    tools:text="westnordost" />
 
-                <RelativeLayout
-                    android:id="@+id/profileContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                <LinearLayout
+                    android:id="@+id/solvedQuestsContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/userNameTextView"
+                    android:layout_marginTop="8dp"
+                    android:layout_toEndOf="@id/userAvatarImageView"
+                    android:divider="@drawable/space_4dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:showDividers="middle">
 
-                    <RelativeLayout
-                        android:id="@+id/avatarAndButtonContainer"
+                    <ImageView
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:src="@drawable/ic_star_48dp" />
+
+                    <TextView
+                        android:id="@+id/editCountText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp">
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:textAlignment="gravity"
+                        android:textAppearance="@style/TextAppearance.Title"
+                        android:textSize="24sp"
+                        tools:text="1021" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/unpublishedEditCountText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/solvedQuestsContainer"
+                    android:layout_marginTop="8dp"
+                    android:layout_toEndOf="@id/userAvatarImageView"
+                    tools:text="@string/unsynced_quests_description" />
+
+            </RelativeLayout>
+
+            <com.google.android.flexbox.FlexboxLayout
+                android:id="@+id/buttonsContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:flexWrap="wrap"
+                app:dividerDrawableHorizontal="@drawable/space_8dp"
+                app:dividerDrawableVertical="@drawable/space_16dp"
+                app:showDividerVertical="middle"
+                app:showDividerHorizontal="middle"
+                app:justifyContent="space_between"
+                app:alignContent="stretch">
+
+                <Button
+                    android:id="@+id/profileButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:icon="@drawable/ic_open_in_browser_24dp"
+                    android:layout_centerHorizontal="true"
+                    android:text="@string/osm_profile" />
 
-                        <ImageView
-                            android:id="@+id/userAvatarImageView"
-                            android:layout_width="100dp"
-                            android:layout_height="100dp"
-                            android:scaleType="fitCenter"
-                            tools:src="@drawable/ic_osm_anon_avatar"
-                            android:layout_centerHorizontal="true"/>
+                <Button
+                    android:id="@+id/logoutButton"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/user_logout"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+
+            </com.google.android.flexbox.FlexboxLayout>
 
-                    </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/divider" />
+
+            <com.google.android.flexbox.FlexboxLayout
+                android:id="@+id/badgesContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:flexWrap="wrap"
+                app:dividerDrawableHorizontal="@drawable/space_16dp"
+                app:dividerDrawableVertical="@drawable/space_8dp"
+                app:showDividerVertical="middle"
+                app:showDividerHorizontal="middle"
+                app:alignContent="stretch">
+
+                <RelativeLayout
+                    android:id="@+id/localRankContainer"
+                    android:layout_width="84dp"
+                    android:layout_height="wrap_content">
 
                     <TextView
-                        android:id="@+id/userNameTextView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:id="@+id/localRankText"
+                        android:layout_width="84dp"
+                        android:layout_height="84dp"
+                        android:background="@drawable/background_inverted_text_circle"
+                        android:gravity="center"
+                        android:padding="8dp"
                         android:maxLines="1"
-                        android:gravity="center_vertical"
                         android:textAppearance="@style/TextAppearance.Title"
-                        android:textSize="32dp"
-                        app:autoSizeMaxTextSize="32dp"
-                        app:autoSizeMinTextSize="22dp"
+                        android:layout_centerHorizontal="true"
                         app:autoSizeTextType="uniform"
-                        android:layout_toEndOf="@id/avatarAndButtonContainer"
-                        tools:text="westnordost" />
-
-                    <LinearLayout
-                        android:id="@+id/solvedQuestsContainer"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/userNameTextView"
-                        android:layout_marginTop="8dp"
-                        android:layout_toEndOf="@id/avatarAndButtonContainer"
-                        android:divider="@drawable/space_4dp"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:showDividers="middle">
-
-                        <ImageView
-                            android:layout_width="32dp"
-                            android:layout_height="32dp"
-                            android:src="@drawable/ic_star_48dp" />
-
-                        <TextView
-                            android:id="@+id/editCountText"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:maxLines="1"
-                            android:textAlignment="gravity"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:textSize="24dp"
-                            tools:text="1021" />
-
-                    </LinearLayout>
+                        app:autoSizeMaxTextSize="22dp"
+                        app:autoSizeMinTextSize="12dp"
+                        android:textColor="@color/background"
+                        tools:text="#1" />
 
                     <TextView
-                        android:id="@+id/unpublishedEditCountText"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/localRankLabel"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/solvedQuestsContainer"
-                        android:layout_marginTop="8dp"
-                        android:layout_toEndOf="@id/avatarAndButtonContainer"
-                        tools:text="@string/unsynced_quests_description" />
+                        android:layout_centerHorizontal="true"
+                        android:gravity="center"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:labelFor="@id/localRankText"
+                        android:layout_below="@+id/localRankText"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/user_profile_local_rank"
+                        tools:text="Rank in\nUnited States of America" />
 
                 </RelativeLayout>
 
                 <RelativeLayout
-                    android:id="@+id/buttonsContainer"
-                    android:layout_width="match_parent"
+                    android:id="@+id/globalRankContainer"
+                    android:layout_width="84dp"
                     android:layout_height="wrap_content">
 
-                    <Button
-                        android:id="@+id/profileButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        app:icon="@drawable/ic_open_in_browser_24dp"
+                    <TextView
+                        android:id="@+id/globalRankText"
+                        android:layout_width="84dp"
+                        android:layout_height="84dp"
+                        android:background="@drawable/background_inverted_text_circle"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:maxLines="1"
+                        android:textAppearance="@style/TextAppearance.Title"
                         android:layout_centerHorizontal="true"
-                        android:text="@string/osm_profile" />
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMaxTextSize="22dp"
+                        app:autoSizeMinTextSize="12dp"
+                        android:textColor="@color/background"
+                        tools:text="#123456789" />
 
-                    <Button
-                        android:id="@+id/logoutButton"
-                        android:layout_width="wrap_content"
+                    <TextView
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:text="@string/user_logout"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"/>
+                        android:layout_centerHorizontal="true"
+                        android:gravity="center"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:labelFor="@id/globalRankText"
+                        android:layout_below="@id/globalRankText"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/user_profile_global_rank" />
 
                 </RelativeLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/divider"/>
+                <RelativeLayout
+                    android:id="@+id/daysActiveContainer"
+                    android:layout_width="84dp"
+                    android:layout_height="wrap_content">
 
-                <com.google.android.flexbox.FlexboxLayout
-                    android:id="@+id/badgesContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    app:flexWrap="wrap"
-                    app:showDivider="middle"
-                    app:dividerDrawableHorizontal="@drawable/space_16dp"
-                    app:dividerDrawableVertical="@drawable/space_8dp"
-                    app:showDividerVertical="middle"
-                    app:showDividerHorizontal="middle"
-                    app:alignContent="stretch">
-
-                    <RelativeLayout
-                        android:id="@+id/localRankContainer"
-                        android:layout_width="84dp"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/localRankText"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:background="@drawable/background_inverted_text_circle"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:layout_centerHorizontal="true"
-                            app:autoSizeTextType="uniform"
-                            app:autoSizeMaxTextSize="22dp"
-                            app:autoSizeMinTextSize="12dp"
-                            android:textColor="@color/background"
-                            tools:text="#1"/>
-
-                        <TextView
-                            android:id="@+id/localRankLabel"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:textAppearance="@style/TextAppearance.Body"
-                            android:labelFor="@id/localRankText"
-                            android:layout_below="@+id/localRankText"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/user_profile_local_rank"
-                            tools:text="Rank in\nUnited States of America"/>
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:id="@+id/globalRankContainer"
-                        android:layout_width="84dp"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/globalRankText"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:background="@drawable/background_inverted_text_circle"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:layout_centerHorizontal="true"
-                            app:autoSizeTextType="uniform"
-                            app:autoSizeMaxTextSize="22dp"
-                            app:autoSizeMinTextSize="12dp"
-                            android:textColor="@color/background"
-                            tools:text="#123456"/>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:textAppearance="@style/TextAppearance.Body"
-                            android:labelFor="@id/globalRankText"
-                            android:layout_below="@id/globalRankText"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/user_profile_global_rank"/>
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:id="@+id/daysActiveContainer"
-                        android:layout_width="84dp"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/daysActiveText"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:background="@drawable/background_inverted_text_circle"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:layout_centerHorizontal="true"
-                            app:autoSizeTextType="uniform"
-                            app:autoSizeMaxTextSize="22dp"
-                            app:autoSizeMinTextSize="12dp"
-                            android:textColor="@color/background"
-                            tools:text="82"/>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:textAppearance="@style/TextAppearance.Body"
-                            android:labelFor="@id/daysActiveText"
-                            android:layout_below="@id/daysActiveText"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/user_profile_days_active"/>
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:id="@+id/achievementLevelsContainer"
+                    <TextView
+                        android:id="@+id/daysActiveText"
                         android:layout_width="84dp"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/achievementLevelsText"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:background="@drawable/background_inverted_text_circle"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:layout_centerHorizontal="true"
-                            app:autoSizeTextType="uniform"
-                            app:autoSizeMaxTextSize="22dp"
-                            app:autoSizeMinTextSize="12dp"
-                            android:textColor="@color/background"
-                            tools:text="123"/>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:textAppearance="@style/TextAppearance.Body"
-                            android:labelFor="@+id/achievementLevelsText"
-                            android:layout_below="@id/achievementLevelsText"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/user_profile_achievement_levels"/>
-
-                    </RelativeLayout>
-
-                </com.google.android.flexbox.FlexboxLayout>
-
-                <LinearLayout
-                    android:id="@+id/currentWeekSolvedQuestsContainer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:divider="@drawable/space_4dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:showDividers="middle">
+                        android:layout_height="84dp"
+                        android:background="@drawable/background_inverted_text_circle"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:maxLines="1"
+                        android:textAppearance="@style/TextAppearance.Title"
+                        android:layout_centerHorizontal="true"
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMaxTextSize="22dp"
+                        app:autoSizeMinTextSize="12dp"
+                        android:textColor="@color/background"
+                        tools:text="82" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:textAlignment="gravity"
-                        android:textAppearance="@style/TextAppearance.Title"
-                        android:text="@string/user_profile_current_week_title" />
+                        android:layout_centerHorizontal="true"
+                        android:gravity="center"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:labelFor="@id/daysActiveText"
+                        android:layout_below="@id/daysActiveText"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/user_profile_days_active" />
 
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_star_48dp" />
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/achievementLevelsContainer"
+                    android:layout_width="84dp"
+                    android:layout_height="wrap_content">
 
                     <TextView
-                        android:id="@+id/currentWeekEditCountText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
+                        android:id="@+id/achievementLevelsText"
+                        android:layout_width="84dp"
+                        android:layout_height="84dp"
+                        android:background="@drawable/background_inverted_text_circle"
+                        android:gravity="center"
+                        android:padding="8dp"
                         android:maxLines="1"
-                        android:textAlignment="gravity"
                         android:textAppearance="@style/TextAppearance.Title"
-                        tools:text="1021" />
+                        android:layout_centerHorizontal="true"
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMaxTextSize="22dp"
+                        app:autoSizeMinTextSize="12dp"
+                        android:textColor="@color/background"
+                        tools:text="123" />
 
-                </LinearLayout>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:gravity="center"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:labelFor="@+id/achievementLevelsText"
+                        android:layout_below="@id/achievementLevelsText"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/user_profile_achievement_levels" />
 
-                <com.google.android.flexbox.FlexboxLayout
-                    android:id="@+id/currentWeekBadgesContainer"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    app:flexWrap="wrap"
-                    app:showDivider="middle"
-                    app:dividerDrawableHorizontal="@drawable/space_16dp"
-                    app:dividerDrawableVertical="@drawable/space_8dp"
-                    app:showDividerVertical="middle"
-                    app:showDividerHorizontal="middle"
-                    app:alignContent="stretch">
-
-                    <RelativeLayout
-                        android:id="@+id/currentWeekLocalRankContainer"
-                        android:layout_width="84dp"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/currentWeekLocalRankText"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:background="@drawable/background_inverted_text_circle"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:layout_centerHorizontal="true"
-                            app:autoSizeTextType="uniform"
-                            app:autoSizeMaxTextSize="22dp"
-                            app:autoSizeMinTextSize="12dp"
-                            android:textColor="@color/background"
-                            tools:text="#1"/>
-
-                        <TextView
-                            android:id="@+id/currentWeekLocalRankLabel"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:textAppearance="@style/TextAppearance.Body"
-                            android:labelFor="@id/currentWeekLocalRankText"
-                            android:layout_below="@+id/currentWeekLocalRankText"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/user_profile_local_rank"
-                            tools:text="Rank in\nUnited States of America"/>
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:id="@+id/currentWeekGlobalRankContainer"
-                        android:layout_width="84dp"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/currentWeekGlobalRankText"
-                            android:layout_width="84dp"
-                            android:layout_height="84dp"
-                            android:background="@drawable/background_inverted_text_circle"
-                            android:gravity="center"
-                            android:padding="8dp"
-                            android:maxLines="1"
-                            android:textAppearance="@style/TextAppearance.Title"
-                            android:layout_centerHorizontal="true"
-                            app:autoSizeTextType="uniform"
-                            app:autoSizeMaxTextSize="22dp"
-                            app:autoSizeMinTextSize="12dp"
-                            android:textColor="@color/background"
-                            tools:text="#123456"/>
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:gravity="center"
-                            android:textAppearance="@style/TextAppearance.Body"
-                            android:labelFor="@id/currentWeekGlobalRankText"
-                            android:layout_below="@id/currentWeekGlobalRankText"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/user_profile_global_rank"/>
-
-                    </RelativeLayout>
-
-                </com.google.android.flexbox.FlexboxLayout>
+                </RelativeLayout>
+
+            </com.google.android.flexbox.FlexboxLayout>
+
+            <LinearLayout
+                android:id="@+id/currentWeekSolvedQuestsContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:divider="@drawable/space_4dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:showDividers="middle">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -413,17 +296,125 @@
                     android:gravity="center_vertical"
                     android:textAlignment="gravity"
                     android:textAppearance="@style/TextAppearance.Title"
-                    android:text="@string/user_profile_dates_mapped" />
+                    android:text="@string/user_profile_current_week_title" />
 
                 <ImageView
-                    android:id="@+id/datesActiveView"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_star_48dp" />
+
+                <TextView
+                    android:id="@+id/currentWeekEditCountText"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:textAlignment="gravity"
+                    android:textAppearance="@style/TextAppearance.Title"
+                    tools:text="1021" />
 
             </LinearLayout>
 
-        </ScrollView>
+            <com.google.android.flexbox.FlexboxLayout
+                android:id="@+id/currentWeekBadgesContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:flexWrap="wrap"
+                app:showDivider="middle"
+                app:dividerDrawableHorizontal="@drawable/space_16dp"
+                app:dividerDrawableVertical="@drawable/space_8dp"
+                app:showDividerVertical="middle"
+                app:showDividerHorizontal="middle"
+                app:alignContent="stretch">
+
+                <RelativeLayout
+                    android:id="@+id/currentWeekLocalRankContainer"
+                    android:layout_width="84dp"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/currentWeekLocalRankText"
+                        android:layout_width="84dp"
+                        android:layout_height="84dp"
+                        android:background="@drawable/background_inverted_text_circle"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:maxLines="1"
+                        android:textAppearance="@style/TextAppearance.Title"
+                        android:layout_centerHorizontal="true"
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMaxTextSize="22dp"
+                        app:autoSizeMinTextSize="12dp"
+                        android:textColor="@color/background"
+                        tools:text="#1" />
+
+                    <TextView
+                        android:id="@+id/currentWeekLocalRankLabel"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:gravity="center"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:labelFor="@id/currentWeekLocalRankText"
+                        android:layout_below="@+id/currentWeekLocalRankText"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/user_profile_local_rank"
+                        tools:text="Rank in\nUnited States of America" />
+
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:id="@+id/currentWeekGlobalRankContainer"
+                    android:layout_width="84dp"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/currentWeekGlobalRankText"
+                        android:layout_width="84dp"
+                        android:layout_height="84dp"
+                        android:background="@drawable/background_inverted_text_circle"
+                        android:gravity="center"
+                        android:padding="8dp"
+                        android:maxLines="1"
+                        android:textAppearance="@style/TextAppearance.Title"
+                        android:layout_centerHorizontal="true"
+                        app:autoSizeTextType="uniform"
+                        app:autoSizeMaxTextSize="22dp"
+                        app:autoSizeMinTextSize="12dp"
+                        android:textColor="@color/background"
+                        tools:text="#123456" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerHorizontal="true"
+                        android:gravity="center"
+                        android:textAppearance="@style/TextAppearance.Body"
+                        android:labelFor="@id/currentWeekGlobalRankText"
+                        android:layout_below="@id/currentWeekGlobalRankText"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/user_profile_global_rank" />
+
+                </RelativeLayout>
+
+            </com.google.android.flexbox.FlexboxLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:textAlignment="gravity"
+                android:textAppearance="@style/TextAppearance.Title"
+                android:text="@string/user_profile_dates_mapped" />
+
+            <ImageView
+                android:id="@+id/datesActiveView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>

From 65b98d639ccdb779078b7445584f690c56df05dc Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@disroot.org>
Date: Sat, 23 Sep 2023 09:43:51 +0200
Subject: [PATCH 2/4] don't show ok button if category value is null

---
 .../streetcomplete/quests/AGroupedImageListQuestForm.kt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AGroupedImageListQuestForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/AGroupedImageListQuestForm.kt
index 9669fda7d4..dca609d163 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/quests/AGroupedImageListQuestForm.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/quests/AGroupedImageListQuestForm.kt
@@ -134,5 +134,5 @@ abstract class AGroupedImageListQuestForm<I, T> : AbstractOsmQuestForm<T>() {
 
     abstract fun onClickOk(value: I)
 
-    override fun isFormComplete() = selectedItem != null
+    override fun isFormComplete() = selectedItem?.value != null
 }

From 584330b2a2edeefcbb02a94adbc80b447e06dfa2 Mon Sep 17 00:00:00 2001
From: Flo Edelmann <git@flo-edelmann.de>
Date: Mon, 25 Sep 2023 16:37:21 +0200
Subject: [PATCH 3/4] Update Java to v17 in GitHub Actions (#5271)

---
 .github/workflows/generate-quest-list.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/generate-quest-list.yml b/.github/workflows/generate-quest-list.yml
index 486e7ab930..b8b1e50c08 100644
--- a/.github/workflows/generate-quest-list.yml
+++ b/.github/workflows/generate-quest-list.yml
@@ -10,12 +10,12 @@ jobs:
     name: Generate quest list
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: set up JDK 11
+      - uses: actions/checkout@v4
+      - name: set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

From 939058628649675bd49bafca877972dda54c350b Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@disroot.org>
Date: Sun, 24 Sep 2023 23:24:33 +0200
Subject: [PATCH 4/4] Fix crash #5241

---
 .../screens/main/map/components/DownloadedAreaMapComponent.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/map/components/DownloadedAreaMapComponent.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/map/components/DownloadedAreaMapComponent.kt
index 6408fe190e..2790ed3ef8 100644
--- a/app/src/main/java/de/westnordost/streetcomplete/screens/main/map/components/DownloadedAreaMapComponent.kt
+++ b/app/src/main/java/de/westnordost/streetcomplete/screens/main/map/components/DownloadedAreaMapComponent.kt
@@ -12,7 +12,7 @@ import de.westnordost.streetcomplete.screens.main.map.tangram.toLngLat
 class DownloadedAreaMapComponent(private val ctrl: KtMapController) {
     private var layer: MapData? = null
 
-    fun set(tiles: Collection<TilePos>) {
+    fun set(tiles: Collection<TilePos>) = synchronized(this) {
         // tangram does not clear a layer properly on re-setting features on it, so let's remove
         // and re-add the whole layer
         layer?.remove()