From b8edbfc7364118023a48d0daa6218efa1c842e24 Mon Sep 17 00:00:00 2001 From: Priyank Shankar Date: Sat, 22 Apr 2023 12:27:01 +0530 Subject: [PATCH 1/2] Replaced Toasts With Snackbars in AchievementsFragment and LeaderboardFragment --- .../profile/achievements/AchievementsFragment.java | 10 +++++----- .../profile/leaderboard/LeaderboardFragment.java | 12 +++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java index 5bb9550469..f221ea4b9a 100644 --- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java @@ -14,7 +14,6 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.Nullable; import androidx.appcompat.view.ContextThemeWrapper; import androidx.appcompat.widget.AppCompatTextView; @@ -24,15 +23,16 @@ import butterknife.ButterKnife; import butterknife.OnClick; import com.dinuscxj.progressbar.CircleProgressBar; +import com.google.android.material.snackbar.Snackbar; import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient; +import fr.free.nrw.commons.profile.ProfileActivity; import fr.free.nrw.commons.utils.ConfigUtils; import fr.free.nrw.commons.utils.DialogUtil; import fr.free.nrw.commons.utils.ViewUtil; -import fr.free.nrw.commons.profile.ProfileActivity; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; @@ -220,9 +220,9 @@ public void setMenuVisibility(boolean visible) { ctx = getView().getContext(); } if(ctx != null) { - Toast.makeText(ctx, - R.string.achievements_unavailable_beta, - Toast.LENGTH_LONG).show(); + Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.achievements_unavailable_beta, Snackbar.LENGTH_LONG); + snackbar.setAction("OK", view -> snackbar.dismiss()); + snackbar.show(); } } } diff --git a/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java b/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java index 6705f408c6..71e8c34ed4 100644 --- a/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java @@ -25,6 +25,7 @@ import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; +import com.google.android.material.snackbar.Snackbar; import fr.free.nrw.commons.R; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; @@ -198,9 +199,9 @@ public void setMenuVisibility(boolean visible) { ctx = getView().getContext(); } if(ctx != null) { - Toast.makeText(ctx, - R.string.leaderboard_unavailable_beta, - Toast.LENGTH_LONG).show(); + Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.leaderboard_unavailable_beta, Snackbar.LENGTH_LONG); + snackbar.setAction("OK", view -> snackbar.dismiss()); + snackbar.show(); } } } @@ -224,8 +225,9 @@ private void refreshLeaderboard() { private void scrollToUserRank() { if(userRank==0){ - Toast.makeText(getContext(),R.string.no_achievements_yet,Toast.LENGTH_SHORT).show(); - }else { + Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.no_achievements_yet, Snackbar.LENGTH_LONG); + snackbar.setAction("OK", view -> snackbar.dismiss()); + snackbar.show(); }else { if (Objects.requireNonNull(leaderboardListRecyclerView.getAdapter()).getItemCount() > userRank + 1) { leaderboardListRecyclerView.smoothScrollToPosition(userRank + 1); From 5840539d8a9f8a8c731c718e1baccb0e94055904 Mon Sep 17 00:00:00 2001 From: Priyank Shankar Date: Tue, 3 Oct 2023 01:31:29 +0530 Subject: [PATCH 2/2] Empty-Commit To Rerun the Tests