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

Merge remote-tracking branch 'refs/remotes/commons-app/master'

Browse source
This commit is contained in:
misaochan 2016-11-01 17:57:33 +13:00
commit 3d6b38066a
24 changed files with 630 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/res/layout/activity_about.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:orientation="vertical"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<ImageView
android:src="@drawable/ic_launcher"
@ -34,24 +34,27 @@
android:gravity="center"
android:text="@string/about_license"
/>
<TextView
android:id="@+id/about_improve"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
style="?android:textAppearanceSmall"
android:gravity="center"
android:text="@string/about_improve"
/>
android:id="@+id/about_improve"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
style="?android:textAppearanceSmall"
android:gravity="center"
android:text="@string/about_improve"
/>
<TextView
android:id="@+id/about_privacy_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
style="?android:textAppearanceSmall"
android:gravity="center"
android:text="@string/about_privacy_policy"
/>
android:id="@+id/about_privacy_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
style="?android:textAppearanceSmall"
android:gravity="center"
android:text="@string/about_privacy_policy"
/>
<TextView
android:id="@+id/about_uploads_to"
android:layout_width="wrap_content"
@ -61,4 +64,5 @@
android:gravity="center"
android:alpha="0.2"
/>
</LinearLayout>

15
app/src/main/res/layout/activity_contributions.xml
View file

@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:id="@+id/contributionsFragmentContainer"
android:background="#000000"
>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:id="@+id/contributionsFragmentContainer"
android:background="#000000"
>
<fragment
android:name="fr.free.nrw.commons.contributions.ContributionsListFragment"
android:id="@+id/contributionsListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</FrameLayout>

119
app/src/main/res/layout/activity_login.xml
View file

@ -1,77 +1,84 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical" >
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
>
<ImageView
android:id="@+id/commonsLogo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:src="@drawable/commons_logo_large" />
android:id="@+id/commonsLogo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:src="@drawable/commons_logo_large"
/>
<TextView
android:id="@+id/loginSubtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:id="@+id/loginSubtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_margin="16dip"
android:gravity="center"
android:orientation="vertical"
>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_margin="16dip"
android:gravity="center"
android:orientation="vertical"
>
<FrameLayout
android:id="@+id/loginErrors"
android:layout_width="fill_parent"
android:layout_height="48dp"
/>
android:id="@+id/loginErrors"
android:layout_width="fill_parent"
android:layout_height="48dp"
/>
<EditText
android:id="@+id/loginUsername"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/username"
android:inputType="textNoSuggestions"
android:imeOptions="flagNoExtractUi"
>
android:id="@+id/loginUsername"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/username"
android:inputType="textNoSuggestions"
android:imeOptions="flagNoExtractUi"
>
<requestFocus />
</EditText>
<EditText
android:id="@+id/loginPassword"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword"
android:imeOptions="flagNoExtractUi" />
android:id="@+id/loginPassword"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword"
android:imeOptions="flagNoExtractUi"
/>
<Button
android:id="@+id/loginButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/login" />
android:id="@+id/loginButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:enabled="false"
android:text="@string/login"
/>
<Button
android:id="@+id/signupButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/signup"
android:layout_gravity="center_horizontal"
android:onClick="signUp" />
android:id="@+id/signupButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/signup"
android:layout_gravity="center_horizontal"
android:onClick="signUp"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>

10
app/src/main/res/layout/activity_multiple_uploads.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/uploadsFragmentContainer"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:id="@+id/uploadsFragmentContainer"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</FrameLayout>

6
app/src/main/res/layout/activity_nearby.xml
View file

@ -2,12 +2,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
</FrameLayout>
</LinearLayout>

8
app/src/main/res/layout/activity_post_upload.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</LinearLayout>

11
app/src/main/res/layout/activity_share.xml
View file

@ -2,20 +2,19 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#000"
>
>
<ImageView
android:id="@+id/backgroundImage"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
/>
<FrameLayout
android:id="@+id/single_upload_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
/>
</FrameLayout>

29
app/src/main/res/layout/activity_welcome.xml
View file

