Fix conflicts

Author: neslihanturan

CREDITS

@@ -46,6 +46,7 @@ their contribution to the product.
 * Ilgaz Er
 * Alicia Bendz
 * Kaartic Sivaraam
+* Vanshika Arora
 
 3rd party open source libraries used:
 * Butterknife

app/build.gradle

@@ -1,33 +1,35 @@
 plugins {
     id 'com.github.triplet.play' version '2.2.1' apply false
 }
+
 apply from: '../gitutils.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'jacoco-android'
 apply from: 'quality.gradle'
+
 def isRunningOnTravisAndIsNotPRBuild = System.getenv("CI") == "true" && file('../play.p12').exists()
+
 if(isRunningOnTravisAndIsNotPRBuild) {
     apply plugin: 'com.github.triplet.play'
 }
+
 dependencies {
+
     // Utils
     implementation 'com.github.nicolas-raoul:Quadtree:ac16ea8035bf07'
-    implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.squareup.okio:okio:1.15.0'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.3'
     implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-support-v4:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.1.1'
     implementation 'com.facebook.fresco:fresco:1.13.0'
-    implementation 'com.drewnoakes:metadata-extractor:2.11.0'
     implementation 'com.dmitrybrant:wikimedia-android-data-client:0.0.18'
     implementation 'org.apache.commons:commons-lang3:3.8.1'
+
     // UI
     implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
     implementation 'com.github.chrisbanes:PhotoView:2.0.0'
@@ -39,19 +41,20 @@ dependencies {
     implementation 'com.karumi:dexter:5.0.0'
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
+
     // Logging
     implementation 'ch.acra:acra-dialog:5.3.0'
     implementation 'ch.acra:acra-mail:5.3.0'
-    implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'org.slf4j:slf4j-api:1.7.25'
     api('com.github.tony19:logback-android-classic:1.1.1-6') {
         exclude group: 'com.google.android', module: 'android'
     }
+
     // Dependency injector
-    implementation "com.google.dagger:dagger:$DAGGER_VERSION"
     implementation "com.google.dagger:dagger-android-support:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
     kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
+
     // Unit testing
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION"
@@ -62,6 +65,7 @@ dependencies {
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
     testImplementation "org.powermock:powermock-module-junit4:2.0.0-beta.5"
     testImplementation "org.powermock:powermock-api-mockito2:2.0.0-beta.5"
+
     // Android testing
     androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
@@ -73,59 +77,73 @@ dependencies {
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
     androidTestImplementation 'org.mockito:mockito-core:2.10.0'
     androidTestUtil 'androidx.test:orchestrator:1.1.1'
+
     // Debugging
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY_VERSION"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY_VERSION"
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY_VERSION"
+
     // Support libraries
     implementation "com.google.android.material:material:1.1.0-alpha04"
     implementation "androidx.browser:browser:1.0.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "androidx.exifinterface:exifinterface:1.0.0"
+
     //swipe_layout
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
+
     //metadata extractor
     implementation 'com.drewnoakes:metadata-extractor:2.11.0'
 }
+
 android {
     compileSdkVersion 28
     buildToolsVersion "28.0.3"
+
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
         versionCode 475
         versionName '2.11.0'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
+
         minSdkVersion 19
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
+
         testOptions {
             execution 'ANDROIDX_TEST_ORCHESTRATOR'
         }
+
         vectorDrawables.useSupportLibrary = true
     }
     packagingOptions {
         exclude 'META-INF/androidx.*'
         exclude 'META-INF/proguard/androidx-annotations.pro'
     }
+
     testOptions {
         unitTests.returnDefaultValues = true
         unitTests.includeAndroidResources = true
+
         unitTests.all {
             jvmArgs '-noverify'
         }
     }
+
     sourceSets {
         // use kotlin only in tests (for now)
         test.java.srcDirs += 'src/test/kotlin'
         // use main assets and resources in test
         test.assets.srcDirs += 'src/main/assets'
         test.resources.srcDirs += 'src/main/resoures'
     }
+
     signingConfigs {
         release
     }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -151,13 +169,17 @@ android {
         signingConfigs.release.keyAlias = System.getenv("key_alias")
         signingConfigs.release.keyPassword = System.getenv("key_password")
     }
+
     configurations.all {
         resolutionStrategy.force 'androidx.annotation:annotation:1.0.2'
     }
+
     flavorDimensions 'tier'
     productFlavors {
         prod {
+
             applicationId 'fr.free.nrw.commons'
+
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
@@ -181,10 +203,12 @@ android {
             buildConfigField "String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\""
             buildConfigField "String", "TEST_USERNAME", "\"" + System.getenv("test_user_name") + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + System.getenv("test_user_password") + "\""
+
             dimension 'tier'
         }
         beta {
             applicationId 'fr.free.nrw.commons.beta'
+
             // What values do we need to hit the BETA versions of the site / api ?
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
@@ -209,18 +233,22 @@ android {
             buildConfigField "String", "COMMIT_SHA", "\"" + getBuildVersion().toString() + "\""
             buildConfigField "String", "TEST_USERNAME", "\"" + System.getenv("test_user_name") + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + System.getenv("test_user_password") + "\""
+
             dimension 'tier'
         }
     }
+
     lintOptions {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
         abortOnError false
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     buildToolsVersion buildToolsVersion
 }
 if(isRunningOnTravisAndIsNotPRBuild) {
@@ -229,6 +257,7 @@ if(isRunningOnTravisAndIsNotPRBuild) {
         userFraction = 1
         serviceAccountEmail = System.getenv("SERVICE_ACCOUNT_NAME")
         serviceAccountCredentials = file("../play.p12")
+
         resolutionStrategy = "auto"
         outputProcessor { // this: ApkVariantOutput
             versionNameOverride = "$versionNameOverride.$versionCode"

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

@@ -199,7 +199,7 @@ void shareScreen(Bitmap bitmap) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(Intent.EXTRA_STREAM, fileUri);
             intent.setType("image/png");
-            startActivity(Intent.createChooser(intent, "Share image via"));
+            startActivity(Intent.createChooser(intent, getString(R.string.share_image_via)));
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -316,8 +316,8 @@ private void setUploadProgress(int uploadCount){
 
     private void setZeroAchievements() {
         AlertDialog.Builder builder=new AlertDialog.Builder(this)
-                .setMessage("You haven't made any contributions yet")
-                .setPositiveButton("Ok", (dialog, which) -> {
+                .setMessage(getString(R.string.no_achievements_yet))
+                .setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                 });
         AlertDialog dialog = builder.create();
         dialog.show();

app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java

@@ -7,6 +7,7 @@
 import android.widget.Toast;
 
 import fr.free.nrw.commons.BuildConfig;
+import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.theme.BaseActivity;
 import timber.log.Timber;
 
@@ -39,7 +40,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 Timber.d("Overriding URL %s", url);
 
                 Toast toast = Toast.makeText(SignupActivity.this,
-                        "Account created!", Toast.LENGTH_LONG);
+                        R.string.account_created, Toast.LENGTH_LONG);
                 toast.show();
                 // terminate on task completion.
                 finish();

app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java

@@ -87,7 +87,7 @@ public void removeNotification(Notification notification) {
                         setAdapter(notificationList);
                         adapter.notifyDataSetChanged();
                         Snackbar snackbar = Snackbar
-                                .make(relativeLayout,"Notification marked as read", Snackbar.LENGTH_LONG);
+                                .make(relativeLayout, getString(R.string.notification_mark_read), Snackbar.LENGTH_LONG);
 
                         snackbar.show();
                         if (notificationList.size()==0){
@@ -99,7 +99,7 @@ public void removeNotification(Notification notification) {
                     else {
                         adapter.notifyDataSetChanged();
                         setAdapter(notificationList);
-                        Toast.makeText(NotificationActivity.this, "There was some error!", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(NotificationActivity.this, getString(R.string.some_error), Toast.LENGTH_SHORT).show();
                     }
                 }, throwable -> {
 

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

@@ -163,7 +163,7 @@ void shareScreen(Bitmap bitmap) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
             intent.setType("image/png");
-            startActivity(Intent.createChooser(intent, "Share image via"));
+            startActivity(Intent.createChooser(intent, getString(R.string.share_image_via)));
         } catch (Exception e) {
             e.printStackTrace();
         }

app/src/main/res/values-ar/strings.xml

@@ -552,4 +552,10 @@
   <string name="delete_helper_ask_reason_copyright_logo">شعار</string>
   <string name="delete_helper_ask_reason_copyright_other">أخرى</string>
   <string name="delete_helper_ask_alert_set_positive_button_reason">لأنها</string>
+  <string name="share_image_via">مشاركة الصور عبر</string>
+  <string name="no_achievements_yet">أنت لم تقدم أية مساهمات حتى الآن</string>
+  <string name="account_created">تم إنشاء الحساب!</string>
+  <string name="text_copy">تم نسخ النص  إلى الحافظة.</string>
+  <string name="notification_mark_read">تم تعليم الإخطار كمقروء</string>
+  <string name="some_error">ثمة خطأ ما!</string>
 </resources>

app/src/main/res/values-diq/strings.xml

@@ -254,4 +254,7 @@
   <string name="please_wait">Kerem kerên, bıpawên...</string>
   <string name="skip_image" fuzzy="true">NÊ RESIMİ RAVİYARNE</string>
   <string name="image_info">Melumatê resımi</string>
+  <string name="account_created">Hesab vıraziya!</string>
+  <string name="text_copy">Metın kopyayê panoyi biyo</string>
+  <string name="some_error">Yew xeta biye!</string>
 </resources>

app/src/main/res/values-el/strings.xml

@@ -21,6 +21,7 @@
   <string name="preference_category_appearance">Εμφάνιση</string>
   <string name="preference_category_general">Γενικά</string>
   <string name="preference_category_feedback">Ανατροφοδότηση</string>
+  <string name="preference_category_privacy">Ιδιωτικότητα</string>
   <string name="preference_category_location">Τοποθεσία</string>
   <string name="app_name">Commons</string>
   <string name="bullet">•</string>
@@ -176,7 +177,7 @@
   <string name="menu_refresh">Ανανέωση</string>
   <string name="storage_permission_title">Αιτείται Άδεια Αποθήκευσης</string>
   <string name="read_storage_permission_rationale">Απαιτούμενη άδεια: Ανάγνωση εξωτερικής αποθήκευσης. Η εφαρμογή δεν μπορεί να έχει πρόσβαση στην συλλογή σας χωρίς αυτή.</string>
-  <string name="write_storage_permission_rationale" fuzzy="true">Απαιτούμενη άδεια: Με εξωτερική αποθήκευση. Το πρόγραμμα δεν μπορεί να έχει πρόσβαση στην κάμερα σας χωρίς αυτήν.</string>
+  <string name="write_storage_permission_rationale">Απαιτούμενη άδεια: Εγγραφή σε εξωτερική αποθήκευση. Το πρόγραμμα δεν θα έχει πρόσβαση στην κάμερα/συλλογή σας χωρίς αυτήν.</string>
   <string name="location_permission_rationale">Προαιρετική άδεια: Ανάκτηση τρέχουσας θέσης σας για προτάσεις κατηγοριών</string>
   <string name="ok">Εντάξει</string>
   <string name="title_activity_nearby">Κοντινοί Τόποι</string>
@@ -187,6 +188,7 @@
   <string name="no">Όχι</string>
   <string name="media_detail_title">Τίτλος</string>
   <string name="media_detail_description">Περιγραφή</string>
+  <string name="media_detail_discussion">Συζήτηση</string>
   <string name="media_detail_author">Συγγραφέας</string>
   <string name="media_detail_uploaded_date">Ημερομηνία φόρτωσης</string>
   <string name="media_detail_license">Άδεια</string>
@@ -344,6 +346,7 @@
   <string name="delete_recent_searches_dialog">Είστε σίγουρος ότι θέλετε να καθαρίσετε το ιστορικό αναζήτησης;</string>
   <string name="search_history_deleted">Το ιστορικό αναζήτησης διεγράφη</string>
   <string name="nominate_delete">Ορίστε για Αφαίρεση</string>
+  <string name="delete">Διαγραφή</string>
   <string name="Achievements">Κατορθώματα</string>
   <string name="statistics">Στατιστικά</string>
   <string name="statistics_thanks">Ευχαριστίες που έχουν ληφθεί</string>
@@ -399,9 +402,17 @@
   <string name="no_categories_selected_warning_desc">Εικόνες χωρίς κατηγορίες χρησιμοποιούνται σπάνια. Θέλετε πράγματι να στείλετε δίχως να επιλέξετε κατηγορίες?</string>
   <string name="yes_submit">Ναι, υποβολή</string>
   <string name="no_go_back">Όχι, Επιστροφή</string>
+  <string name="review_thanks_yes_button_text">Ναι, γιατί όχι</string>
+  <string name="review_thanks_no_button_text">Επόμενη εικόνα</string>
   <string name="no_image">Δεν χρησιμοποιούνται εικόνες</string>
   <string name="no_image_uploaded">Δεν έχουν ανεβεί εικόνες</string>
-  <string name="no_notification" fuzzy="true">Δεν έχετε αδιάβαστες Ενημερώσεις.</string>
-  <string name="no_archived_notification" fuzzy="true">Δεν έχετε αρχειοθετημένες Ενημερώσεις.</string>
+  <string name="no_notification">Δεν έχετε αδιάβαστες ενημερώσεις</string>
+  <string name="no_archived_notification">Δεν έχετε αρχειοθετημένες ενημερώσεις</string>
   <string name="please_wait">Παρακαλούμε περιμένετε…</string>
+  <string name="exif_tag_name_author">Δημιουργός</string>
+  <string name="exif_tag_name_copyright">Πνευματικά δικαιώματα</string>
+  <string name="exif_tag_name_location">Τοποθεσία</string>
+  <string name="exif_tag_name_software">Λογισμικό</string>
+  <string name="image_info">Πληροφορίες Εικόνας</string>
+  <string name="delete_helper_show_deletion_title_failed">Απέτυχε</string>
 </resources>

app/src/main/res/values-en-gb/error.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Cblair91
+-->
+<resources>
+  <string name="crash_dialog_title">Commons has crashed</string>
+  <string name="crash_dialog_text">Oops. Something went wrong!</string>
+  <string name="crash_dialog_comment_prompt">Tell us what you were doing, then share it via email to us. Will help us fix it!</string>
+  <string name="crash_dialog_ok_toast">Thank you!</string>
+</resources>

app/src/main/res/values-es/strings.xml

@@ -257,7 +257,7 @@
   <string name="nearby_info_menu_commons_article">Página del archivo en Commons</string>
   <string name="nearby_info_menu_wikidata_article">Elemento de Wikidata</string>
   <string name="nearby_info_menu_wikipedia_article">Artículo de Wikipedia</string>
-  <string name="error_while_cache">Error al almacenar imágenes en la caché</string>
+  <string name="error_while_cache">Error al almacenar imágenes en la antememoria</string>
   <string name="title_info">Un título único descriptivo para el archivo, que servirá como un nombre de archivo. Puede usar un lenguaje claro con espacios. No incluya la extensión del archivo.</string>
   <string name="description_info">Por favor, describe el elemento multimedia tanto como sea posible: ¿dónde fue tomado?, ¿qué muestra?, ¿cuál es el contexto? Por favor, describe los objetos o personas. Ofrece la información que no puede ser inferida tan fácilmente, por ejemplo el momento del día si es un paisaje. Si el medio muestra algo inusual, explica qué lo hace inusual.</string>
   <string name="upload_image_too_dark">La imagen está demasiado oscura, ¿seguro que quieres subirla? Wikimedia Commons solo acepta imágenes con valor enciclopédico.</string>