From 8b15957a4803ec5f0eb213f9c309d4841c6c6420 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Wed, 9 Dec 2020 22:20:40 +0300 Subject: [PATCH 1/3] Limited connection is enabled layout is added --- .../res/drawable/ic_baseline_cloud_off_72.xml | 10 +++++++ .../res/layout/fragment_contributions.xml | 27 +++++++++++++++++++ app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 41 insertions(+) create mode 100644 app/src/main/res/drawable/ic_baseline_cloud_off_72.xml 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 0000000000..a38e745da7 --- /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 e75f248914..5b74bb504c 100644 --- a/app/src/main/res/layout/fragment_contributions.xml +++ b/app/src/main/res/layout/fragment_contributions.xml @@ -18,6 +18,33 @@ 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 e8bbfcffb3..fd08f4139f 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. Thus, your uploads will be pended until you disabled this mode. Once you have disabled the limited connection mode, pending uploads will resume + 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. From 6cc898de7f7e5ba4b3f02bfe9cd6c0164117a0e5 Mon Sep 17 00:00:00 2001 From: Neslihan Date: Thu, 10 Dec 2020 00:15:49 +0300 Subject: [PATCH 2/3] Add a layout to indicate limited connection is active --- .../contributions/ContributionsFragment.java | 14 ++++++++++++-- app/src/main/res/layout/fragment_contributions.xml | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) 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 7a5465a532..c8a0430ad3 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.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 void updateLimitedConnectionToggle(Menu menu) { .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/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml index 5b74bb504c..e17ec954a7 100644 --- a/app/src/main/res/layout/fragment_contributions.xml +++ b/app/src/main/res/layout/fragment_contributions.xml @@ -19,6 +19,7 @@ android:layout_margin="@dimen/very_tiny_gap"/> Date: Thu, 10 Dec 2020 19:11:21 +0300 Subject: [PATCH 3/3] fix string --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd08f4139f..77d6486d4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -701,7 +701,7 @@ 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. Thus, your uploads will be pended until you disabled this mode. Once you have disabled the limited connection mode, pending uploads will resume + 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.