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:
Josephine Lim 2017-03-09 16:12:00 +10:00
commit a12655ba41
7 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/proguard-rules.txt
View file

@ -2,3 +2,4 @@
-keep class org.apache.http.** { *; }
-dontwarn org.apache.http.**
-keep class fr.free.nrw.commons.upload.MwVolleyApi$Page {*;}
-keep class android.support.v7.widget.ShareActionProvider { *; }

12
app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -222,10 +222,14 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
// Set ShareActionProvider Intent
ShareActionProvider mShareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(menu.findItem(R.id.menu_share_current_image));
Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_TEXT, m.getDisplayTitle() + " \n" + m.getDescriptionUrl());
mShareActionProvider.setShareIntent(shareIntent);
// On some phones null is returned for some reason:
// https://github.com/commons-app/apps-android-commons/issues/413
if(mShareActionProvider != null) {
Intent shareIntent = new Intent(Intent.ACTION_SEND);
shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_TEXT, m.getDisplayTitle() + " \n" + m.getDescriptionUrl());
mShareActionProvider.setShareIntent(shareIntent);
}
if(m instanceof Contribution) {
Contribution c = (Contribution)m;

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

@ -2,6 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:gravity="center"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
>

4
app/src/main/res/layout/welcome_dont_upload.xml
View file

@ -7,7 +7,7 @@
android:gravity="center_vertical"
>
<RelativeLayout
<LinearLayout
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="240dp"
@ -31,7 +31,7 @@
android:layout_toRightOf="@+id/selfie_x"
/>
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="295dp"

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

@ -7,7 +7,7 @@
android:gravity="center_vertical"
>
<RelativeLayout
<LinearLayout
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="180dp"
@ -28,12 +28,11 @@
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_gravity="center"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@+id/welcome_wikipedia"
/>
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="wrap_content"

4
app/src/main/res/menu/fragment_contributions_list.xml
View file

@ -15,22 +15,18 @@
<item android:id="@+id/menu_settings"
android:title="@string/menu_settings"
app:showAsAction="never"
android:icon="@android:drawable/ic_menu_preferences"
/>
<item android:id="@+id/menu_about"
android:title="@string/menu_about"
app:showAsAction="never"
android:icon="@android:drawable/ic_menu_info_details"
/>
<item android:id="@+id/menu_feedback"
android:title="@string/menu_feedback"
app:showAsAction="never"
android:icon="@android:drawable/ic_menu_send"
/>
<item android:id="@+id/menu_nearby"
android:title="@string/menu_nearby"
app:showAsAction="never"
android:icon="@android:drawable/ic_menu_myplaces"
/>
<item android:id="@+id/menu_refresh"
android:title="@string/menu_refresh"

5
app/src/main/res/menu/fragment_image_detail.xml
View file

@ -6,15 +6,13 @@
android:id="@+id/menu_share_current_image"
app:actionProviderClass="android.support.v7.widget.ShareActionProvider"
android:title="@string/menu_share"
app:showAsAction="ifRoom|withText" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_browser_current_image"
android:icon="@android:drawable/ic_menu_view"
android:title="@string/menu_open_in_browser"
app:showAsAction="never" />
<item
android:id="@+id/menu_download_current_image"
android:icon="@drawable/ic_menu_download"
android:title="@string/menu_download"
app:showAsAction="never" />
<item
@ -27,7 +25,6 @@
<item
android:id="@+id/menu_cancel_current_image"
android:enabled="false"
android:icon="@android:drawable/ic_menu_delete"
android:title="@string/menu_cancel_upload"
android:visible="false"
app:showAsAction="never" />