@ -1,23 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
>
<android.support.v4.view.ViewPager
android:id="@+id/welcomePager"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fadingEdge="none"
>
</android.support.v4.view.ViewPager>
android:id="@+id/welcomePager"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fadingEdge="none"
/>
<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/welcomePagerIndicator"
android:layout_height="24dp"
android:layout_width="fill_parent"
android:layout_gravity="bottom" />
android:id="@+id/welcomePagerIndicator"
android:layout_height="24dp"
android:layout_width="fill_parent"
android:layout_gravity="bottom"
/>
</FrameLayout>

37
app/src/main/res/layout/detail_category_item.xml
View file

@ -1,22 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:padding="12dp"
android:gravity="center_vertical"
android:id="@+id/mediaDetailCategoryItemText"
android:textSize="14sp"
android:textColor="@android:color/white"
android:background="#20ffffff"
/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:padding="12dp"
android:gravity="center_vertical"
android:id="@+id/mediaDetailCategoryItemText"
android:textSize="14sp"
android:textColor="@android:color/white"
android:background="#20ffffff"
/>
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
android:layout_width="fill_parent"
android:layout_height="8dp"
/>
</LinearLayout>

37
app/src/main/res/layout/fragment_categorization.xml
View file

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#AA000000"
android:paddingBottom="8dip"
android:paddingLeft="16dip"
android:paddingStart="16dip"
android:paddingRight="16dip"
android:paddingEnd="16dip"
android:paddingTop="8dip"
>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#AA000000"
android:paddingBottom="8dip"
android:paddingLeft="16dip"
android:paddingStart="16dip"
android:paddingRight="16dip"
android:paddingEnd="16dip"
android:paddingTop="8dip"
>
<FrameLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
>
<EditText
android:id="@+id/categoriesSearchBox"
android:layout_height="wrap_content"
@ -25,6 +25,7 @@
android:singleLine="true"
android:imeOptions="flagNoExtractUi"
/>
<ProgressBar
android:id="@+id/categoriesSearchInProgress"
android:layout_width="wrap_content"
@ -40,12 +41,12 @@
</FrameLayout>
<TextView
android:id="@+id/categoriesNotFound"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:visibility="gone"
android:gravity="center"
/>
android:id="@+id/categoriesNotFound"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:visibility="gone"
android:gravity="center"
/>
<TextView
android:id="@+id/categoriesExplanation"

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

@ -1,30 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#000000"
>
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#000000"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/waiting_first_sync"
android:id="@+id/waitingMessage" android:layout_gravity="center" android:visibility="gone"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/waiting_first_sync"
android:id="@+id/waitingMessage"
android:layout_gravity="center"
android:visibility="gone"
/>
<TextView
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"/>
<GridView android:id="@+id/contributionsList"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:stretchMode="columnWidth"
android:columnWidth="240dp"
android:numColumns="auto_fit"
android:listSelector="@null"
android:fadingEdge="none"
android:fastScrollEnabled="true"
/>
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"
/>
<GridView
android:id="@+id/contributionsList"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:stretchMode="columnWidth"
android:columnWidth="240dp"
android:numColumns="auto_fit"
android:listSelector="@null"
android:fadingEdge="none"
android:fastScrollEnabled="true"
/>
</LinearLayout>

283
app/src/main/res/layout/fragment_media_detail.xml
View file

