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

Temporary commit - Removed library/commented

Browse source
This commit is contained in:
Kanahia 2024-08-22 17:25:42 +05:30
parent 35eadf3d33
commit dc37060b5e
5 changed files with 78 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -47,7 +47,6 @@ dependencies {
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
implementation 'com.dinuscxj:circleprogressbar:1.1.1'
implementation 'com.karumi:dexter:5.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

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

@ -306,9 +306,9 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
if (uploadCount==0){
setZeroAchievements();
}else {
binding.imagesUploadedProgressbar.setVisibility(View.VISIBLE);
binding.imagesUploadedProgressbar.setProgress
(100*uploadCount/levelInfo.getMaxUploadCount());
// binding.imagesUploadedProgressbar.setVisibility(View.VISIBLE);
// binding.imagesUploadedProgressbar.setProgress
// (100*uploadCount/levelInfo.getMaxUploadCount());
binding.tvUploadedImages.setText
(uploadCount + "/" + levelInfo.getMaxUploadCount());
}
@ -325,9 +325,9 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
getString(R.string.ok),
() -> {},
true);
binding.imagesUploadedProgressbar.setVisibility(View.INVISIBLE);
binding.imageRevertsProgressbar.setVisibility(View.INVISIBLE);
binding.imagesUsedByWikiProgressBar.setVisibility(View.INVISIBLE);
// binding.imagesUploadedProgressbar.setVisibility(View.INVISIBLE);
// binding.imageRevertsProgressbar.setVisibility(View.INVISIBLE);
// binding.imagesUsedByWikiProgressBar.setVisibility(View.INVISIBLE);
binding.achievementBadgeImage.setVisibility(View.INVISIBLE);
binding.imagesUsedByWikiText.setText(R.string.no_image);
binding.imagesRevertedText.setText(R.string.no_image_reverted);
@ -340,10 +340,10 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
* @param notRevertPercentage
*/
private void setImageRevertPercentage(int notRevertPercentage){
binding.imageRevertsProgressbar.setVisibility(View.VISIBLE);
binding.imageRevertsProgressbar.setProgress(notRevertPercentage);
String revertPercentage = Integer.toString(notRevertPercentage);
binding.imageRevertsProgressbar.setProgressTextFormatPattern(revertPercentage + "%%");
// binding.imageRevertsProgressbar.setVisibility(View.VISIBLE);
// binding.imageRevertsProgressbar.setProgress(notRevertPercentage);
// String revertPercentage = Integer.toString(notRevertPercentage);
// binding.imageRevertsProgressbar.setProgressTextFormatPattern(revertPercentage + "%%");
binding.imagesRevertLimitText.setText(getResources().getString(R.string.achievements_revert_limit_message)+ levelInfo.getMinNonRevertPercentage() + "%");
}
@ -353,10 +353,10 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
* @param achievements
*/
private void inflateAchievements(Achievements achievements) {
binding.imagesUsedByWikiProgressBar.setVisibility(View.VISIBLE);
// binding.imagesUsedByWikiProgressBar.setVisibility(View.VISIBLE);
binding.thanksReceived.setText(String.valueOf(achievements.getThanksReceived()));
binding.imagesUsedByWikiProgressBar.setProgress
(100 * achievements.getUniqueUsedImages() / levelInfo.getMaxUniqueImages());
// binding.imagesUsedByWikiProgressBar.setProgress
// (100 * achievements.getUniqueUsedImages() / levelInfo.getMaxUniqueImages());
if(binding.tvWikiPb != null) {
binding.tvWikiPb.setText
(achievements.getUniqueUsedImages() + "/" + levelInfo.getMaxUniqueImages());

28
app/src/main/res/layout/activity_quiz_result.xml
View file

@ -41,20 +41,20 @@
android:textSize="32sp"
android:layout_marginTop="@dimen/activity_margin_vertical" />
<com.dinuscxj.progressbar.CircleProgressBar
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_250"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_vertical"
android:progress="50"
app:progress_end_color="#8C8B98"
app:progress_start_color="#3A3381"
app:progress_stroke_width="@dimen/first_fab"
app:progress_text_size="@dimen/large_gap"
app:progress_text_format_pattern="4/5"
app:style="solid_line"
android:id="@+id/result_progress_bar"/>
<!-- <com.dinuscxj.progressbar.CircleProgressBar-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/dimen_250"-->
<!-- android:layout_marginRight="@dimen/activity_margin_horizontal"-->
<!-- android:layout_marginLeft="@dimen/activity_margin_horizontal"-->
<!-- android:layout_marginTop="@dimen/activity_margin_vertical"-->
<!-- android:progress="50"-->
<!-- app:progress_end_color="#8C8B98"-->
<!-- app:progress_start_color="#3A3381"-->
<!-- app:progress_stroke_width="@dimen/first_fab"-->
<!-- app:progress_text_size="@dimen/large_gap"-->
<!-- app:progress_text_format_pattern="4/5"-->
<!-- app:style="solid_line"-->
<!-- android:id="@+id/result_progress_bar"/>-->
<TextView
android:layout_width="match_parent"

102
app/src/main/res/layout/fragment_achievements.xml
View file

@ -137,23 +137,23 @@
android:layout_marginEnd="32dp"
android:layout_marginRight="32dp">
<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=""
android:visibility="gone"
app:progress_text_color="@color/secondaryColor"
app:style="solid_line" />
<!-- <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=""-->
<!-- android:visibility="gone"-->
<!-- app:progress_text_color="@color/secondaryColor"-->
<!-- app:style="solid_line" />-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_uploaded_images"
@ -228,23 +228,23 @@
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_below="@id/images_reverted_info"/>
<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:visibility="gone"
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" />
<!-- <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:visibility="gone"-->
<!-- 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>
@ -299,23 +299,23 @@
android:layout_marginEnd="32dp"
android:layout_marginRight="32dp">
<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"
android:visibility="gone"
app:progress_text_color="@color/secondaryColor"
app:progress_text_format_pattern=""
app:style="solid_line" />
<!-- <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"-->
<!-- android:visibility="gone"-->
<!-- app:progress_text_color="@color/secondaryColor"-->
<!-- app:progress_text_format_pattern=""-->
<!-- app:style="solid_line" />-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_wiki_pb"

4
build.gradle
View file

@ -4,9 +4,6 @@ buildscript {
google()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
// Temporary fix for `Could not find com.dinuscxj:circleprogressbar:1.1.1`
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.2'
@ -23,7 +20,6 @@ allprojects {
gradlePluginPortal() // potential jcenter() replacement
maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
jcenter()
}
}
subprojects{