mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +01:00
[GSoC] Fixes #3789 Updated UI of achievements activity to display level in first tab & Leaderboard in the second tab (#3794)
* Updated UI of achievements activity to display level in first tab and Leaderboard in the second tab * Removed hardcoded string
This commit is contained in:
Madhur Gupta
GitHub
parent
0882516d6e
commit
b381d40517
21 changed files with 810 additions and 624 deletions
|
|
@ -7,10 +7,9 @@ import androidx.test.espresso.intent.Intents
|
||||||
import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
|
import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
|
||||||
import androidx.test.espresso.intent.rule.IntentsTestRule
|
import androidx.test.espresso.intent.rule.IntentsTestRule
|
||||||
import androidx.test.espresso.matcher.ViewMatchers.withId
|
import androidx.test.espresso.matcher.ViewMatchers.withId
|
||||||
import androidx.test.filters.MediumTest
|
|
||||||
import androidx.test.runner.AndroidJUnit4
|
import androidx.test.runner.AndroidJUnit4
|
||||||
import fr.free.nrw.commons.achievements.AchievementsActivity
|
|
||||||
import fr.free.nrw.commons.auth.LoginActivity
|
import fr.free.nrw.commons.auth.LoginActivity
|
||||||
|
import fr.free.nrw.commons.profile.ProfileActivity
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
import org.junit.Rule
|
import org.junit.Rule
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
|
|
@ -32,6 +31,6 @@ class AchievementsActivityTest {
|
||||||
onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
|
onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
|
||||||
onView(withId(R.id.user_icon)).perform(click())
|
onView(withId(R.id.user_icon)).perform(click())
|
||||||
|
|
||||||
Intents.intended(hasComponent(AchievementsActivity::class.java.name))
|
Intents.intended(hasComponent(ProfileActivity::class.java.name))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -137,8 +137,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".achievements.AchievementsActivity"
|
android:name=".profile.ProfileActivity"
|
||||||
android:label="@string/Achievements" />
|
android:label="@string/Profile" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".bookmarks.BookmarksActivity"
|
android:name=".bookmarks.BookmarksActivity"
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ import javax.inject.Singleton;
|
||||||
|
|
||||||
import fr.free.nrw.commons.Media;
|
import fr.free.nrw.commons.Media;
|
||||||
import fr.free.nrw.commons.R;
|
import fr.free.nrw.commons.R;
|
||||||
import fr.free.nrw.commons.achievements.FeedbackResponse;
|
import fr.free.nrw.commons.profile.achievements.FeedbackResponse;
|
||||||
import fr.free.nrw.commons.auth.SessionManager;
|
import fr.free.nrw.commons.auth.SessionManager;
|
||||||
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
|
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
|
||||||
import fr.free.nrw.commons.utils.ViewUtilWrapper;
|
import fr.free.nrw.commons.utils.ViewUtilWrapper;
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ import dagger.Module;
|
||||||
import dagger.android.ContributesAndroidInjector;
|
import dagger.android.ContributesAndroidInjector;
|
||||||
import fr.free.nrw.commons.AboutActivity;
|
import fr.free.nrw.commons.AboutActivity;
|
||||||
import fr.free.nrw.commons.WelcomeActivity;
|
import fr.free.nrw.commons.WelcomeActivity;
|
||||||
import fr.free.nrw.commons.achievements.AchievementsActivity;
|
|
||||||
import fr.free.nrw.commons.auth.LoginActivity;
|
import fr.free.nrw.commons.auth.LoginActivity;
|
||||||
import fr.free.nrw.commons.auth.SignupActivity;
|
import fr.free.nrw.commons.auth.SignupActivity;
|
||||||
import fr.free.nrw.commons.bookmarks.BookmarksActivity;
|
import fr.free.nrw.commons.bookmarks.BookmarksActivity;
|
||||||
|
|
@ -15,6 +14,7 @@ import fr.free.nrw.commons.depictions.WikidataItemDetailsActivity;
|
||||||
import fr.free.nrw.commons.explore.SearchActivity;
|
import fr.free.nrw.commons.explore.SearchActivity;
|
||||||
import fr.free.nrw.commons.explore.categories.ExploreActivity;
|
import fr.free.nrw.commons.explore.categories.ExploreActivity;
|
||||||
import fr.free.nrw.commons.notification.NotificationActivity;
|
import fr.free.nrw.commons.notification.NotificationActivity;
|
||||||
|
import fr.free.nrw.commons.profile.ProfileActivity;
|
||||||
import fr.free.nrw.commons.review.ReviewActivity;
|
import fr.free.nrw.commons.review.ReviewActivity;
|
||||||
import fr.free.nrw.commons.settings.SettingsActivity;
|
import fr.free.nrw.commons.settings.SettingsActivity;
|
||||||
import fr.free.nrw.commons.upload.UploadActivity;
|
import fr.free.nrw.commons.upload.UploadActivity;
|
||||||
|
|
@ -68,7 +68,7 @@ public abstract class ActivityBuilderModule {
|
||||||
abstract ExploreActivity bindExploreActivity();
|
abstract ExploreActivity bindExploreActivity();
|
||||||
|
|
||||||
@ContributesAndroidInjector
|
@ContributesAndroidInjector
|
||||||
abstract AchievementsActivity bindAchievementsActivity();
|
abstract ProfileActivity bindAchievementsActivity();
|
||||||
|
|
||||||
@ContributesAndroidInjector
|
@ContributesAndroidInjector
|
||||||
abstract BookmarksActivity bindBookmarksActivity();
|
abstract BookmarksActivity bindBookmarksActivity();
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ import fr.free.nrw.commons.explore.recentsearches.RecentSearchesFragment;
|
||||||
import fr.free.nrw.commons.media.MediaDetailFragment;
|
import fr.free.nrw.commons.media.MediaDetailFragment;
|
||||||
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
|
import fr.free.nrw.commons.media.MediaDetailPagerFragment;
|
||||||
import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
|
import fr.free.nrw.commons.nearby.fragments.NearbyParentFragment;
|
||||||
|
import fr.free.nrw.commons.profile.achievements.AchievementsFragment;
|
||||||
|
import fr.free.nrw.commons.profile.leaderboard.LeaderboardFragment;
|
||||||
import fr.free.nrw.commons.review.ReviewImageFragment;
|
import fr.free.nrw.commons.review.ReviewImageFragment;
|
||||||
import fr.free.nrw.commons.settings.SettingsFragment;
|
import fr.free.nrw.commons.settings.SettingsFragment;
|
||||||
import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
|
import fr.free.nrw.commons.upload.categories.UploadCategoriesFragment;
|
||||||
|
|
@ -95,4 +97,10 @@ public abstract class FragmentBuilderModule {
|
||||||
|
|
||||||
@ContributesAndroidInjector
|
@ContributesAndroidInjector
|
||||||
abstract MediaLicenseFragment bindMediaLicenseFragment();
|
abstract MediaLicenseFragment bindMediaLicenseFragment();
|
||||||
|
|
||||||
|
@ContributesAndroidInjector
|
||||||
|
abstract AchievementsFragment bindAchievementsFragment();
|
||||||
|
|
||||||
|
@ContributesAndroidInjector
|
||||||
|
abstract LeaderboardFragment bindLeaderboardFragment();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@ package fr.free.nrw.commons.mwapi;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import fr.free.nrw.commons.achievements.FeaturedImages;
|
import fr.free.nrw.commons.profile.achievements.FeaturedImages;
|
||||||
import fr.free.nrw.commons.achievements.FeedbackResponse;
|
import fr.free.nrw.commons.profile.achievements.FeedbackResponse;
|
||||||
import fr.free.nrw.commons.campaigns.CampaignResponseDTO;
|
import fr.free.nrw.commons.campaigns.CampaignResponseDTO;
|
||||||
import fr.free.nrw.commons.depictions.subClass.models.SparqlResponse;
|
import fr.free.nrw.commons.depictions.subClass.models.SparqlResponse;
|
||||||
import fr.free.nrw.commons.explore.depictions.DepictsClient;
|
import fr.free.nrw.commons.explore.depictions.DepictsClient;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,79 @@
|
||||||
|
package fr.free.nrw.commons.profile;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.viewpager.widget.ViewPager;
|
||||||
|
import butterknife.BindView;
|
||||||
|
import butterknife.ButterKnife;
|
||||||
|
import com.google.android.material.tabs.TabLayout;
|
||||||
|
import fr.free.nrw.commons.R;
|
||||||
|
import fr.free.nrw.commons.profile.achievements.AchievementsFragment;
|
||||||
|
import fr.free.nrw.commons.profile.leaderboard.LeaderboardFragment;
|
||||||
|
import fr.free.nrw.commons.theme.NavigationBaseActivity;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
|
public class ProfileActivity extends NavigationBaseActivity {
|
||||||
|
|
||||||
|
private FragmentManager supportFragmentManager;
|
||||||
|
|
||||||
|
@BindView(R.id.viewPager)
|
||||||
|
ViewPager viewPager;
|
||||||
|
|
||||||
|
@BindView(R.id.tab_layout)
|
||||||
|
TabLayout tabLayout;
|
||||||
|
|
||||||
|
ViewPagerAdapter viewPagerAdapter;
|
||||||
|
private AchievementsFragment achievementsFragment;
|
||||||
|
private LeaderboardFragment leaderboardFragment;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_profile);
|
||||||
|
ButterKnife.bind(this);
|
||||||
|
initDrawer();
|
||||||
|
setTitle(R.string.Profile);
|
||||||
|
|
||||||
|
supportFragmentManager = getSupportFragmentManager();
|
||||||
|
viewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
|
||||||
|
viewPager.setAdapter(viewPagerAdapter);
|
||||||
|
tabLayout.setupWithViewPager(viewPager);
|
||||||
|
setTabs();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a way to change current activity to AchievementActivity
|
||||||
|
* @param context
|
||||||
|
*/
|
||||||
|
public static void startYourself(Context context) {
|
||||||
|
Intent intent = new Intent(context, ProfileActivity.class);
|
||||||
|
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
||||||
|
context.startActivity(intent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setTabs() {
|
||||||
|
List<Fragment> fragmentList = new ArrayList<>();
|
||||||
|
List<String> titleList = new ArrayList<>();
|
||||||
|
achievementsFragment = new AchievementsFragment();
|
||||||
|
fragmentList.add(achievementsFragment);
|
||||||
|
titleList.add(getResources().getString(R.string.achievements_tab_title).toUpperCase());
|
||||||
|
leaderboardFragment = new LeaderboardFragment();
|
||||||
|
fragmentList.add(leaderboardFragment);
|
||||||
|
titleList.add(getResources().getString(R.string.leaderboard_tab_title).toUpperCase());
|
||||||
|
viewPagerAdapter.setTabData(fragmentList, titleList);
|
||||||
|
viewPagerAdapter.notifyDataSetChanged();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
compositeDisposable.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
package fr.free.nrw.commons.profile;
|
||||||
|
|
||||||
|
import androidx.fragment.app.Fragment;
|
||||||
|
import androidx.fragment.app.FragmentManager;
|
||||||
|
import androidx.fragment.app.FragmentPagerAdapter;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class ViewPagerAdapter extends FragmentPagerAdapter {
|
||||||
|
private List<Fragment> fragmentList = new ArrayList<>();
|
||||||
|
private List<String> fragmentTitleList = new ArrayList<>();
|
||||||
|
|
||||||
|
public ViewPagerAdapter(FragmentManager manager) {
|
||||||
|
super(manager);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method returns the fragment of the viewpager at a particular position
|
||||||
|
* @param position
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Fragment getItem(int position) {
|
||||||
|
return fragmentList.get(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method returns the total number of fragments in the viewpager.
|
||||||
|
* @return size
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int getCount() {
|
||||||
|
return fragmentList.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method sets the fragment and title list in the viewpager
|
||||||
|
* @param fragmentList List of all fragments to be displayed in the viewpager
|
||||||
|
* @param fragmentTitleList List of all titles of the fragments
|
||||||
|
*/
|
||||||
|
public void setTabData(List<Fragment> fragmentList, List<String> fragmentTitleList) {
|
||||||
|
this.fragmentList = fragmentList;
|
||||||
|
this.fragmentTitleList = fragmentTitleList;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method returns the title of the page at a particular position
|
||||||
|
* @param position
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public CharSequence getPageTitle(int position) {
|
||||||
|
return fragmentTitleList.get(position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package fr.free.nrw.commons.achievements
|
package fr.free.nrw.commons.profile.achievements
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents Achievements class and stores all the parameters
|
* Represents Achievements class and stores all the parameters
|
||||||
|
|
@ -87,12 +87,14 @@ class Achievements {
|
||||||
*/
|
*/
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun from(response: FeedbackResponse): Achievements {
|
fun from(response: FeedbackResponse): Achievements {
|
||||||
return Achievements(response.uniqueUsedImages,
|
return Achievements(
|
||||||
response.articlesUsingImages,
|
response.uniqueUsedImages,
|
||||||
response.thanksReceived,
|
response.articlesUsingImages,
|
||||||
response.featuredImages.qualityImages
|
response.thanksReceived,
|
||||||
+ response.featuredImages.featuredPicturesOnWikimediaCommons, 0,
|
response.featuredImages.qualityImages
|
||||||
response.deletedUploads)
|
+ response.featuredImages.featuredPicturesOnWikimediaCommons, 0,
|
||||||
|
response.deletedUploads
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,61 +1,52 @@
|
||||||
package fr.free.nrw.commons.achievements;
|
package fr.free.nrw.commons.profile.achievements;
|
||||||
|
|
||||||
import android.accounts.Account;
|
import android.accounts.Account;
|
||||||
import android.annotation.SuppressLint;
|
import android.app.AlertDialog;
|
||||||
import android.content.Context;
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.graphics.Bitmap;
|
import android.graphics.Bitmap;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.DisplayMetrics;
|
import android.util.DisplayMetrics;
|
||||||
import android.view.ContextThemeWrapper;
|
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
import android.widget.ProgressBar;
|
import android.widget.ProgressBar;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import androidx.appcompat.view.ContextThemeWrapper;
|
||||||
import androidx.appcompat.app.AlertDialog;
|
|
||||||
import androidx.appcompat.widget.Toolbar;
|
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||||
import androidx.core.content.FileProvider;
|
import androidx.core.content.FileProvider;
|
||||||
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
|
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
|
||||||
|
|
||||||
import com.dinuscxj.progressbar.CircleProgressBar;
|
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
|
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import butterknife.OnClick;
|
import butterknife.OnClick;
|
||||||
|
import com.dinuscxj.progressbar.CircleProgressBar;
|
||||||
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;
|
||||||
|
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
|
||||||
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
|
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
|
||||||
import fr.free.nrw.commons.theme.NavigationBaseActivity;
|
|
||||||
import fr.free.nrw.commons.utils.ViewUtil;
|
import fr.free.nrw.commons.utils.ViewUtil;
|
||||||
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;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Objects;
|
||||||
|
import javax.inject.Inject;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import timber.log.Timber;
|
import timber.log.Timber;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* activity for sharing feedback on uploaded activity
|
* fragment for sharing feedback on uploaded activity
|
||||||
*/
|
*/
|
||||||
public class AchievementsActivity extends NavigationBaseActivity {
|
public class AchievementsFragment extends CommonsDaggerSupportFragment {
|
||||||
|
|
||||||
private static final double BADGE_IMAGE_WIDTH_RATIO = 0.4;
|
private static final double BADGE_IMAGE_WIDTH_RATIO = 0.4;
|
||||||
private static final double BADGE_IMAGE_HEIGHT_RATIO = 0.3;
|
private static final double BADGE_IMAGE_HEIGHT_RATIO = 0.3;
|
||||||
|
|
@ -64,55 +55,71 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
|
|
||||||
@BindView(R.id.achievement_badge_image)
|
@BindView(R.id.achievement_badge_image)
|
||||||
ImageView imageView;
|
ImageView imageView;
|
||||||
|
|
||||||
@BindView(R.id.achievement_badge_text)
|
@BindView(R.id.achievement_badge_text)
|
||||||
TextView badgeText;
|
TextView badgeText;
|
||||||
|
|
||||||
@BindView(R.id.achievement_level)
|
@BindView(R.id.achievement_level)
|
||||||
TextView levelNumber;
|
TextView levelNumber;
|
||||||
@BindView(R.id.toolbar)
|
|
||||||
Toolbar toolbar;
|
|
||||||
@BindView(R.id.thanks_received)
|
@BindView(R.id.thanks_received)
|
||||||
TextView thanksReceived;
|
TextView thanksReceived;
|
||||||
|
|
||||||
@BindView(R.id.images_uploaded_progressbar)
|
@BindView(R.id.images_uploaded_progressbar)
|
||||||
CircleProgressBar imagesUploadedProgressbar;
|
CircleProgressBar imagesUploadedProgressbar;
|
||||||
|
|
||||||
@BindView(R.id.images_used_by_wiki_progress_bar)
|
@BindView(R.id.images_used_by_wiki_progress_bar)
|
||||||
CircleProgressBar imagesUsedByWikiProgressBar;
|
CircleProgressBar imagesUsedByWikiProgressBar;
|
||||||
|
|
||||||
@BindView(R.id.image_reverts_progressbar)
|
@BindView(R.id.image_reverts_progressbar)
|
||||||
CircleProgressBar imageRevertsProgressbar;
|
CircleProgressBar imageRevertsProgressbar;
|
||||||
|
|
||||||
@BindView(R.id.image_featured)
|
@BindView(R.id.image_featured)
|
||||||
TextView imagesFeatured;
|
TextView imagesFeatured;
|
||||||
|
|
||||||
@BindView(R.id.images_revert_limit_text)
|
@BindView(R.id.images_revert_limit_text)
|
||||||
TextView imagesRevertLimitText;
|
TextView imagesRevertLimitText;
|
||||||
|
|
||||||
@BindView(R.id.progressBar)
|
@BindView(R.id.progressBar)
|
||||||
ProgressBar progressBar;
|
ProgressBar progressBar;
|
||||||
|
|
||||||
@BindView(R.id.layout_image_uploaded)
|
@BindView(R.id.layout_image_uploaded)
|
||||||
RelativeLayout layoutImageUploaded;
|
RelativeLayout layoutImageUploaded;
|
||||||
|
|
||||||
@BindView(R.id.layout_image_reverts)
|
@BindView(R.id.layout_image_reverts)
|
||||||
RelativeLayout layoutImageReverts;
|
RelativeLayout layoutImageReverts;
|
||||||
|
|
||||||
@BindView(R.id.layout_image_used_by_wiki)
|
@BindView(R.id.layout_image_used_by_wiki)
|
||||||
RelativeLayout layoutImageUsedByWiki;
|
RelativeLayout layoutImageUsedByWiki;
|
||||||
|
|
||||||
@BindView(R.id.layout_statistics)
|
@BindView(R.id.layout_statistics)
|
||||||
LinearLayout layoutStatistics;
|
LinearLayout layoutStatistics;
|
||||||
|
|
||||||
@BindView(R.id.images_used_by_wiki_text)
|
@BindView(R.id.images_used_by_wiki_text)
|
||||||
TextView imageByWikiText;
|
TextView imageByWikiText;
|
||||||
|
|
||||||
@BindView(R.id.images_reverted_text)
|
@BindView(R.id.images_reverted_text)
|
||||||
TextView imageRevertedText;
|
TextView imageRevertedText;
|
||||||
|
|
||||||
@BindView(R.id.images_upload_text_param)
|
@BindView(R.id.images_upload_text_param)
|
||||||
TextView imageUploadedText;
|
TextView imageUploadedText;
|
||||||
|
|
||||||
@BindView(R.id.wikidata_edits)
|
@BindView(R.id.wikidata_edits)
|
||||||
TextView wikidataEditsText;
|
TextView wikidataEditsText;
|
||||||
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
SessionManager sessionManager;
|
SessionManager sessionManager;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
OkHttpJsonApiClient okHttpJsonApiClient;
|
OkHttpJsonApiClient okHttpJsonApiClient;
|
||||||
MenuItem item;
|
|
||||||
|
|
||||||
private CompositeDisposable compositeDisposable = new CompositeDisposable();
|
private CompositeDisposable compositeDisposable = new CompositeDisposable();
|
||||||
|
|
||||||
// To keep track of the number of wiki edits made by a user
|
// To keep track of the number of wiki edits made by a user
|
||||||
private int numberOfEdits = 0;
|
private int numberOfEdits = 0;
|
||||||
|
|
||||||
|
MenuItem item;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method helps in the creation Achievement screen and
|
* This method helps in the creation Achievement screen and
|
||||||
* dynamically set the size of imageView
|
* dynamically set the size of imageView
|
||||||
|
|
@ -120,15 +127,13 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
* @param savedInstanceState Data bundle
|
* @param savedInstanceState Data bundle
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@SuppressLint("StringFormatInvalid")
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
View rootView = inflater.inflate(R.layout.fragment_achievements, container, false);
|
||||||
super.onCreate(savedInstanceState);
|
ButterKnife.bind(this, rootView);
|
||||||
setContentView(R.layout.activity_achievements);
|
|
||||||
ButterKnife.bind(this);
|
|
||||||
|
|
||||||
// DisplayMetrics used to fetch the size of the screen
|
// DisplayMetrics used to fetch the size of the screen
|
||||||
DisplayMetrics displayMetrics = new DisplayMetrics();
|
DisplayMetrics displayMetrics = new DisplayMetrics();
|
||||||
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
|
getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
|
||||||
int height = displayMetrics.heightPixels;
|
int height = displayMetrics.heightPixels;
|
||||||
int width = displayMetrics.widthPixels;
|
int width = displayMetrics.widthPixels;
|
||||||
|
|
||||||
|
|
@ -139,37 +144,23 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
params.width = (int) (width * BADGE_IMAGE_WIDTH_RATIO);
|
params.width = (int) (width * BADGE_IMAGE_WIDTH_RATIO);
|
||||||
imageView.requestLayout();
|
imageView.requestLayout();
|
||||||
|
|
||||||
setSupportActionBar(toolbar);
|
|
||||||
progressBar.setVisibility(View.VISIBLE);
|
progressBar.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
setHasOptionsMenu(true);
|
||||||
|
|
||||||
hideLayouts();
|
hideLayouts();
|
||||||
setWikidataEditCount();
|
setWikidataEditCount();
|
||||||
setAchievements();
|
setAchievements();
|
||||||
initDrawer();
|
return rootView;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
|
||||||
super.onDestroy();
|
|
||||||
compositeDisposable.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To invoke the AlertDialog on clicking info button
|
|
||||||
*/
|
|
||||||
@OnClick(R.id.achievement_info)
|
|
||||||
public void showInfoDialog(){
|
|
||||||
launchAlert(getResources().getString(R.string.Achievements)
|
|
||||||
,getResources().getString(R.string.achievements_info_message));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
// Inflate the menu; this adds items to the action bar if it is present.
|
// Inflate the menu; this adds items to the action bar if it is present.
|
||||||
getMenuInflater().inflate(R.menu.menu_about, menu);
|
super.onCreateOptionsMenu(menu, menuInflater);
|
||||||
item=menu.getItem(0);
|
menuInflater.inflate(R.menu.menu_about, menu);
|
||||||
|
item = menu.getItem(0);
|
||||||
item.setVisible(false);
|
item.setVisible(false);
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -180,7 +171,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
int id = item.getItemId();
|
int id = item.getItemId();
|
||||||
// take screenshot in form of bitmap and show it in Alert Dialog
|
// take screenshot in form of bitmap and show it in Alert Dialog
|
||||||
if (id == R.id.share_app_icon) {
|
if (id == R.id.share_app_icon) {
|
||||||
View rootView = getWindow().getDecorView().findViewById(android.R.id.content);
|
View rootView = getActivity().getWindow().getDecorView().findViewById(android.R.id.content);
|
||||||
Bitmap screenShot = Utils.getScreenShot(rootView);
|
Bitmap screenShot = Utils.getScreenShot(rootView);
|
||||||
showAlert(screenShot);
|
showAlert(screenShot);
|
||||||
}
|
}
|
||||||
|
|
@ -188,20 +179,39 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* It display the alertDialog with Image of screenshot
|
||||||
|
* @param screenshot
|
||||||
|
*/
|
||||||
|
public void showAlert(Bitmap screenshot){
|
||||||
|
AlertDialog.Builder alertadd = new AlertDialog.Builder(getActivity());
|
||||||
|
LayoutInflater factory = LayoutInflater.from(getActivity());
|
||||||
|
final View view = factory.inflate(R.layout.image_alert_layout, null);
|
||||||
|
ImageView screenShotImage = view.findViewById(R.id.alert_image);
|
||||||
|
screenShotImage.setImageBitmap(screenshot);
|
||||||
|
TextView shareMessage = view.findViewById(R.id.alert_text);
|
||||||
|
shareMessage.setText(R.string.achievements_share_message);
|
||||||
|
alertadd.setView(view);
|
||||||
|
alertadd.setPositiveButton(R.string.about_translate_proceed, (dialog, which) -> shareScreen(screenshot));
|
||||||
|
alertadd.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel());
|
||||||
|
alertadd.show();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To take bitmap and store it temporary storage and share it
|
* To take bitmap and store it temporary storage and share it
|
||||||
* @param bitmap
|
* @param bitmap
|
||||||
*/
|
*/
|
||||||
void shareScreen(Bitmap bitmap) {
|
void shareScreen(Bitmap bitmap) {
|
||||||
try {
|
try {
|
||||||
File file = new File(this.getExternalCacheDir(), "screen.png");
|
File file = new File(getActivity().getExternalCacheDir(), "screen.png");
|
||||||
FileOutputStream fOut = new FileOutputStream(file);
|
FileOutputStream fOut = new FileOutputStream(file);
|
||||||
bitmap.compress(Bitmap.CompressFormat.PNG, 100, fOut);
|
bitmap.compress(Bitmap.CompressFormat.PNG, 100, fOut);
|
||||||
fOut.flush();
|
fOut.flush();
|
||||||
fOut.close();
|
fOut.close();
|
||||||
file.setReadable(true, false);
|
file.setReadable(true, false);
|
||||||
Uri fileUri = FileProvider.getUriForFile(getApplicationContext(), getPackageName()+".provider", file);
|
Uri fileUri = FileProvider
|
||||||
grantUriPermission(getPackageName(), fileUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
.getUriForFile(getActivity().getApplicationContext(), getActivity().getPackageName()+".provider", file);
|
||||||
|
getActivity().grantUriPermission(getActivity().getPackageName(), fileUri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
|
||||||
final Intent intent = new Intent(android.content.Intent.ACTION_SEND);
|
final Intent intent = new Intent(android.content.Intent.ACTION_SEND);
|
||||||
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
intent.putExtra(Intent.EXTRA_STREAM, fileUri);
|
intent.putExtra(Intent.EXTRA_STREAM, fileUri);
|
||||||
|
|
@ -212,6 +222,15 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To invoke the AlertDialog on clicking info button
|
||||||
|
*/
|
||||||
|
@OnClick(R.id.achievement_info)
|
||||||
|
public void showInfoDialog(){
|
||||||
|
launchAlert(getResources().getString(R.string.Achievements)
|
||||||
|
,getResources().getString(R.string.achievements_info_message));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* To call the API to get results in form Single<JSONObject>
|
* To call the API to get results in form Single<JSONObject>
|
||||||
* which then calls parseJson when results are fetched
|
* which then calls parseJson when results are fetched
|
||||||
|
|
@ -234,7 +253,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
layoutImageReverts.setVisibility(View.INVISIBLE);
|
layoutImageReverts.setVisibility(View.INVISIBLE);
|
||||||
imageView.setVisibility(View.INVISIBLE);
|
imageView.setVisibility(View.INVISIBLE);
|
||||||
// If the number of edits made by the user are more than 150,000
|
// If the number of edits made by the user are more than 150,000
|
||||||
// in some cases such high number of wiki edit counts cause the
|
// in some cases such high number of wiki edit counts cause the
|
||||||
// achievements calculator to fail in some cases, for more details
|
// achievements calculator to fail in some cases, for more details
|
||||||
// refer Issue: #3295
|
// refer Issue: #3295
|
||||||
if (numberOfEdits <= 150000) {
|
if (numberOfEdits <= 150000) {
|
||||||
|
|
@ -264,7 +283,6 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
* To call the API to fetch the count of wiki data edits
|
* To call the API to fetch the count of wiki data edits
|
||||||
* in the form of JavaRx Single object<JSONobject>
|
* in the form of JavaRx Single object<JSONobject>
|
||||||
*/
|
*/
|
||||||
@SuppressLint("CheckResult")
|
|
||||||
private void setWikidataEditCount() {
|
private void setWikidataEditCount() {
|
||||||
String userName = sessionManager.getUserName();
|
String userName = sessionManager.getUserName();
|
||||||
if (StringUtils.isBlank(userName)) {
|
if (StringUtils.isBlank(userName)) {
|
||||||
|
|
@ -285,18 +303,18 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
/**
|
/**
|
||||||
* Shows a snack bar which has an action button which on click dismisses the snackbar and invokes the
|
* Shows a snack bar which has an action button which on click dismisses the snackbar and invokes the
|
||||||
* listener passed
|
* listener passed
|
||||||
* @param tooManyAchievements if this value is true it means that the number of achievements of the
|
* @param tooManyAchievements if this value is true it means that the number of achievements of the
|
||||||
* user are so high that it wrecks havoc with the Achievements calculator due to which request may time
|
* user are so high that it wrecks havoc with the Achievements calculator due to which request may time
|
||||||
* out. Well this is the Ultimate Achievement
|
* out. Well this is the Ultimate Achievement
|
||||||
*/
|
*/
|
||||||
private void showSnackBarWithRetry(boolean tooManyAchievements) {
|
private void showSnackBarWithRetry(boolean tooManyAchievements) {
|
||||||
if (tooManyAchievements) {
|
if (tooManyAchievements) {
|
||||||
progressBar.setVisibility(View.GONE);
|
progressBar.setVisibility(View.GONE);
|
||||||
ViewUtil.showDismissibleSnackBar(findViewById(android.R.id.content),
|
ViewUtil.showDismissibleSnackBar(getActivity().findViewById(android.R.id.content),
|
||||||
R.string.achievements_fetch_failed_ultimate_achievement, R.string.retry, view -> setAchievements());
|
R.string.achievements_fetch_failed_ultimate_achievement, R.string.retry, view -> setAchievements());
|
||||||
} else {
|
} else {
|
||||||
progressBar.setVisibility(View.GONE);
|
progressBar.setVisibility(View.GONE);
|
||||||
ViewUtil.showDismissibleSnackBar(findViewById(android.R.id.content),
|
ViewUtil.showDismissibleSnackBar(getActivity().findViewById(android.R.id.content),
|
||||||
R.string.achievements_fetch_failed, R.string.retry, view -> setAchievements());
|
R.string.achievements_fetch_failed, R.string.retry, view -> setAchievements());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -305,7 +323,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
* Shows a generic error toast when error occurs while loading achievements or uploads
|
* Shows a generic error toast when error occurs while loading achievements or uploads
|
||||||
*/
|
*/
|
||||||
private void onError() {
|
private void onError() {
|
||||||
ViewUtil.showLongToast(this, getResources().getString(R.string.error_occurred));
|
ViewUtil.showLongToast(getActivity(), getResources().getString(R.string.error_occurred));
|
||||||
progressBar.setVisibility(View.GONE);
|
progressBar.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -355,7 +373,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setZeroAchievements() {
|
private void setZeroAchievements() {
|
||||||
AlertDialog.Builder builder=new AlertDialog.Builder(this)
|
AlertDialog.Builder builder=new AlertDialog.Builder(getActivity())
|
||||||
.setMessage(getString(R.string.no_achievements_yet))
|
.setMessage(getString(R.string.no_achievements_yet))
|
||||||
.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
|
.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
|
||||||
});
|
});
|
||||||
|
|
@ -399,20 +417,10 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
levelUpInfoString += " " + levelInfo.getLevelNumber();
|
levelUpInfoString += " " + levelInfo.getLevelNumber();
|
||||||
levelNumber.setText(levelUpInfoString);
|
levelNumber.setText(levelUpInfoString);
|
||||||
imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge,
|
imageView.setImageDrawable(VectorDrawableCompat.create(getResources(), R.drawable.badge,
|
||||||
new ContextThemeWrapper(this, levelInfo.getLevelStyle()).getTheme()));
|
new ContextThemeWrapper(getActivity(), levelInfo.getLevelStyle()).getTheme()));
|
||||||
badgeText.setText(Integer.toString(levelInfo.getLevelNumber()));
|
badgeText.setText(Integer.toString(levelInfo.getLevelNumber()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a way to change current activity to AchievementActivity
|
|
||||||
* @param context
|
|
||||||
*/
|
|
||||||
public static void startYourself(Context context) {
|
|
||||||
Intent intent = new Intent(context, AchievementsActivity.class);
|
|
||||||
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
|
|
||||||
context.startActivity(intent);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* to hide progressbar
|
* to hide progressbar
|
||||||
*/
|
*/
|
||||||
|
|
@ -447,24 +455,6 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
levelNumber.setVisibility(View.INVISIBLE);
|
levelNumber.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* It display the alertDialog with Image of screenshot
|
|
||||||
* @param screenshot
|
|
||||||
*/
|
|
||||||
public void showAlert(Bitmap screenshot){
|
|
||||||
AlertDialog.Builder alertadd = new AlertDialog.Builder(AchievementsActivity.this);
|
|
||||||
LayoutInflater factory = LayoutInflater.from(AchievementsActivity.this);
|
|
||||||
final View view = factory.inflate(R.layout.image_alert_layout, null);
|
|
||||||
ImageView screenShotImage = view.findViewById(R.id.alert_image);
|
|
||||||
screenShotImage.setImageBitmap(screenshot);
|
|
||||||
TextView shareMessage = view.findViewById(R.id.alert_text);
|
|
||||||
shareMessage.setText(R.string.achievements_share_message);
|
|
||||||
alertadd.setView(view);
|
|
||||||
alertadd.setPositiveButton(R.string.about_translate_proceed, (dialog, which) -> shareScreen(screenshot));
|
|
||||||
alertadd.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel());
|
|
||||||
alertadd.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
@OnClick(R.id.images_upload_info)
|
@OnClick(R.id.images_upload_info)
|
||||||
public void showUploadInfo(){
|
public void showUploadInfo(){
|
||||||
launchAlert(getResources().getString(R.string.images_uploaded)
|
launchAlert(getResources().getString(R.string.images_uploaded)
|
||||||
|
|
@ -507,7 +497,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
* @param message
|
* @param message
|
||||||
*/
|
*/
|
||||||
private void launchAlert(String title, String message){
|
private void launchAlert(String title, String message){
|
||||||
new AlertDialog.Builder(AchievementsActivity.this)
|
new AlertDialog.Builder(getActivity())
|
||||||
.setTitle(title)
|
.setTitle(title)
|
||||||
.setMessage(message)
|
.setMessage(message)
|
||||||
.setCancelable(true)
|
.setCancelable(true)
|
||||||
|
|
@ -524,11 +514,11 @@ public class AchievementsActivity extends NavigationBaseActivity {
|
||||||
Account currentAccount = sessionManager.getCurrentAccount();
|
Account currentAccount = sessionManager.getCurrentAccount();
|
||||||
if (currentAccount == null) {
|
if (currentAccount == null) {
|
||||||
Timber.d("Current account is null");
|
Timber.d("Current account is null");
|
||||||
ViewUtil.showLongToast(this, getResources().getString(R.string.user_not_logged_in));
|
ViewUtil.showLongToast(getActivity(), getResources().getString(R.string.user_not_logged_in));
|
||||||
sessionManager.forceLogin(this);
|
sessionManager.forceLogin(getActivity());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package fr.free.nrw.commons.achievements
|
package fr.free.nrw.commons.profile.achievements
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName
|
import com.google.gson.annotations.SerializedName
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents Featured Images on WikiMedia Commons platform
|
* Represents Featured Images on WikiMedia Commons platform
|
||||||
* Used by Achievements and FeedbackResponse (objects) of the user
|
* Used by Achievements and FeedbackResponse (objects) of the user
|
||||||
*/
|
*/
|
||||||
class FeaturedImages(
|
class FeaturedImages(
|
||||||
@field:SerializedName("Quality_images") val qualityImages: Int,
|
@field:SerializedName("Quality_images") val qualityImages: Int,
|
||||||
@field:SerializedName("Featured_pictures_on_Wikimedia_Commons") val featuredPicturesOnWikimediaCommons: Int
|
@field:SerializedName("Featured_pictures_on_Wikimedia_Commons") val featuredPicturesOnWikimediaCommons: Int
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package fr.free.nrw.commons.achievements
|
package fr.free.nrw.commons.profile.achievements
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represent the Feedback Response of the user
|
* Represent the Feedback Response of the user
|
||||||
*/
|
*/
|
||||||
data class FeedbackResponse(val uniqueUsedImages: Int,
|
data class FeedbackResponse(val uniqueUsedImages: Int,
|
||||||
val articlesUsingImages: Int,
|
val articlesUsingImages: Int,
|
||||||
val deletedUploads: Int,
|
val deletedUploads: Int,
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package fr.free.nrw.commons.achievements
|
package fr.free.nrw.commons.profile.achievements
|
||||||
|
|
||||||
import fr.free.nrw.commons.R
|
import fr.free.nrw.commons.R
|
||||||
|
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
package fr.free.nrw.commons.profile.leaderboard;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import fr.free.nrw.commons.R;
|
||||||
|
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
|
||||||
|
|
||||||
|
public class LeaderboardFragment extends CommonsDaggerSupportFragment {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
|
View rootView = inflater.inflate(R.layout.fragment_leaderboard, container, false);
|
||||||
|
return rootView;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -26,6 +26,7 @@ import androidx.drawerlayout.widget.DrawerLayout;
|
||||||
|
|
||||||
import com.google.android.material.navigation.NavigationView;
|
import com.google.android.material.navigation.NavigationView;
|
||||||
|
|
||||||
|
import fr.free.nrw.commons.profile.ProfileActivity;
|
||||||
import org.wikipedia.dataclient.Service;
|
import org.wikipedia.dataclient.Service;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
@ -37,7 +38,6 @@ import fr.free.nrw.commons.BuildConfig;
|
||||||
import fr.free.nrw.commons.CommonsApplication;
|
import fr.free.nrw.commons.CommonsApplication;
|
||||||
import fr.free.nrw.commons.R;
|
import fr.free.nrw.commons.R;
|
||||||
import fr.free.nrw.commons.WelcomeActivity;
|
import fr.free.nrw.commons.WelcomeActivity;
|
||||||
import fr.free.nrw.commons.achievements.AchievementsActivity;
|
|
||||||
import fr.free.nrw.commons.auth.LoginActivity;
|
import fr.free.nrw.commons.auth.LoginActivity;
|
||||||
import fr.free.nrw.commons.auth.LogoutClient;
|
import fr.free.nrw.commons.auth.LogoutClient;
|
||||||
import fr.free.nrw.commons.bookmarks.BookmarksActivity;
|
import fr.free.nrw.commons.bookmarks.BookmarksActivity;
|
||||||
|
|
@ -140,7 +140,7 @@ public abstract class NavigationBaseActivity extends BaseActivity
|
||||||
LinearLayout userIcon = navHeaderView.findViewById(R.id.user_details);
|
LinearLayout userIcon = navHeaderView.findViewById(R.id.user_details);
|
||||||
userIcon.setOnClickListener(v -> {
|
userIcon.setOnClickListener(v -> {
|
||||||
drawerLayout.closeDrawer(navigationView);
|
drawerLayout.closeDrawer(navigationView);
|
||||||
AchievementsActivity.startYourself(NavigationBaseActivity.this);
|
ProfileActivity.startYourself(NavigationBaseActivity.this);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,495 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:id="@+id/drawer_layout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent">
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/toolbarLayout"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="?attr/actionBarSize">
|
|
||||||
<include layout="@layout/toolbar"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="?attr/actionBarSize"
|
|
||||||
android:layout_below="@id/toolbarLayout">
|
|
||||||
|
|
||||||
<ScrollView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@+id/toolbar"
|
|
||||||
android:background="?attr/achievementBackground"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
style="?android:textAppearanceLarge"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:text="@string/level"
|
|
||||||
android:id="@+id/achievement_level"
|
|
||||||
android:textAllCaps="true"/>
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/achievement_info"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_vertical"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/black"
|
|
||||||
android:layout_marginVertical="@dimen/activity_margin_vertical" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
android:id="@+id/badge_layout"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/achievement_info"
|
|
||||||
android:layout_centerHorizontal="true">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/achievement_badge_image"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
|
||||||
app:layout_constraintRight_toRightOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:srcCompat="@drawable/badge" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/achievement_badge_text"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textAlignment="center"
|
|
||||||
android:textColor="@color/achievement_badge_text"
|
|
||||||
android:textSize="75sp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@+id/achievement_badge_image"
|
|
||||||
app:layout_constraintEnd_toEndOf="@+id/achievement_badge_image"
|
|
||||||
app:layout_constraintStart_toStartOf="@+id/achievement_badge_image"
|
|
||||||
app:layout_constraintTop_toTopOf="@+id/achievement_badge_image"
|
|
||||||
app:layout_constraintVertical_bias="0.58" />
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/layout_image_uploaded"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@+id/badge_layout"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:id="@+id/images_upload_text_param"
|
|
||||||
android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
|
|
||||||
android:text="@string/images_uploaded" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/quarter_standard_height"
|
|
||||||
android:layout_height="@dimen/quarter_standard_height"
|
|
||||||
android:id="@+id/images_upload_info"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_toRightOf="@+id/images_upload_text_param"
|
|
||||||
android:layout_toEndOf="@+id/images_upload_text_param"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/primaryDarkColor"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"/>
|
|
||||||
|
|
||||||
<com.dinuscxj.progressbar.CircleProgressBar
|
|
||||||
android:layout_width="@dimen/dimen_40"
|
|
||||||
android:layout_height="@dimen/dimen_40"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginEnd="@dimen/large_gap"
|
|
||||||
android:layout_marginRight="@dimen/large_gap"
|
|
||||||
android:id="@+id/images_uploaded_progressbar"
|
|
||||||
android:progress="50"
|
|
||||||
app:progress_text_size="@dimen/progressbar_text"
|
|
||||||
app:progress_end_color="#8C8B98"
|
|
||||||
app:progress_start_color="#3A3381"
|
|
||||||
app:progress_stroke_width="@dimen/progressbar_stroke"
|
|
||||||
app:progress_text_format_pattern="573/110"
|
|
||||||
app:progress_text_color="@color/secondaryColor"
|
|
||||||
app:style="solid_line" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/layout_image_reverts"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/tiny_margin"
|
|
||||||
android:layout_below="@+id/layout_image_uploaded"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:id="@+id/images_reverted_text"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:text="@string/image_reverts" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/medium_width"
|
|
||||||
android:layout_height="@dimen/medium_height"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:id="@+id/images_reverted_info"
|
|
||||||
android:layout_toRightOf="@+id/images_reverted_text"
|
|
||||||
android:layout_toEndOf="@+id/images_reverted_text"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/primaryDarkColor"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/achievements_revert_limit_message"
|
|
||||||
android:textSize="@dimen/small_text"
|
|
||||||
android:id="@+id/images_revert_limit_text"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_below="@+id/images_reverted_text"/>
|
|
||||||
|
|
||||||
<com.dinuscxj.progressbar.CircleProgressBar
|
|
||||||
android:layout_width="@dimen/dimen_40"
|
|
||||||
android:layout_height="@dimen/dimen_40"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginRight="@dimen/large_gap"
|
|
||||||
android:layout_marginEnd="@dimen/large_gap"
|
|
||||||
android:progress="50"
|
|
||||||
android:id="@+id/image_reverts_progressbar"
|
|
||||||
app:progress_end_color="#8C8B98"
|
|
||||||
app:progress_start_color="#3A3381"
|
|
||||||
app:progress_text_size="@dimen/progressbar_text"
|
|
||||||
app:progress_stroke_width="@dimen/progressbar_stroke"
|
|
||||||
app:progress_text_format_pattern="92%%"
|
|
||||||
app:progress_text_color="@color/secondaryColor"
|
|
||||||
app:style="solid_line" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/layout_image_used_by_wiki"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/tiny_margin"
|
|
||||||
android:layout_below="@+id/layout_image_reverts"
|
|
||||||
android:layout_marginBottom="@dimen/activity_margin_vertical"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/images_used_by_wiki_text"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
|
|
||||||
android:text="@string/images_used_by_wiki" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/medium_width"
|
|
||||||
android:layout_height="@dimen/medium_height"
|
|
||||||
android:id="@+id/images_used_by_wiki_info"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_toRightOf="@+id/images_used_by_wiki_text"
|
|
||||||
android:layout_toEndOf="@+id/images_used_by_wiki_text"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/primaryDarkColor"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"/>
|
|
||||||
|
|
||||||
<com.dinuscxj.progressbar.CircleProgressBar
|
|
||||||
android:layout_width="@dimen/dimen_40"
|
|
||||||
android:layout_height="@dimen/dimen_40"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginRight="@dimen/large_gap"
|
|
||||||
android:layout_marginEnd="@dimen/large_gap"
|
|
||||||
android:progress="50"
|
|
||||||
app:progress_text_size="@dimen/progressbar_text"
|
|
||||||
android:id="@+id/images_used_by_wiki_progress_bar"
|
|
||||||
app:progress_end_color="#8C8B98"
|
|
||||||
app:progress_start_color="#3A3381"
|
|
||||||
app:progress_stroke_width="2.5dp"
|
|
||||||
app:progress_text_color="@color/secondaryColor"
|
|
||||||
app:progress_text_format_pattern="12/24"
|
|
||||||
app:style="solid_line" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:id="@+id/progressBar"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/layout_statistics"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/statistics"
|
|
||||||
style="?android:textAppearanceLarge"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_vertical"
|
|
||||||
android:textAllCaps="true"/>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_toStartOf="@+id/wikidata_edits"
|
|
||||||
android:layout_toLeftOf="@+id/wikidata_edits"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:gravity="center_vertical">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/overflow_icon_dimen"
|
|
||||||
android:layout_height="@dimen/overflow_icon_dimen"
|
|
||||||
android:id="@+id/wikidata_edits_icon"
|
|
||||||
app:srcCompat="@drawable/ic_custom_map_marker" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:text="@string/statistics_wikidata_edits" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/medium_width"
|
|
||||||
android:layout_height="@dimen/medium_height"
|
|
||||||
android:id="@+id/images_nearby_info"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_gravity="top"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/primaryDarkColor" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/half_standard_height"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
tools:text="2"
|
|
||||||
android:id="@+id/wikidata_edits"
|
|
||||||
android:layout_marginRight="@dimen/half_standard_height" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_toStartOf="@+id/image_featured"
|
|
||||||
android:layout_toLeftOf="@+id/image_featured"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:gravity="center_vertical">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/overflow_icon_dimen"
|
|
||||||
android:layout_height="@dimen/overflow_icon_dimen"
|
|
||||||
android:id="@+id/featured_image_icon"
|
|
||||||
app:srcCompat="@drawable/featured"
|
|
||||||
android:scaleType="centerCrop" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:text="@string/statistics_featured" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/medium_width"
|
|
||||||
android:layout_height="@dimen/medium_height"
|
|
||||||
android:id="@+id/images_featured_info"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_gravity="top"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/primaryDarkColor" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
tools:text="2"
|
|
||||||
android:id="@+id/image_featured"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/half_standard_height"
|
|
||||||
android:layout_marginRight="@dimen/half_standard_height" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
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_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_toStartOf="@+id/thanks_received"
|
|
||||||
android:layout_toLeftOf="@+id/thanks_received"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:gravity="center_vertical">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/overflow_icon_dimen"
|
|
||||||
android:layout_height="@dimen/overflow_icon_dimen"
|
|
||||||
android:id="@+id/thanks_image_icon"
|
|
||||||
app:srcCompat="@drawable/ic_thanks"
|
|
||||||
android:scaleType="centerCrop" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:text="@string/statistics_thanks" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="@dimen/medium_width"
|
|
||||||
android:layout_height="@dimen/medium_height"
|
|
||||||
android:id="@+id/thanks_received_info"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_gravity="top"
|
|
||||||
app:srcCompat="@drawable/ic_info_outline_24dp"
|
|
||||||
android:tint="@color/primaryDarkColor" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
style="?android:textAppearanceMedium"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
|
||||||
android:layout_centerVertical="true"
|
|
||||||
tools:text="2"
|
|
||||||
android:id="@+id/thanks_received"
|
|
||||||
android:layout_marginEnd="@dimen/half_standard_height"
|
|
||||||
android:layout_marginRight="@dimen/half_standard_height" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
</ScrollView>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<include layout="@layout/drawer_view" />
|
|
||||||
|
|
||||||
</androidx.drawerlayout.widget.DrawerLayout>
|
|
||||||
41
app/src/main/res/layout/activity_profile.xml
Normal file
41
app/src/main/res/layout/activity_profile.xml
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:id="@+id/drawer_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
android:id="@+id/toolbar_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:background="@color/primaryDarkColor">
|
||||||
|
|
||||||
|
<include layout="@layout/toolbar"/>
|
||||||
|
|
||||||
|
<com.google.android.material.tabs.TabLayout
|
||||||
|
android:id="@+id/tab_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/toolbar"
|
||||||
|
android:background="?attr/tabBackground"
|
||||||
|
app:tabIndicatorColor="?attr/tabIndicatorColor"
|
||||||
|
app:tabMode="fixed"
|
||||||
|
app:tabSelectedTextColor="?attr/tabSelectedTextColor"
|
||||||
|
app:tabTextColor="?attr/tabTextColor" />
|
||||||
|
</com.google.android.material.appbar.AppBarLayout>
|
||||||
|
|
||||||
|
<androidx.viewpager.widget.ViewPager
|
||||||
|
android:id="@+id/viewPager"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_below="@id/toolbar_layout" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<include layout="@layout/drawer_view" />
|
||||||
|
|
||||||
|
</androidx.drawerlayout.widget.DrawerLayout>
|
||||||
482
app/src/main/res/layout/fragment_achievements.xml
Normal file
482
app/src/main/res/layout/fragment_achievements.xml
Normal file
|
|
@ -0,0 +1,482 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/drawer_layout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<ScrollView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/toolbar"
|
||||||
|
android:background="?attr/achievementBackground"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="?android:textAppearanceLarge"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/level"
|
||||||
|
android:id="@+id/achievement_level"
|
||||||
|
android:textAllCaps="true"/>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/achievement_info"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_vertical"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/black"
|
||||||
|
android:layout_marginVertical="@dimen/activity_margin_vertical" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/badge_layout"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/achievement_info"
|
||||||
|
android:layout_centerHorizontal="true">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/achievement_badge_image"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
|
app:layout_constraintRight_toRightOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:srcCompat="@drawable/badge" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/achievement_badge_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:textColor="@color/achievement_badge_text"
|
||||||
|
android:textSize="75sp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/achievement_badge_image"
|
||||||
|
app:layout_constraintEnd_toEndOf="@+id/achievement_badge_image"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/achievement_badge_image"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/achievement_badge_image"
|
||||||
|
app:layout_constraintVertical_bias="0.58" />
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/layout_image_uploaded"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/badge_layout"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:id="@+id/images_upload_text_param"
|
||||||
|
android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
|
||||||
|
android:text="@string/images_uploaded" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/quarter_standard_height"
|
||||||
|
android:layout_height="@dimen/quarter_standard_height"
|
||||||
|
android:id="@+id/images_upload_info"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_toRightOf="@+id/images_upload_text_param"
|
||||||
|
android:layout_toEndOf="@+id/images_upload_text_param"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/primaryDarkColor"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"/>
|
||||||
|
|
||||||
|
<com.dinuscxj.progressbar.CircleProgressBar
|
||||||
|
android:layout_width="@dimen/dimen_40"
|
||||||
|
android:layout_height="@dimen/dimen_40"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginEnd="@dimen/large_gap"
|
||||||
|
android:layout_marginRight="@dimen/large_gap"
|
||||||
|
android:id="@+id/images_uploaded_progressbar"
|
||||||
|
android:progress="50"
|
||||||
|
app:progress_text_size="@dimen/progressbar_text"
|
||||||
|
app:progress_end_color="#8C8B98"
|
||||||
|
app:progress_start_color="#3A3381"
|
||||||
|
app:progress_stroke_width="@dimen/progressbar_stroke"
|
||||||
|
app:progress_text_format_pattern="573/110"
|
||||||
|
app:progress_text_color="@color/secondaryColor"
|
||||||
|
app:style="solid_line" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/layout_image_reverts"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/tiny_margin"
|
||||||
|
android:layout_below="@+id/layout_image_uploaded"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:id="@+id/images_reverted_text"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/image_reverts" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/medium_width"
|
||||||
|
android:layout_height="@dimen/medium_height"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:id="@+id/images_reverted_info"
|
||||||
|
android:layout_toRightOf="@+id/images_reverted_text"
|
||||||
|
android:layout_toEndOf="@+id/images_reverted_text"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/primaryDarkColor"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/achievements_revert_limit_message"
|
||||||
|
android:textSize="@dimen/small_text"
|
||||||
|
android:id="@+id/images_revert_limit_text"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_below="@+id/images_reverted_text"/>
|
||||||
|
|
||||||
|
<com.dinuscxj.progressbar.CircleProgressBar
|
||||||
|
android:layout_width="@dimen/dimen_40"
|
||||||
|
android:layout_height="@dimen/dimen_40"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginRight="@dimen/large_gap"
|
||||||
|
android:layout_marginEnd="@dimen/large_gap"
|
||||||
|
android:progress="50"
|
||||||
|
android:id="@+id/image_reverts_progressbar"
|
||||||
|
app:progress_end_color="#8C8B98"
|
||||||
|
app:progress_start_color="#3A3381"
|
||||||
|
app:progress_text_size="@dimen/progressbar_text"
|
||||||
|
app:progress_stroke_width="@dimen/progressbar_stroke"
|
||||||
|
app:progress_text_format_pattern="92%%"
|
||||||
|
app:progress_text_color="@color/secondaryColor"
|
||||||
|
app:style="solid_line" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/layout_image_used_by_wiki"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="@dimen/tiny_margin"
|
||||||
|
android:layout_below="@+id/layout_image_reverts"
|
||||||
|
android:layout_marginBottom="@dimen/activity_margin_vertical"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/images_used_by_wiki_text"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
|
||||||
|
android:text="@string/images_used_by_wiki" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/medium_width"
|
||||||
|
android:layout_height="@dimen/medium_height"
|
||||||
|
android:id="@+id/images_used_by_wiki_info"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_toRightOf="@+id/images_used_by_wiki_text"
|
||||||
|
android:layout_toEndOf="@+id/images_used_by_wiki_text"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/primaryDarkColor"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"/>
|
||||||
|
|
||||||
|
<com.dinuscxj.progressbar.CircleProgressBar
|
||||||
|
android:layout_width="@dimen/dimen_40"
|
||||||
|
android:layout_height="@dimen/dimen_40"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginRight="@dimen/large_gap"
|
||||||
|
android:layout_marginEnd="@dimen/large_gap"
|
||||||
|
android:progress="50"
|
||||||
|
app:progress_text_size="@dimen/progressbar_text"
|
||||||
|
android:id="@+id/images_used_by_wiki_progress_bar"
|
||||||
|
app:progress_end_color="#8C8B98"
|
||||||
|
app:progress_start_color="#3A3381"
|
||||||
|
app:progress_stroke_width="2.5dp"
|
||||||
|
app:progress_text_color="@color/secondaryColor"
|
||||||
|
app:progress_text_format_pattern="12/24"
|
||||||
|
app:style="solid_line" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:id="@+id/progressBar"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/layout_statistics"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/statistics"
|
||||||
|
style="?android:textAppearanceLarge"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_vertical"
|
||||||
|
android:textAllCaps="true"/>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_toStartOf="@+id/wikidata_edits"
|
||||||
|
android:layout_toLeftOf="@+id/wikidata_edits"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center_vertical">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/overflow_icon_dimen"
|
||||||
|
android:layout_height="@dimen/overflow_icon_dimen"
|
||||||
|
android:id="@+id/wikidata_edits_icon"
|
||||||
|
app:srcCompat="@drawable/ic_custom_map_marker" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/statistics_wikidata_edits" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/medium_width"
|
||||||
|
android:layout_height="@dimen/medium_height"
|
||||||
|
android:id="@+id/images_nearby_info"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_gravity="top"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/primaryDarkColor" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/half_standard_height"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
tools:text="2"
|
||||||
|
android:id="@+id/wikidata_edits"
|
||||||
|
android:layout_marginRight="@dimen/half_standard_height" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_toStartOf="@+id/image_featured"
|
||||||
|
android:layout_toLeftOf="@+id/image_featured"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center_vertical">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/overflow_icon_dimen"
|
||||||
|
android:layout_height="@dimen/overflow_icon_dimen"
|
||||||
|
android:id="@+id/featured_image_icon"
|
||||||
|
app:srcCompat="@drawable/featured"
|
||||||
|
android:scaleType="centerCrop" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/statistics_featured" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/medium_width"
|
||||||
|
android:layout_height="@dimen/medium_height"
|
||||||
|
android:id="@+id/images_featured_info"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_gravity="top"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/primaryDarkColor" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
tools:text="2"
|
||||||
|
android:id="@+id/image_featured"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/half_standard_height"
|
||||||
|
android:layout_marginRight="@dimen/half_standard_height" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
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_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_toStartOf="@+id/thanks_received"
|
||||||
|
android:layout_toLeftOf="@+id/thanks_received"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:gravity="center_vertical">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/overflow_icon_dimen"
|
||||||
|
android:layout_height="@dimen/overflow_icon_dimen"
|
||||||
|
android:id="@+id/thanks_image_icon"
|
||||||
|
app:srcCompat="@drawable/ic_thanks"
|
||||||
|
android:scaleType="centerCrop" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:text="@string/statistics_thanks" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="@dimen/medium_width"
|
||||||
|
android:layout_height="@dimen/medium_height"
|
||||||
|
android:id="@+id/thanks_received_info"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginRight="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginEnd="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_gravity="top"
|
||||||
|
app:srcCompat="@drawable/ic_info_outline_24dp"
|
||||||
|
android:tint="@color/primaryDarkColor" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
style="?android:textAppearanceMedium"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_marginTop="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginStart="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_marginLeft="@dimen/activity_margin_horizontal"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
tools:text="2"
|
||||||
|
android:id="@+id/thanks_received"
|
||||||
|
android:layout_marginEnd="@dimen/half_standard_height"
|
||||||
|
android:layout_marginRight="@dimen/half_standard_height" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
</LinearLayout>
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
|
<include layout="@layout/drawer_view" />
|
||||||
|
|
||||||
|
</androidx.drawerlayout.widget.DrawerLayout>
|
||||||
6
app/src/main/res/layout/fragment_leaderboard.xml
Normal file
6
app/src/main/res/layout/fragment_leaderboard.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|
@ -386,6 +386,7 @@
|
||||||
<string name="delete">Delete</string>
|
<string name="delete">Delete</string>
|
||||||
|
|
||||||
<string name="Achievements">Achievements</string>
|
<string name="Achievements">Achievements</string>
|
||||||
|
<string name="Profile">Profile</string>
|
||||||
<string name="statistics">Statistics</string>
|
<string name="statistics">Statistics</string>
|
||||||
<string name="statistics_thanks">Thanks Received</string>
|
<string name="statistics_thanks">Thanks Received</string>
|
||||||
<string name="statistics_featured">Featured Images</string>
|
<string name="statistics_featured">Featured Images</string>
|
||||||
|
|
@ -630,4 +631,6 @@ Upload your first media by tapping on the add button.</string>
|
||||||
<string name="use_location_from_similar_image">Did you shoot these two pictures at the same place? Do you want to use the latitude/longitude of the picture on the right?</string>
|
<string name="use_location_from_similar_image">Did you shoot these two pictures at the same place? Do you want to use the latitude/longitude of the picture on the right?</string>
|
||||||
<string name="load_more">Load More</string>
|
<string name="load_more">Load More</string>
|
||||||
<string name="nearby_no_results">No places found, try changing your search criteria.</string>
|
<string name="nearby_no_results">No places found, try changing your search criteria.</string>
|
||||||
|
<string name="achievements_tab_title">Achievements</string>
|
||||||
|
<string name="leaderboard_tab_title">Leaderboard</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@ package fr.free.nrw.commons.delete
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.res.Resources
|
import android.content.res.Resources
|
||||||
import fr.free.nrw.commons.Media
|
import fr.free.nrw.commons.Media
|
||||||
import fr.free.nrw.commons.achievements.FeedbackResponse
|
|
||||||
import fr.free.nrw.commons.auth.SessionManager
|
import fr.free.nrw.commons.auth.SessionManager
|
||||||
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
|
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
|
||||||
|
import fr.free.nrw.commons.profile.achievements.FeedbackResponse
|
||||||
import fr.free.nrw.commons.utils.ViewUtilWrapper
|
import fr.free.nrw.commons.utils.ViewUtilWrapper
|
||||||
import io.reactivex.Single
|
import io.reactivex.Single
|
||||||
import org.junit.Before
|
import org.junit.Before
|
||||||
|
|
@ -13,7 +13,6 @@ import org.junit.Test
|
||||||
import org.mockito.ArgumentMatchers.anyInt
|
import org.mockito.ArgumentMatchers.anyInt
|
||||||
import org.mockito.InjectMocks
|
import org.mockito.InjectMocks
|
||||||
import org.mockito.Mock
|
import org.mockito.Mock
|
||||||
import org.mockito.Mockito
|
|
||||||
import org.mockito.Mockito.*
|
import org.mockito.Mockito.*
|
||||||
import org.mockito.MockitoAnnotations
|
import org.mockito.MockitoAnnotations
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue