mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-28 13:23:58 +01:00
* Fixes #3389 - Show User profiles * Don't show dummy achievements data - show data only when loaded
This commit is contained in:
parent
7ce80aa804
commit
88b21a678e
20 changed files with 358 additions and 48 deletions
|
|
@ -15,8 +15,6 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="?attr/mainBackground">
|
||||
|
||||
<include layout="@layout/toolbar"/>
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/tab_layout"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -15,6 +15,14 @@
|
|||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_achievements_of_user"
|
||||
style="@style/MediaDetailTextLabel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
tools:text="Achievements of user : Ashish" />
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -136,6 +144,7 @@
|
|||
app:progress_start_color="#3A3381"
|
||||
app:progress_stroke_width="@dimen/progressbar_stroke"
|
||||
app:progress_text_format_pattern="573/110"
|
||||
android:visibility="gone"
|
||||
app:progress_text_color="@color/secondaryColor"
|
||||
app:style="solid_line" />
|
||||
|
||||
|
|
@ -203,6 +212,7 @@
|
|||
android:layout_marginRight="@dimen/large_gap"
|
||||
android:layout_marginEnd="@dimen/large_gap"
|
||||
android:progress="50"
|
||||
android:visibility="gone"
|
||||
android:id="@+id/image_reverts_progressbar"
|
||||
app:progress_end_color="#8C8B98"
|
||||
app:progress_start_color="#3A3381"
|
||||
|
|
@ -270,6 +280,7 @@
|
|||
app:progress_end_color="#8C8B98"
|
||||
app:progress_start_color="#3A3381"
|
||||
app:progress_stroke_width="2.5dp"
|
||||
android:visibility="gone"
|
||||
app:progress_text_color="@color/secondaryColor"
|
||||
app:progress_text_format_pattern="12/24"
|
||||
app:style="solid_line" />
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
@ -26,11 +27,28 @@
|
|||
android:layout_centerInParent="true"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/contributionsList"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="match_parent"
|
||||
/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/tv_contributions_of_user"
|
||||
style="@style/MediaDetailTextLabel"
|
||||
tools:text="Contributions of user : Ashish"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
tools:visibility="visible"
|
||||
android:visibility="gone" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/contributionsList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_below="@id/tv_contributions_of_user" />
|
||||
</RelativeLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/fab_layout"
|
||||
|
|
|
|||
|
|
@ -30,4 +30,9 @@
|
|||
android:title="@string/menu_set_avatar"
|
||||
app:showAsAction="never" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_view_user_page"
|
||||
android:title="@string/menu_view_user_page"
|
||||
app:showAsAction="never" />
|
||||
|
||||
</menu>
|
||||
|
|
@ -527,7 +527,8 @@ Upload your first media by tapping on the add button.</string>
|
|||
<string name="coordinates_picking_unsuccessful">Unable to get coordinates.</string>
|
||||
|
||||
<string name="share_image_via">Share image via</string>
|
||||
<string name="no_achievements_yet">You haven\'t made any contributions yet</string>
|
||||
<string name="you_have_no_achievements_yet">You haven\'t made any contributions yet</string>
|
||||
<string name="no_achievements_yet">%s has not made any contributions yet</string>
|
||||
<string name="account_created">Account created!</string>
|
||||
<string name="text_copy">Text copied to clipboard</string>
|
||||
<string name="notification_mark_read">Notification marked as read</string>
|
||||
|
|
@ -656,4 +657,7 @@ Upload your first media by tapping on the add button.</string>
|
|||
<string name="learn_more">LEARN MORE</string>
|
||||
<string name="wlm_campaign_title">Wiki Loves Monuments</string>
|
||||
<string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
|
||||
<string name="contributions_of_user">Contributions of User: %s</string>
|
||||
<string name="achievements_of_user">Achievements of User: %s</string>
|
||||
<string name="menu_view_user_page">View user page</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue