Merge commit 'refs/pull/5220/head' of github.com:commons-app/apps-android-commons into new-tools

Author: sivaraam

.github/workflows/android.yml

@@ -17,8 +17,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: "temurin"
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Cache packages
         id: cache-packages

.idea/codeStyles/Project.xml

@@ -20,8 +20,8 @@ dependencies {
     // Utils
     implementation 'in.yuvi:http.fluent:1.3'
     implementation 'com.google.code.gson:gson:2.8.5'
-    implementation ("com.squareup.okhttp3:okhttp:$OKHTTP_VERSION"){
-        force = true //API 19 support
+    implementation ("com.squareup.okhttp3:okhttp:$OKHTTP_VERSION!!"){
+        //force = true //API 19 support
     }
     implementation 'com.squareup.okio:okio:2.2.2'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
@@ -120,7 +120,7 @@ dependencies {
     implementation "androidx.exifinterface:exifinterface:1.3.2"
     implementation "androidx.core:core-ktx:$CORE_KTX_VERSION"
     implementation "androidx.multidex:multidex:2.0.1"
-    compile 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
+    implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.1'
 
     //swipe_layout
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
@@ -188,12 +188,16 @@ android {
 
         vectorDrawables.useSupportLibrary = true
     }
-
     packagingOptions {
-        exclude 'META-INF/androidx.*'
-        exclude 'META-INF/proguard/androidx-annotations.pro'
+        jniLibs {
+            excludes += ['META-INF/androidx.*']
+        }
+        resources {
+            excludes += ['META-INF/androidx.*', 'META-INF/proguard/androidx-annotations.pro']
+        }
     }
 
+
     testOptions {
         animationsDisabled true
 
@@ -326,11 +330,6 @@ android {
         }
     }
 
-    lintOptions {
-        disable 'MissingTranslation'
-        disable 'ExtraTranslation'
-        abortOnError false
-    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -342,7 +341,11 @@ android {
     buildFeatures {
         viewBinding true
     }
-
+    namespace 'fr.free.nrw.commons'
+    lint {
+        abortOnError false
+        disable 'MissingTranslation', 'ExtraTranslation'
+    }
 }
 
 String getTestUserName() {

app/build.gradle

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="fr.free.nrw.commons">
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

app/src/main/AndroidManifest.xml

@@ -41,8 +41,9 @@
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
-import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.media.MediaClient;
+import fr.free.nrw.commons.profile.ProfileActivity;
+import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.SystemThemeUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import java.util.Locale;
@@ -52,7 +53,6 @@
 import javax.inject.Named;
 import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.dataclient.WikiSite;
-import fr.free.nrw.commons.profile.ProfileActivity;
 
 
 /**
@@ -112,7 +112,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment impl
 
     private ContributionsListAdapter adapter;
 
-    @Nullable private Callback callback;
+    @Nullable
+    private Callback callback;
 
     private final int SPAN_COUNT_LANDSCAPE = 3;
     private final int SPAN_COUNT_PORTRAIT = 1;
@@ -142,7 +143,8 @@ public void onActivityResult(Map<String, Boolean> result) {
 
 
     @Override
-    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable final Bundle savedInstanceState) {
+    public void onCreate(
+        @Nullable @org.jetbrains.annotations.Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //Now that we are allowing this fragment to be started for
         // any userName- we expect it to be passed as an argument
@@ -336,7 +338,7 @@ private void setListeners() {
      * Launch Custom Selector.
      */
     @OnClick(R.id.fab_custom_gallery)
-    void launchCustomSelector(){
+    void launchCustomSelector() {
         controller.initiateCustomGalleryPickWithPermission(getActivity());
         animateFAB(isFabOpen);
     }
@@ -348,24 +350,24 @@ public void scrollToTop() {
     private void animateFAB(final boolean isFabOpen) {
         this.isFabOpen = !isFabOpen;
         if (fabPlus.isShown()) {
-        if (isFabOpen) {
-            fabPlus.startAnimation(rotate_backward);
-            fabCamera.startAnimation(fab_close);
-            fabGallery.startAnimation(fab_close);
-            fabCustomGallery.startAnimation(fab_close);
-            fabCamera.hide();
-            fabGallery.hide();
-            fabCustomGallery.hide();
-        } else {
-            fabPlus.startAnimation(rotate_forward);
-            fabCamera.startAnimation(fab_open);
-            fabGallery.startAnimation(fab_open);
-            fabCustomGallery.startAnimation(fab_open);
-            fabCamera.show();
-            fabGallery.show();
-            fabCustomGallery.show();
-        }
-        this.isFabOpen = !isFabOpen;
+            if (isFabOpen) {
+                fabPlus.startAnimation(rotate_backward);
+                fabCamera.startAnimation(fab_close);
+                fabGallery.startAnimation(fab_close);
+                fabCustomGallery.startAnimation(fab_close);
+                fabCamera.hide();
+                fabGallery.hide();
+                fabCustomGallery.hide();
+            } else {
+                fabPlus.startAnimation(rotate_forward);
+                fabCamera.startAnimation(fab_open);
+                fabGallery.startAnimation(fab_open);
+                fabCustomGallery.startAnimation(fab_open);
+                fabCamera.show();
+                fabGallery.show();
+                fabCustomGallery.show();
+            }
+            this.isFabOpen = !isFabOpen;
         }
     }
 

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

@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.filepicker;
 
+import static fr.free.nrw.commons.filepicker.PickedFiles.singleFileList;
+
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.Context;
@@ -8,13 +10,11 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import androidx.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.TextUtils;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
+import androidx.preference.PreferenceManager;
 import fr.free.nrw.commons.customselector.model.Image;
 import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity;
 import java.io.File;
@@ -23,8 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static fr.free.nrw.commons.filepicker.PickedFiles.singleFileList;
-
 public class FilePicker implements Constants {
 
     private static final String KEY_PHOTO_URI = "photo_uri";

app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java

@@ -7,16 +7,13 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
-
 import com.karumi.dexter.Dexter;
 import com.karumi.dexter.MultiplePermissionsReport;
 import com.karumi.dexter.PermissionToken;
 import com.karumi.dexter.listener.PermissionRequest;
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener;
-
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import java.util.List;

app/src/main/java/fr/free/nrw/commons/utils/PermissionUtils.java

@@ -2,23 +2,23 @@
 buildscript {
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
         classpath 'org.codehaus.groovy:groovy-all:2.4.15'
     }
 }
 
 allprojects {
-  repositories {
-    google()
-    jcenter()
-    maven { url "https://jitpack.io" }
-    maven { url "https://maven.google.com" }
-  }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal() // potential jcenter() replacement
+        maven { url "https://jitpack.io" }
+        maven { url "https://maven.google.com" }
+    }
 }