From 21a6c454e8f0aabc535daa66fd3cf8890b1e9466 Mon Sep 17 00:00:00 2001 From: veyndan Date: Tue, 7 Mar 2017 02:09:38 +0000 Subject: [PATCH 1/6] Remove references to icons when showAsAction is set to never --- app/src/main/res/menu/fragment_contributions_list.xml | 4 ---- app/src/main/res/menu/fragment_image_detail.xml | 3 --- 2 files changed, 7 deletions(-) diff --git a/app/src/main/res/menu/fragment_contributions_list.xml b/app/src/main/res/menu/fragment_contributions_list.xml index 3805a7730..06c39006c 100644 --- a/app/src/main/res/menu/fragment_contributions_list.xml +++ b/app/src/main/res/menu/fragment_contributions_list.xml @@ -15,22 +15,18 @@ From 7a83724b6543f81485e3c7f505f4fedb07c5d861 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Tue, 7 Mar 2017 20:15:44 +0000 Subject: [PATCH 2/6] Use LinearLayouts instead of RelativeLayouts --- app/src/main/res/layout/welcome_dont_upload.xml | 4 ++-- app/src/main/res/layout/welcome_final.xml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml index 855b77cd6..98488ca05 100644 --- a/app/src/main/res/layout/welcome_dont_upload.xml +++ b/app/src/main/res/layout/welcome_dont_upload.xml @@ -7,7 +7,7 @@ android:gravity="center_vertical" > - - + - - + Date: Thu, 9 Mar 2017 00:26:57 +0530 Subject: [PATCH 3/6] Fixes #405: Add some spacing on the About view --- app/src/main/res/layout/activity_about.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index c17f163f2..cd5abe497 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -32,6 +32,8 @@ android:layout_marginTop="16dp" style="?android:textAppearanceSmall" android:gravity="center" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" android:text="@string/about_license" /> @@ -42,6 +44,8 @@ android:layout_marginTop="8dp" style="?android:textAppearanceSmall" android:gravity="center" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" android:text="@string/about_improve" /> @@ -52,6 +56,8 @@ android:layout_marginTop="16dp" style="?android:textAppearanceSmall" android:gravity="center" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" android:text="@string/about_privacy_policy" /> From e60f94523770722e7fafb8e2db160c3594c76b43 Mon Sep 17 00:00:00 2001 From: maskara Date: Thu, 9 Mar 2017 01:18:41 +0530 Subject: [PATCH 4/6] Providing margin to the Linear layout instead of text views --- app/src/main/res/layout/activity_about.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index cd5abe497..715210023 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -2,6 +2,8 @@ @@ -32,8 +34,6 @@ android:layout_marginTop="16dp" style="?android:textAppearanceSmall" android:gravity="center" - android:layout_marginLeft="12dp" - android:layout_marginRight="12dp" android:text="@string/about_license" /> @@ -44,8 +44,6 @@ android:layout_marginTop="8dp" style="?android:textAppearanceSmall" android:gravity="center" - android:layout_marginLeft="12dp" - android:layout_marginRight="12dp" android:text="@string/about_improve" /> @@ -56,8 +54,6 @@ android:layout_marginTop="16dp" style="?android:textAppearanceSmall" android:gravity="center" - android:layout_marginLeft="12dp" - android:layout_marginRight="12dp" android:text="@string/about_privacy_policy" /> From ab3ef33c10bda0bde1ef25cf865985d77fb5e7e7 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Thu, 9 Mar 2017 00:11:01 +0000 Subject: [PATCH 5/6] Check ShareActionprovider is not null --- .../nrw/commons/media/MediaDetailPagerFragment.java | 12 ++++++++---- app/src/main/res/menu/fragment_image_detail.xml | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 260338680..ffe93edc6 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -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; diff --git a/app/src/main/res/menu/fragment_image_detail.xml b/app/src/main/res/menu/fragment_image_detail.xml index ff040dae5..2d0d2a299 100644 --- a/app/src/main/res/menu/fragment_image_detail.xml +++ b/app/src/main/res/menu/fragment_image_detail.xml @@ -6,7 +6,7 @@ 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" /> Date: Thu, 9 Mar 2017 00:25:21 +0000 Subject: [PATCH 6/6] Fix #413 - proguard rules --- app/proguard-rules.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index e00d3ce50..bbf3a3f0d 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -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 { *; } \ No newline at end of file