mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 12:53:55 +01:00
Basic Structure Implemented
This commit is contained in:
parent
6744940970
commit
8fc7f795f6
3 changed files with 150 additions and 14 deletions
|
|
@ -68,6 +68,7 @@ dependencies {
|
||||||
testImplementation 'org.robolectric:robolectric:3.7.1'
|
testImplementation 'org.robolectric:robolectric:3.7.1'
|
||||||
testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
|
testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
|
||||||
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
|
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
|
||||||
|
compile 'com.dinuscxj:circleprogressbar:1.1.1'
|
||||||
|
|
||||||
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
|
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
|
||||||
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
|
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,126 @@
|
||||||
layout="@layout/toolbar"
|
layout="@layout/toolbar"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
<LinearLayout
|
|
||||||
|
<RelativeLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1.5"
|
android:layout_weight="1.8"
|
||||||
|
android:orientation="vertical"
|
||||||
android:layout_below="@+id/toolbar"
|
android:layout_below="@+id/toolbar"
|
||||||
android:background="#D6DCE0">
|
android:background="#D6DCE0">
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceLarge"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/level"/>
|
||||||
|
|
||||||
</LinearLayout>
|
<ImageView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginVertical="@dimen/activity_margin_vertical"
|
||||||
|
android:id="@+id/achievement_badge"
|
||||||
|
android:layout_above="@+id/layout_image_uploaded"
|
||||||
|
android:layout_marginBottom="@dimen/activity_margin_vertical"
|
||||||
|
android:layout_centerHorizontal="true"/>
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/layout_image_uploaded"
|
||||||
|
android:layout_above="@+id/layout_image_reverts"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/images_uploaded"/>
|
||||||
|
<com.dinuscxj.progressbar.CircleProgressBar
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:progress="50"
|
||||||
|
app:style="solid_line"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
|
||||||
|
app:progress_text_format_pattern="12/24"
|
||||||
|
app:progress_stroke_width="3dp"
|
||||||
|
app:progress_start_color="#3A3381"
|
||||||
|
app:progress_end_color="#8C8B98"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp" />
|
||||||
|
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/layout_image_reverts"
|
||||||
|
android:layout_above="@+id/layout_image_used_by_wiki"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/images_uploaded"/>
|
||||||
|
<com.dinuscxj.progressbar.CircleProgressBar
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:progress="50"
|
||||||
|
app:style="solid_line"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
|
||||||
|
app:progress_text_format_pattern="12/24"
|
||||||
|
app:progress_stroke_width="3dp"
|
||||||
|
app:progress_start_color="#3A3381"
|
||||||
|
app:progress_end_color="#8C8B98"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp" />
|
||||||
|
</RelativeLayout>
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/layout_image_used_by_wiki"
|
||||||
|
android:layout_marginBottom="@dimen/activity_margin_vertical"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/images_uploaded"/>
|
||||||
|
<com.dinuscxj.progressbar.CircleProgressBar
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:progress="50"
|
||||||
|
app:style="solid_line"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
|
||||||
|
app:progress_text_format_pattern="12/24"
|
||||||
|
app:progress_stroke_width="2.5dp"
|
||||||
|
app:progress_start_color="#3A3381"
|
||||||
|
app:progress_end_color="#8C8B98"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
|
|
@ -35,12 +147,12 @@
|
||||||
style="?android:textAppearanceLarge"
|
style="?android:textAppearanceLarge"
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginTop="@dimen/activity_margin_vertical"/>
|
android:layout_marginTop="@dimen/activity_margin_vertical"/>
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
@ -53,24 +165,35 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="?android:textAppearanceMedium"
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_toRightOf="@+id/featured_image_icon"
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
android:text="@string/statistics_featured"/>
|
android:text="@string/statistics_featured"/>
|
||||||
|
<TextView
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
android:text="2"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="@dimen/overflow_icon_dimen"
|
android:layout_width="@dimen/overflow_icon_dimen"
|
||||||
android:layout_height="@dimen/overflow_icon_dimen"
|
android:layout_height="@dimen/overflow_icon_dimen"
|
||||||
app:srcCompat="@drawable/ic_thanks"
|
app:srcCompat="@drawable/ic_thanks"
|
||||||
|
android:id="@+id/thanks_image_icon"
|
||||||
android:scaleType="centerCrop"
|
android:scaleType="centerCrop"
|
||||||
/>
|
/>
|
||||||
<TextView
|
<TextView
|
||||||
|
|
@ -78,10 +201,21 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
style="?android:textAppearanceMedium"
|
style="?android:textAppearanceMedium"
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_toRightOf="@+id/thanks_image_icon"
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
android:text="@string/statistics_thanks"/>
|
android:text="@string/statistics_thanks"/>
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="2"/>
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -288,5 +288,6 @@
|
||||||
<string name="statistics">STATISTICS</string>
|
<string name="statistics">STATISTICS</string>
|
||||||
<string name="statistics_thanks">Thanks Received</string>
|
<string name="statistics_thanks">Thanks Received</string>
|
||||||
<string name="statistics_featured">Featured Images</string>
|
<string name="statistics_featured">Featured Images</string>
|
||||||
|
<string name="level">LEVEL</string>
|
||||||
|
<string name="images_uploaded">Images Uploaded</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue