From 979e4076568489fa7e80bf16c2d5999513a8c8d6 Mon Sep 17 00:00:00 2001 From: hismaeel Date: Tue, 20 Feb 2018 18:14:00 -0500 Subject: [PATCH 01/10] issue #1130 (b) --- .../fr/free/nrw/commons/media/MediaDetailFragment.java | 8 +++++++- app/src/main/res/values/strings.xml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index ecf3cedb1..70bf281dc 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -14,6 +14,7 @@ import android.view.ViewTreeObserver; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; +import android.widget.Toast; import java.io.IOException; import java.text.SimpleDateFormat; @@ -273,7 +274,12 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment { } private void setOnClickListeners(final Media media) { - license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + if (licenseLink(media) != null) { + license.setOnClickListener(v -> openWebBrowser(licenseLink(media))); + } else { + Toast toast = Toast.makeText(getContext(), getString(R.string.null_url), Toast.LENGTH_SHORT); + toast.show(); + } if (media.getCoordinates() != null) { coordinates.setOnClickListener(v -> openMap(media.getCoordinates())); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ceba924e1..e7054b232 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -211,6 +211,7 @@ Send log file Send log file to developers via email Login to your account + Error! URL not found Location has not changed. Location not available. From 324e2a60d6b8b0fbddd683e5e8961446bfa1ed7a Mon Sep 17 00:00:00 2001 From: Ayushi Date: Sat, 24 Feb 2018 19:46:33 +0530 Subject: [PATCH 02/10] Add ItemDivider in NotificationActivity (#1186) * Use DividerItemDecoration to add ItemDivider in RecycleView --- .../fr/free/nrw/commons/notification/NotificationActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java index dc9d733f4..5229d7571 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -47,6 +48,8 @@ public class NotificationActivity extends NavigationBaseActivity { private void initListView() { recyclerView = findViewById(R.id.listView); recyclerView.setLayoutManager(new LinearLayoutManager(this)); + DividerItemDecoration itemDecor = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL); + recyclerView.addItemDecoration(itemDecor); addNotifications(); } From ccf68d12ff06de5124f985181752d414959db7be Mon Sep 17 00:00:00 2001 From: Ayushi Date: Sat, 24 Feb 2018 19:51:27 +0530 Subject: [PATCH 03/10] Remove View Bindings in NotificationActivity * ButterKnife already used --- .../fr/free/nrw/commons/notification/NotificationActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java index 5229d7571..4b8d4671d 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java @@ -46,7 +46,6 @@ public class NotificationActivity extends NavigationBaseActivity { } private void initListView() { - recyclerView = findViewById(R.id.listView); recyclerView.setLayoutManager(new LinearLayoutManager(this)); DividerItemDecoration itemDecor = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL); recyclerView.addItemDecoration(itemDecor); From 660fb4a8d6fd8d639a797e763724b84be6eee82b Mon Sep 17 00:00:00 2001 From: knightshade Date: Sun, 25 Feb 2018 20:39:35 +0530 Subject: [PATCH 04/10] Add ScrollView in About activity. Fixes #1177 --- app/src/main/res/layout/activity_about.xml | 232 ++++++++++----------- 1 file changed, 115 insertions(+), 117 deletions(-) diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 82aa38919..f03ff9c76 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -5,137 +5,135 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="wrap_content"> - + android:layout_height="wrap_content"> - - - - - - - - - - - - + android:layout_marginLeft="@dimen/activity_margin_horizontal" + android:layout_marginRight="@dimen/activity_margin_horizontal" + android:layout_marginStart="@dimen/activity_margin_horizontal" + android:layout_marginTop="@dimen/activity_margin_vertical" + android:gravity="center" + android:orientation="vertical"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@string/commons_logo" + android:src="@drawable/ic_launcher" /> - + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + app:menu="@menu/drawer" /> \ No newline at end of file From 81064dee10b6d6e981d76d24647808b9486147bb Mon Sep 17 00:00:00 2001 From: Ayushi Date: Mon, 26 Feb 2018 04:17:19 +0530 Subject: [PATCH 05/10] Show only the email clients in Feedback Feature (#1203) Instead of showing only the email clients, The Feedback feature was showing multiple unsupported clients (WhatsApp, Bluetooth etc) * Changes made to let the user choose from the available email related clients only. --- .../fr/free/nrw/commons/theme/NavigationBaseActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 99c9f253b..fa0e43957 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -5,6 +5,7 @@ import android.accounts.AccountManager; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; +import android.net.Uri; import android.support.annotation.NonNull; import android.support.design.widget.NavigationView; import android.support.v4.widget.DrawerLayout; @@ -119,8 +120,9 @@ public abstract class NavigationBaseActivity extends BaseActivity return true; case R.id.action_feedback: drawerLayout.closeDrawer(navigationView); - Intent feedbackIntent = new Intent(Intent.ACTION_SEND); + Intent feedbackIntent = new Intent(Intent.ACTION_SENDTO); feedbackIntent.setType("message/rfc822"); + feedbackIntent.setData(Uri.parse("mailto:")); feedbackIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{CommonsApplication.FEEDBACK_EMAIL}); feedbackIntent.putExtra(Intent.EXTRA_SUBJECT, From 541976cdfff00ab134c4b89ad195c7deb4cec46d Mon Sep 17 00:00:00 2001 From: knightshade Date: Mon, 26 Feb 2018 08:39:38 +0530 Subject: [PATCH 06/10] login_credentials textview added to landscape and x-large activity_login.xml --- .../main/res/layout-land/activity_login.xml | 42 +++++++++++++------ .../main/res/layout-xlarge/activity_login.xml | 36 +++++++++++----- app/src/main/res/layout/activity_login.xml | 30 ++++++------- 3 files changed, 71 insertions(+), 37 deletions(-) diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml index 9ecaf9855..a87084f66 100644 --- a/app/src/main/res/layout-land/activity_login.xml +++ b/app/src/main/res/layout-land/activity_login.xml @@ -13,12 +13,12 @@ @@ -40,11 +40,26 @@ android:textColor="@android:color/white" android:textSize="@dimen/heading_text_size" /> + + @@ -56,6 +71,7 @@ android:layout_marginLeft="@dimen/standard_gap" android:layout_marginRight="@dimen/standard_gap" android:layout_marginStart="@dimen/standard_gap" + android:gravity="center" android:paddingBottom="@dimen/small_gap" android:paddingTop="@dimen/small_gap" android:textColor="@color/secondaryDarkColor" @@ -149,8 +165,8 @@