Merge branch 'master' of https://github.com/commons-app/apps-android-commons

Author: misaochan

README.md

@@ -18,6 +18,33 @@ We try to have an extensive documentation at [our wiki here at Github][5]:
   * [Volunteers Welcome!][9]
 * [Developer Documentation][8]
 
+## Libraries Used ##
+
+* [Picasso][11]
+* [RSS-Parser][12]
+* [ViewPagerIndicator][13]
+* [PhotoView][14]
+* [Acra][15]
+* [Renderers][16]
+* [Gson][17]
+* [Timber][18]
+* [Java-String-Similarity][19]
+* [ReadMoreTextView][20]
+* [MaterialShowcaseView][21]
+* [Butterknife][22]
+* [OKHttp][23]
+* [Okio][24]
+* [RxJava][25]
+* [JSoup][26]
+* [Fresco][27]
+* [Stetho][28]
+* [Dagger][29]
+* [AndroidSVG][30]
+* [Java-HTTP-Fluent][31]
+* [CircleProgressBar][32]
+* [Glide][33]
+* [Leak Canary][34]
+
 ## License ##
 
 This software is open source, licensed under the [Apache License 2.0][4].
@@ -34,3 +61,27 @@ This software is open source, licensed under the [Apache License 2.0][4].
 [8]: https://github.com/commons-app/apps-android-commons/wiki#developer-documentation
 [9]: https://github.com/commons-app/apps-android-commons/wiki/Volunteers-welcome%21
 [10]: https://meta.wikimedia.org/wiki/Grants:Project/Improve_%27Upload_to_Commons%27_Android_App/Renewal
+[11]: https://github.com/square/picasso
+[12]: https://github.com/prof18/RSS-Parser
+[13]: https://github.com/avianey/Android-ViewPagerIndicator
+[14]: https://github.com/chrisbanes/PhotoView
+[15]: https://github.com/ACRA/acra
+[16]: https://github.com/pedrovgs/Renderers
+[17]: https://github.com/google/gson
+[18]: https://github.com/JakeWharton/timber
+[19]: https://github.com/tdebatty/java-string-similarity
+[20]: https://github.com/bravoborja/ReadMoreTextView
+[21]: https://github.com/deano2390/MaterialShowcaseView
+[22]: https://github.com/JakeWharton/butterknife
+[23]: https://github.com/square/okhttp
+[24]: https://github.com/square/okio
+[25]: https://github.com/ReactiveX/RxJava
+[26]: https://github.com/jhy/jsoup
+[27]: https://github.com/facebook/fresco
+[28]: https://github.com/facebook/stetho
+[29]: https://github.com/google/dagger
+[30]: https://github.com/BigBadaboom/androidsvg
+[31]: https://github.com/yuvipanda/java-http-fluent/blob/master/src/main/java/in/yuvi/http/fluent/Http.java
+[32]: https://github.com/dinuscxj/CircleProgressBar
+[33]: https://github.com/bumptech/glide
+[34]: https://github.com/square/leakcanary

app/build.gradle