@ -1,161 +1,192 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/background_dark"
>
<ProgressBar android:id="@+id/mediaDetailImageLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
android:visibility="visible"
/>
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/background_dark"
>
<ImageView android:id="@+id/mediaDetailImageFailed"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:src="@android:drawable/ic_menu_close_clear_cancel"
android:visibility="gone"
/>
<ProgressBar
android:id="@+id/mediaDetailImageLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
android:visibility="visible"
/>
<fr.free.nrw.commons.MediaWikiImageView android:id="@+id/mediaDetailImage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="fitCenter"
/>
<ImageView
android:id="@+id/mediaDetailImageFailed"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:src="@android:drawable/ic_menu_close_clear_cancel"
android:visibility="gone"
/>
<fr.free.nrw.commons.MediaWikiImageView
android:id="@+id/mediaDetailImage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="fitCenter"
/>
<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/mediaDetailScrollView"
android:fillViewport="true"
android:background="@android:color/transparent"
android:cacheColorHint="@android:color/transparent">
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/mediaDetailScrollView"
android:fillViewport="true"
android:background="@android:color/transparent"
android:cacheColorHint="@android:color/transparent"
>
<LinearLayout android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
<!-- Placeholder. Height gets set at runtime based on container size; the initial value is a hack to keep
the detail info offscreen until it's placed properly. May be a better way to do this. -->
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="16dp"
android:id="@+id/mediaDetailSpacer"/>
android:layout_width="fill_parent"
android:layout_height="16dp"
android:id="@+id/mediaDetailSpacer"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#AA000000"
android:padding="16dp"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#AA000000"
android:padding="16dp">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:background="#20ffffff"
android:padding="16dp"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Title"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Title of the media"
android:id="@+id/mediaDetailTitle"
android:layout_gravity="left|start"
android:textColor="@android:color/white"
android:background="#20ffffff"
android:padding="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="Title"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Title of the media"
android:id="@+id/mediaDetailTitle"
android:layout_gravity="left|start"
android:textColor="@android:color/white"
android:background="#20ffffff"
android:textSize="14sp"
android:padding="12dp"/>
android:textSize="14sp"
android:padding="12dp"
/>
</LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
android:layout_width="fill_parent"
android:layout_height="8dp"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#20ffffff"
android:padding="16dp"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Description"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though."
android:background="#20ffffff"
android:padding="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Description"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though."
android:background="#20ffffff"
android:id="@+id/mediaDetailDesc"
android:textColor="@android:color/white"
android:layout_gravity="left|start"
android:textSize="14sp"
android:padding="12dp"/>
android:id="@+id/mediaDetailDesc"
android:textColor="@android:color/white"
android:layout_gravity="left|start"
android:textSize="14sp"
android:padding="12dp"
/>
</LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
android:layout_width="fill_parent"
android:layout_height="8dp"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#20ffffff"
android:padding="16dp"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="License"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="License link"
android:id="@+id/mediaDetailLicense"
android:layout_gravity="left|start"
android:background="#20ffffff"
android:padding="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:text="License"
android:textSize="16sp"
android:textStyle="bold"
android:paddingBottom="6dp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="License link"
android:id="@+id/mediaDetailLicense"
android:layout_gravity="left|start"
android:background="#20ffffff"
android:textColor="@android:color/white"
android:textSize="14sp"
android:padding="12dp"/>
android:textColor="@android:color/white"
android:textSize="14sp"
android:padding="12dp"
/>
</LinearLayout>
<fr.free.nrw.commons.media.MediaDetailSpacer
android:layout_width="fill_parent"
android:layout_height="8dp"/>
android:layout_width="fill_parent"
android:layout_height="8dp"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#20ffffff"
android:padding="16dp"
android:textStyle="bold">
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#20ffffff"
android:padding="16dp"
android:textStyle="bold"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/detail_panel_cats_label"
android:textSize="16sp"
android:layout_gravity="left|start"
android:textColor="@android:color/white"
android:paddingBottom="6dp"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/detail_panel_cats_label"
android:textSize="16sp"
android:layout_gravity="left|start"
android:textColor="@android:color/white"
android:paddingBottom="6dp"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/mediaDetailCategoryContainer"/>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/mediaDetailCategoryContainer"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

21
app/src/main/res/layout/fragment_media_detail_pager.xml
View file

@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.view.ViewPager
android:id="@+id/mediaDetailsPager"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fadingEdge="none"
>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</android.support.v4.view.ViewPager>
<android.support.v4.view.ViewPager
android:id="@+id/mediaDetailsPager"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fadingEdge="none"
/>
</LinearLayout>

41
app/src/main/res/layout/fragment_multiple_uploads_list.xml
View file

@ -1,23 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<EditText android:id="@+id/multipleBaseTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/multiple_share_base_title"
android:imeOptions="flagNoExtractUi"
/>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<GridView android:id="@+id/multipleShareBackground"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:stretchMode="columnWidth"
android:numColumns="auto_fit"
android:listSelector="@null"
android:fadingEdge="none"
android:fastScrollEnabled="false"
/>
<EditText
android:id="@+id/multipleBaseTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/multiple_share_base_title"
android:imeOptions="flagNoExtractUi"
/>
<GridView
android:id="@+id/multipleShareBackground"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:stretchMode="columnWidth"
android:numColumns="auto_fit"
android:listSelector="@null"
android:fadingEdge="none"
android:fastScrollEnabled="false"
/>
</LinearLayout>

