mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-31 14:53:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 759ed34cf2 into fb1ef3212d

Browse source
This commit is contained in:
Priyank Shankar 2024-12-02 02:07:15 +05:30 • committed by GitHub
commit 0e155b94cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java
View file

@ -8,11 +8,21 @@ import android.util.DisplayMetrics;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Toast; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.view.ContextThemeWrapper; import androidx.appcompat.view.ContextThemeWrapper;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import butterknife.BindView;
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.R;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
@ -20,10 +30,10 @@ import fr.free.nrw.commons.databinding.FragmentAchievementsBinding;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.kvstore.BasicKvStore; import fr.free.nrw.commons.kvstore.BasicKvStore;
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient; 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.ConfigUtils;
import fr.free.nrw.commons.utils.DialogUtil; import fr.free.nrw.commons.utils.DialogUtil;
import fr.free.nrw.commons.utils.ViewUtil; import fr.free.nrw.commons.utils.ViewUtil;
import fr.free.nrw.commons.profile.ProfileActivity;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
@ -160,9 +170,9 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
ctx = getView().getContext(); ctx = getView().getContext();
} }
if(ctx != null) { if(ctx != null) {
Toast.makeText(ctx, Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.achievements_unavailable_beta, Snackbar.LENGTH_LONG);
R.string.achievements_unavailable_beta, snackbar.setAction("OK", view -> snackbar.dismiss());
Toast.LENGTH_LONG).show(); snackbar.show();
} }
} }
} }

16
app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java
View file

@ -18,7 +18,11 @@ import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.MergeAdapter; import androidx.recyclerview.widget.MergeAdapte;
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.R;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.databinding.FragmentLeaderboardBinding; import fr.free.nrw.commons.databinding.FragmentLeaderboardBinding;
@ -180,9 +184,9 @@ public class LeaderboardFragment extends CommonsDaggerSupportFragment {
ctx = getView().getContext(); ctx = getView().getContext();
} }
if(ctx != null) { if(ctx != null) {
Toast.makeText(ctx, Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.leaderboard_unavailable_beta, Snackbar.LENGTH_LONG);
R.string.leaderboard_unavailable_beta, snackbar.setAction("OK", view -> snackbar.dismiss());
Toast.LENGTH_LONG).show(); snackbar.show();
} }
} }
} }
@ -206,6 +210,10 @@ public class LeaderboardFragment extends CommonsDaggerSupportFragment {
private void scrollToUserRank() { private void scrollToUserRank() {
if(userRank==0){ if(userRank==0){
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()
Toast.makeText(getContext(),R.string.no_achievements_yet,Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(),R.string.no_achievements_yet,Toast.LENGTH_SHORT).show();
}else { }else {
if (binding == null) { if (binding == null) {