@@ -77,8 +77,6 @@ dependencies {
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
 
-    implementation 'com.borjabravo:readmoretextview:2.1.0'
-    implementation 'com.dinuscxj:circleprogressbar:1.1.1'
 }
 
 android {

app/src/main/AndroidManifest.xml

@@ -114,6 +114,7 @@
         <activity
             android:name=".explore.SearchActivity"
             android:label="@string/title_activity_search"
+            android:configChanges="orientation|keyboardHidden"
             android:parentActivityName=".contributions.ContributionsActivity"
             />
 

app/src/main/java/fr/free/nrw/commons/AboutActivity.java

@@ -144,11 +144,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @OnClick(R.id.about_translate)
     public void launchTranslate(View view) {
         final ArrayAdapter<String> languageAdapter = new ArrayAdapter<String>(AboutActivity.this,
-                android.R.layout.simple_spinner_item, language);
+                android.R.layout.simple_spinner_dropdown_item, language);
         final Spinner spinner = new Spinner(AboutActivity.this);
         spinner.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
         spinner.setAdapter(languageAdapter);
         spinner.setGravity(17);
+        spinner.setPadding(50,0,0,0);
 
         AlertDialog.Builder builder = new AlertDialog.Builder(AboutActivity.this);
         builder.setView(spinner);

app/src/main/java/fr/free/nrw/commons/achievements/LevelController.java

@@ -25,7 +25,19 @@ public enum LevelInfo{
         LEVEL_12(12,R.style.LevelTwo,65 , 130, 90),
         LEVEL_13(13,R.style.LevelThree, 70, 140, 90),
         LEVEL_14(14,R.style.LevelFour, 75 , 150, 90),
-        LEVEL_15(15,R.style.LevelFive, 80, 160, 90);
+        LEVEL_15(15,R.style.LevelFive, 80, 160, 90),
+        LEVEL_16(16,R.style.LevelOne, 160, 320, 91),
+        LEVEL_17(17,R.style.LevelTwo, 320, 640, 92),
+        LEVEL_18(18,R.style.LevelThree, 640, 1280, 93),
+        LEVEL_19(19,R.style.LevelFour, 1280, 2560, 94),
+        LEVEL_20(20,R.style.LevelFive, 2560, 5120, 95),
+        LEVEL_21(21,R.style.LevelOne, 5120, 10240, 96),
+        LEVEL_22(22,R.style.LevelTwo, 10240, 20480, 97),
+        LEVEL_23(23,R.style.LevelThree, 20480, 40960, 98),
+        LEVEL_24(24,R.style.LevelFour, 40960, 81920, 98),
+        LEVEL_25(25,R.style.LevelFive, 81920, 163840, 98),
+        LEVEL_26(26,R.style.LevelOne, 163840, 327680, 98),
+        LEVEL_27(27,R.style.LevelTwo, 327680, 655360, 98);
 
         private int levelNumber;
         private int levelStyle;

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java

@@ -13,7 +13,7 @@
 import fr.free.nrw.commons.Media;
 import fr.free.nrw.commons.settings.Prefs;
 
-public class Contribution extends Media {
+public class  Contribution extends Media {
 
     public static Creator<Contribution> CREATOR = new Creator<Contribution>() {
         @Override

app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java

@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.explore;
 
+import android.content.res.Configuration;
 import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
@@ -194,6 +195,10 @@ public void onSearchImageClicked(int index) {
         mediaDetails.showImage(index);
         forceInitBackButton();
     }
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
 
     /**
      * This method is called on Screen Rotation

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java

@@ -60,6 +60,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
     private boolean isCategoryImage;
     private MediaDetailPagerFragment.MediaDetailProvider detailProvider;
     private int index;
+    private Locale locale;
 
     public static MediaDetailFragment forMedia(int index, boolean editable, boolean isCategoryImage) {
         MediaDetailFragment mf = new MediaDetailFragment();
@@ -198,6 +199,7 @@ public void onGlobalLayout() {
             }
         };
         view.getViewTreeObserver().addOnGlobalLayoutListener(layoutListener);
+        locale = getResources().getConfiguration().locale;
         return view;
     }
 
@@ -455,7 +457,7 @@ private void updateTheDarkness() {
 
     private String prettyDescription(Media media) {
         // @todo use UI language when multilingual descs are available
-        String desc = media.getDescription("en").trim();
+        String desc = media.getDescription(locale.getLanguage()).trim();
         if (desc.equals("")) {
             return getString(R.string.detail_description_empty);
         } else {

app/src/main/java/fr/free/nrw/commons/quiz/QuizController.java

@@ -43,7 +43,7 @@ public void initialize(Context context){
         quiz.add(q3);
 
         QuizQuestion q4 = new QuizQuestion(4,
-                context.getResources().getString(R.string.quiz_question_string),
+                context.getResources().getString(R.string.quiz_screenshot_question),
                 URL_FOR_SCREENSHOT,
                 false,
                 context.getResources().getString(R.string.screenshot_answer));

app/src/main/java/fr/free/nrw/commons/upload/Description.java

@@ -0,0 +1,57 @@
+package fr.free.nrw.commons.upload;
+
+import android.text.TextUtils;
+import android.util.TimeUtils;
+
+class Description {
+
+    private String languageId;
+    private String languageDisplayText;
+    private String descriptionText;
+    private boolean set;
+    private int selectedLanguageIndex = -1;
+
+    public String getLanguageId() {
+        return languageId;
+    }
+
+    public void setLanguageId(String languageId) {
+        this.languageId = languageId;
+    }
+
+    public String getLanguageDisplayText() {
+        return languageDisplayText;
+    }
+
+    public void setLanguageDisplayText(String languageDisplayText) {
+        this.languageDisplayText = languageDisplayText;
+    }
+
+    public String getDescriptionText() {
+        return descriptionText;
+    }
+
+    public void setDescriptionText(String descriptionText) {
+        this.descriptionText = descriptionText;
+
+        if (!TextUtils.isEmpty(descriptionText)) {
+            set = true;
+        }
+    }
+
+    public boolean isSet() {
+        return set;
+    }
+
+    public void setSet(boolean set) {
+        this.set = set;
+    }
+
+    public int getSelectedLanguageIndex() {
+        return selectedLanguageIndex;
+    }
+
+    public void setSelectedLanguageIndex(int selectedLanguageIndex) {
+        this.selectedLanguageIndex = selectedLanguageIndex;
+    }
+}