10
app/src/main/res/layout/fragment_nearby.xml
View file

@ -1,18 +1,20 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:orientation="vertical"
>
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
android:layout_centerInParent="true"
/>
<ListView
android:id="@+id/listview"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
</ListView>
android:layout_height="fill_parent"
/>
</RelativeLayout>

7
app/src/main/res/layout/fragment_single_upload.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -38,7 +37,8 @@
android:background="#90000000"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/titleDescButton" />
android:id="@+id/titleDescButton"
/>
<TextView
android:layout_width="wrap_content"
@ -46,5 +46,6 @@
android:text="@string/share_license_summary"
android:id="@+id/share_license_summary"
android:gravity="center"
android:layout_marginTop="16dp"/>
android:layout_marginTop="16dp"
/>
</LinearLayout>

18
app/src/main/res/layout/item_place.xml
View file

@ -2,11 +2,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:foreground="?attr/selectableItemBackground"
android:layout_height="@dimen/icon_size">
android:layout_height="@dimen/icon_size"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
<ImageView
android:id="@+id/icon"
@ -14,7 +16,8 @@
android:layout_height="match_parent"
android:src="@drawable/empty_photo"
android:background="#ffffff"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
/>
<TextView
android:id="@+id/distance"
@ -26,7 +29,8 @@
style="?android:textAppearanceSmallInverse"
android:textColor="#ffffff"
android:background="@color/text_background"
tools:text="Overlay"/>
tools:text="Overlay"
/>
<TextView
android:id="@+id/tvName"
@ -40,7 +44,8 @@
android:maxLines="1"
android:ellipsize="none"
style="?android:textAppearanceMedium"
tools:text="Name" />
tools:text="Name"
/>
<TextView
android:id="@+id/tvDesc"
@ -53,7 +58,8 @@
android:ellipsize="none"
android:maxLines="4"
style="?android:textAppearanceSmall"
tools:text="Description" />
tools:text="Description"
/>
</RelativeLayout>
</FrameLayout>

15
app/src/main/res/layout/layout_categories_item.xml
View file

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp"
android:checkMark="?android:attr/textCheckMark"
android:checked="false"
android:gravity="center_vertical"
>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="4dp"
android:checkMark="?android:attr/textCheckMark"
android:checked="false"
android:gravity="center_vertical"
>
</CheckedTextView>

91
app/src/main/res/layout/layout_contribution.xml
View file

@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:paddingBottom="0dp"
>
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:paddingBottom="0dp"
>
<TextView android:id="@+id/contributionSequenceNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="98sp"
android:textColor="#33FFFFFF"
android:typeface="serif"
android:layout_gravity="end|bottom"
/>
<fr.free.nrw.commons.MediaWikiImageView android:id="@+id/contributionImage"
android:layout_width="fill_parent"
android:layout_height="240dp"
android:scaleType="centerCrop"
custom:isThumbnail="true"
/>
<TextView
android:id="@+id/contributionSequenceNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="98sp"
android:textColor="#33FFFFFF"
android:typeface="serif"
android:layout_gravity="end|bottom"
/>
<fr.free.nrw.commons.MediaWikiImageView
android:id="@+id/contributionImage"
android:layout_width="fill_parent"
android:layout_height="240dp"
android:scaleType="centerCrop"
custom:isThumbnail="true"
/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="#AA000000"
android:orientation="vertical"
android:padding="8dp"
>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="#AA000000"
android:orientation="vertical"
android:padding="8dp"
>
<ProgressBar
android:id="@+id/contributionProgress"
android:layout_width="fill_parent"
@ -43,24 +45,23 @@
/>
<TextView
android:id="@+id/contributionState"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:textAppearanceSmall"
android:textColor="#FFFFFFFF"
android:visibility="gone"
/>
android:id="@+id/contributionState"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:textAppearanceSmall"
android:textColor="#FFFFFFFF"
android:visibility="gone"
/>
<TextView
android:id="@+id/contributionTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
style="?android:textAppearanceMedium"
android:maxLines="2"
android:ellipsize="end"
/>
android:id="@+id/contributionTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
style="?android:textAppearanceMedium"
android:maxLines="2"
android:ellipsize="end"
/>
</LinearLayout>
</FrameLayout>

