From 7d8e09f7084d1173fb2069f0a40699edb7495110 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Fri, 11 Dec 2020 19:11:53 +0300 Subject: [PATCH] Adds more obvious display for limited connection mode (#4094) * Limited connection is enabled layout is added * Add a layout to indicate limited connection is active * fix string --- .../contributions/ContributionsFragment.java | 14 ++++++++-- .../res/drawable/ic_baseline_cloud_off_72.xml | 10 +++++++ .../res/layout/fragment_contributions.xml | 28 +++++++++++++++++++ app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/ic_baseline_cloud_off_72.xml diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index 7a5465a53..c8a0430ad 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -22,6 +22,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.CheckBox; +import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; @@ -102,6 +103,7 @@ public class ContributionsFragment @BindView(R.id.card_view_nearby) public NearbyNotificationCardView nearbyNotificationCardView; @BindView(R.id.campaigns_view) CampaignView campaignView; + @BindView(R.id.limited_connection_enabled_layout) LinearLayout limitedConnectionEnabledLayout; @Inject ContributionsPresenter contributionsPresenter; @@ -236,14 +238,22 @@ public class ContributionsFragment .getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false); checkable.setChecked(isEnabled); - /*final SwitchCompat switchToggleLimitedConnectionMode = checkable.getActionView() - .findViewById(R.id.switch_toggle_limited_connection_mode);*/ + if (isEnabled) { + limitedConnectionEnabledLayout.setVisibility(View.VISIBLE); + } else { + limitedConnectionEnabledLayout.setVisibility(View.GONE); + } checkable.setIcon((isEnabled) ? R.drawable.ic_baseline_cloud_off_24:R.drawable.ic_baseline_cloud_queue_24); checkable.setOnMenuItemClickListener(new OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { ((MainActivity) getActivity()).toggleLimitedConnectionMode(); boolean isEnabled = store.getBoolean(CommonsApplication.IS_LIMITED_CONNECTION_MODE_ENABLED, false); + if (isEnabled) { + limitedConnectionEnabledLayout.setVisibility(View.VISIBLE); + } else { + limitedConnectionEnabledLayout.setVisibility(View.GONE); + } checkable.setIcon((isEnabled) ? R.drawable.ic_baseline_cloud_off_24:R.drawable.ic_baseline_cloud_queue_24); return false; } diff --git a/app/src/main/res/drawable/ic_baseline_cloud_off_72.xml b/app/src/main/res/drawable/ic_baseline_cloud_off_72.xml new file mode 100644 index 000000000..a38e745da --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_cloud_off_72.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml index e75f24891..e17ec954a 100644 --- a/app/src/main/res/layout/fragment_contributions.xml +++ b/app/src/main/res/layout/fragment_contributions.xml @@ -18,6 +18,34 @@ android:layout_marginTop="@dimen/miniscule_margin" android:layout_margin="@dimen/very_tiny_gap"/> + + + + + + #61000000 #EDEDED + #339966 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e8bbfcffb..77d6486d4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -701,6 +701,8 @@ Upload your first media by tapping on the add button. Quality images are diagrams or photographs that meet certain quality standards (which are mostly technical in nature) and are valuable for Wikimedia projects Resuming upload… Pausing upload… + You have enabled limited connection mode. All uploads are paused and will resume once you disable this mode. + Limited connection mode is on. Please write a short caption that says what your picture shows. In the description, say what makes the picture interesting or typical or rare, and explain the context, visible or not. Use exact terminology as much as you can. Please find and select all concepts that this image portrays. Be as specific as you can. If the image portrays multiple items, choose them all within reason. Do not choose generic tags if more specific tags are available.