mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'projet_original_master/master'

Browse source 
"synchronisation with the original project"
This commit is contained in:
aumassart 2017-11-02 09:41:54 +01:00
commit 6ef5c35e52
85 changed files with 438 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/res/layout/drawer_header.xml
View file

@ -1,8 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:background="@android:color/darker_gray">
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pictureOfTheDay"
android:layout_width="match_parent"
android:layout_height="172dp"
android:background="@android:color/darker_gray"
android:padding="16dp"
android:paddingLeft="16dp"
android:paddingTop="16dp"
android:paddingRight="16dp"
android:paddingBottom="5dp"
android:src="@drawable/commons_logo_large"/>
<TextView
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TextView"
android:textColor="@color/item_white_background"
android:textSize="22sp"
android:layout_below="@+id/pictureOfTheDay"
android:layout_centerHorizontal="true"
android:paddingBottom="5dp"/>
</RelativeLayout>

14
app/src/main/res/layout/fragment_contributions.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -13,15 +14,14 @@
android:id="@+id/waitingMessage"
android:layout_gravity="center"
android:visibility="gone"
android:layout_centerHorizontal="true"
/>
<TextView
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/no_uploads_yet"
android:id="@+id/emptyMessage"
android:layout_gravity="center"
android:visibility="gone"
android:layout_centerInParent="true"
android:id="@+id/loadingContributionsProgressBar"
/>
<GridView
@ -36,4 +36,4 @@
android:fastScrollEnabled="true"
/>
</LinearLayout>
</RelativeLayout>