53
app/src/main/res/layout/layout_upload_item.xml
View file

@ -1,35 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:paddingBottom="0dp"
android:background="#000000"
>
<ImageView android:id="@+id/uploadImage"
android:layout_width="fill_parent"
android:layout_height="192dp"
android:scaleType="centerCrop"
/>
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="2dp"
android:paddingBottom="0dp"
android:background="#000000"
>
<ImageView
android:id="@+id/uploadImage"
android:layout_width="fill_parent"
android:layout_height="192dp"
android:scaleType="centerCrop"
/>
<RelativeLayout
android:id="@+id/uploadOverlay"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="#77000000"
android:padding="4dp"
>
android:id="@+id/uploadOverlay"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center|bottom"
android:background="#77000000"
android:padding="4dp"
>
<TextView
android:id="@+id/uploadTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
style="?android:textAppearanceSmall"
/>
android:id="@+id/uploadTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFFFF"
style="?android:textAppearanceSmall"
/>
</RelativeLayout>
</FrameLayout>

49
app/src/main/res/layout/login.xml
View file

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
>
<ImageView
android:id="@+id/commonsLogo"
@ -14,7 +16,8 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:src="@drawable/commons_logo_large" />
android:src="@drawable/commons_logo_large"
/>
<LinearLayout
android:layout_width="fill_parent"
@ -23,33 +26,35 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:orientation="vertical"
android:padding="20dp" >
android:padding="20dp"
>
<EditText
android:id="@+id/loginUsername"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/username" >
android:id="@+id/loginUsername"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/username"
>
<requestFocus />
</EditText>
</EditText>
<EditText
android:id="@+id/loginPassword"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword" />
<EditText
android:id="@+id/loginPassword"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/password"
android:inputType="textPassword"
/>
<Button
android:id="@+id/loginButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/login" />
android:id="@+id/loginButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="@string/login"
/>
</LinearLayout>
</RelativeLayout>
</FrameLayout>

63
app/src/main/res/layout/welcome_copyright.xml
View file

@ -1,40 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/welcome_copyright"
android:adjustViewBounds="true"
android:layout_gravity="center"
/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/welcome_copyright"
android:adjustViewBounds="true"
android:layout_gravity="center"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_copyright_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:paddingTop="24dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_copyright_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:paddingTop="24dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_copyright_subtext"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_copyright_subtext"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"
/>
</LinearLayout>

92
app/src/main/res/layout/welcome_final.xml
View file

@ -1,62 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>
<!-- Sorry about the hardcoded sizes here. They're image-related. -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="fill_parent"
android:layout_height="180dp"
android:gravity="center_horizontal"
>
<ImageView
android:layout_width="150dp"
android:layout_height="180dp"
android:gravity="center_horizontal">
android:src="@drawable/welcome_wikipedia"
/>
<ImageView
android:layout_width="150dp"
android:layout_height="180dp"
android:src="@drawable/welcome_wikipedia"/>
<ImageView
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_gravity="center"
android:src="@drawable/welcome_copyright"/>
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_gravity="center"
android:src="@drawable/welcome_copyright"
/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_final_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
android:singleLine="false"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_final_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
android:singleLine="false"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"
/>
<Button
android:layout_width="120dp"
android:layout_height="40dp"
android:text="@string/welcome_final_button_text"
android:id="@+id/welcomeYesButton"
android:layout_gravity="center"
android:background="@android:color/white"
android:textColor="#0c609c"
android:textStyle="bold"
/>
android:layout_width="120dp"
android:layout_height="40dp"
android:text="@string/welcome_final_button_text"
android:id="@+id/welcomeYesButton"
android:layout_gravity="center"
android:background="@android:color/white"
android:textColor="#0c609c"
android:textStyle="bold"
/>
</LinearLayout>

62
app/src/main/res/layout/welcome_wikipedia.xml
View file

@ -1,39 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#0c609c"
android:gravity="center_vertical"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/welcome_wikipedia"
android:adjustViewBounds="true"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/welcome_wikipedia"
android:adjustViewBounds="true"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_wikipedia_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:paddingTop="24dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_wikipedia_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textAlignment="center"
android:paddingTop="24dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_wikipedia_subtext"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_wikipedia_subtext"
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"
/>
</LinearLayout>