Merge branch 'main' into Migrate-Feedback-Module-from-java-to-kt

app/build.gradle

@@ -47,7 +47,7 @@ dependencies {
 
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
-    implementation "com.google.android.material:material:1.9.0"
+    implementation "com.google.android.material:material:1.12.0"
     implementation 'com.karumi:dexter:5.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 

app/src/androidTest/java/fr/free/nrw/commons/AboutActivityTest.kt

@@ -105,7 +105,7 @@ class AboutActivityTest {
     fun testLaunchTranslate() {
         Espresso.onView(ViewMatchers.withId(R.id.about_translate)).perform(ViewActions.click())
         Espresso.onView(ViewMatchers.withId(android.R.id.button1)).perform(ViewActions.click())
-        val langCode = CommonsApplication.instance.languageLookUpTable!!.codes[0]
+        val langCode = CommonsApplication.instance.languageLookUpTable!!.getCodes()[0]
         Intents.intended(
             CoreMatchers.allOf(
                 IntentMatchers.hasAction(Intent.ACTION_VIEW),

app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.kt

@@ -52,12 +52,12 @@ class CampaignsPresenter @Inject constructor(
                 return
             }
 
-            okHttpJsonApiClient.campaigns
+            okHttpJsonApiClient.getCampaigns()
                 .observeOn(mainThreadScheduler)
                 .subscribeOn(ioScheduler)
                 .doOnSubscribe { disposable = it }
                 .subscribe({ campaignResponseDTO ->
-                    val campaigns = campaignResponseDTO.campaigns?.toMutableList()
+                    val campaigns = campaignResponseDTO?.campaigns?.toMutableList()
                     if (campaigns.isNullOrEmpty()) {
                         Timber.e("The campaigns list is empty")
                         view!!.showCampaigns(null)

app/src/main/java/fr/free/nrw/commons/di/NetworkingModule.kt

@@ -44,7 +44,6 @@ import okhttp3.logging.HttpLoggingInterceptor
 import okhttp3.logging.HttpLoggingInterceptor.Level
 import timber.log.Timber
 import java.io.File
-import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Named
 import javax.inject.Singleton
@@ -170,14 +169,13 @@ class NetworkingModule {
     @Named(NAMED_WIKI_DATA_WIKI_SITE)
     fun provideWikidataWikiSite(): WikiSite = WikiSite(BuildConfig.WIKIDATA_URL)
 
-
     /**
      * Gson objects are very heavy. The app should ideally be using just one instance of it instead of creating new instances everywhere.
      * @return returns a singleton Gson instance
      */
     @Provides
     @Singleton
-    fun provideGson(): Gson = GsonUtil.getDefaultGson()
+    fun provideGson(): Gson = GsonUtil.defaultGson
 
     @Provides
     @Singleton
@@ -294,9 +292,8 @@ class NetworkingModule {
     @Provides
     @Singleton
     @Named(NAMED_LANGUAGE_WIKI_PEDIA_WIKI_SITE)
-    fun provideLanguageWikipediaSite(): WikiSite {
-        return WikiSite.forLanguageCode(Locale.getDefault().language)
-    }
+    fun provideLanguageWikipediaSite(): WikiSite =
+        WikiSite.forDefaultLocaleLanguageCode()
 
     companion object {
         private const val WIKIDATA_SPARQL_QUERY_URL = "https://query.wikidata.org/sparql"

app/src/main/java/fr/free/nrw/commons/edit/EditActivity.kt

@@ -6,9 +6,9 @@ import android.animation.ValueAnimator
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.Matrix
+//noinspection ExifInterface TODO Issue : #5994
 import android.media.ExifInterface
 import android.os.Bundle
-import android.util.Log
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.ImageView
 import android.widget.Toast
@@ -20,6 +20,7 @@ import androidx.lifecycle.ViewModelProvider
 import fr.free.nrw.commons.databinding.ActivityEditBinding
 import timber.log.Timber
 import java.io.File
+import kotlin.math.ceil
 
 /**
  * An activity class for editing and rotating images using LLJTran with EXIF attribute preservation.
@@ -42,8 +43,11 @@ class EditActivity : AppCompatActivity() {
         supportActionBar?.title = ""
         val intent = intent
         imageUri = intent.getStringExtra("image") ?: ""
-        vm = ViewModelProvider(this).get(EditViewModel::class.java)
+        vm = ViewModelProvider(this)[EditViewModel::class.java]
         val sourceExif = imageUri.toUri().path?.let { ExifInterface(it) }
+        //TODO(Deprecation : 'TAG_APERTURE: String' is deprecated. Deprecated in Java) Issue : #6001
+        // TODO(Deprecation : 'TAG_ISO: String' is deprecated. Deprecated in Java) Issue : #6001
+        @Suppress("DEPRECATION")
         val exifTags =
             arrayOf(
                 ExifInterface.TAG_APERTURE,
@@ -88,38 +92,36 @@ class EditActivity : AppCompatActivity() {
     private fun init() {
         binding.iv.adjustViewBounds = true
         binding.iv.scaleType = ImageView.ScaleType.MATRIX
-        binding.iv.post(
-            Runnable {
-                val options = BitmapFactory.Options()
-                options.inJustDecodeBounds = true
-                BitmapFactory.decodeFile(imageUri, options)
+        binding.iv.post {
+            val options = BitmapFactory.Options()
+            options.inJustDecodeBounds = true
+            BitmapFactory.decodeFile(imageUri, options)
 
-                val bitmapWidth = options.outWidth
-                val bitmapHeight = options.outHeight
+            val bitmapWidth = options.outWidth
+            val bitmapHeight = options.outHeight
 
-                // Check if the bitmap dimensions exceed a certain threshold
-                val maxBitmapSize = 2000 // Set your maximum size here
-                if (bitmapWidth > maxBitmapSize || bitmapHeight > maxBitmapSize) {
-                    val scaleFactor = calculateScaleFactor(bitmapWidth, bitmapHeight, maxBitmapSize)
-                    options.inSampleSize = scaleFactor
-                    options.inJustDecodeBounds = false
-                    val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)
-                    binding.iv.setImageBitmap(scaledBitmap)
-                    // Update the ImageView with the scaled bitmap
-                    val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()
-                    binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt()
-                    binding.iv.imageMatrix = scaleMatrix(scale, scale)
-                } else {
-                    options.inJustDecodeBounds = false
-                    val bitmap = BitmapFactory.decodeFile(imageUri, options)
-                    binding.iv.setImageBitmap(bitmap)
+            // Check if the bitmap dimensions exceed a certain threshold
+            val maxBitmapSize = 2000 // Set your maximum size here
+            if (bitmapWidth > maxBitmapSize || bitmapHeight > maxBitmapSize) {
+                val scaleFactor = calculateScaleFactor(bitmapWidth, bitmapHeight, maxBitmapSize)
+                options.inSampleSize = scaleFactor
+                options.inJustDecodeBounds = false
+                val scaledBitmap = BitmapFactory.decodeFile(imageUri, options)
+                binding.iv.setImageBitmap(scaledBitmap)
+                // Update the ImageView with the scaled bitmap
+                val scale = binding.iv.measuredWidth.toFloat() / scaledBitmap.width.toFloat()
+                binding.iv.layoutParams.height = (scale * scaledBitmap.height).toInt()
+                binding.iv.imageMatrix = scaleMatrix(scale, scale)
+            } else {
+                options.inJustDecodeBounds = false
+                val bitmap = BitmapFactory.decodeFile(imageUri, options)
+                binding.iv.setImageBitmap(bitmap)
 
-                    val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat()
-                    binding.iv.layoutParams.height = (scale * bitmapHeight).toInt()
-                    binding.iv.imageMatrix = scaleMatrix(scale, scale)
-                }
-            },
-        )
+                val scale = binding.iv.measuredWidth.toFloat() / bitmapWidth.toFloat()
+                binding.iv.layoutParams.height = (scale * bitmapHeight).toInt()
+                binding.iv.imageMatrix = scaleMatrix(scale, scale)
+            }
+        }
         binding.rotateBtn.setOnClickListener {
             animateImageHeight()
         }
@@ -143,15 +145,15 @@ class EditActivity : AppCompatActivity() {
         val drawableWidth: Float =
             binding.iv
                 .getDrawable()
-                .getIntrinsicWidth()
+                .intrinsicWidth
                 .toFloat()
         val drawableHeight: Float =
             binding.iv
                 .getDrawable()
-                .getIntrinsicHeight()
+                .intrinsicHeight
                 .toFloat()
-        val viewWidth: Float = binding.iv.getMeasuredWidth().toFloat()
-        val viewHeight: Float = binding.iv.getMeasuredHeight().toFloat()
+        val viewWidth: Float = binding.iv.measuredWidth.toFloat()
+        val viewHeight: Float = binding.iv.measuredHeight.toFloat()
         val rotation = imageRotation % 360
         val newRotation = rotation + 90
 
@@ -162,16 +164,23 @@ class EditActivity : AppCompatActivity() {
         Timber.d("Rotation $rotation")
         Timber.d("new Rotation $newRotation")
 
-        if (rotation == 0 || rotation == 180) {
-            imageScale = viewWidth / drawableWidth
-            newImageScale = viewWidth / drawableHeight
-            newViewHeight = (drawableWidth * newImageScale).toInt()
-        } else if (rotation == 90 || rotation == 270) {
-            imageScale = viewWidth / drawableHeight
-            newImageScale = viewWidth / drawableWidth
-            newViewHeight = (drawableHeight * newImageScale).toInt()
-        } else {
-            throw UnsupportedOperationException("rotation can 0, 90, 180 or 270. \${rotation} is unsupported")
+        when (rotation) {
+            0, 180 -> {
+                imageScale = viewWidth / drawableWidth
+                newImageScale = viewWidth / drawableHeight
+                newViewHeight = (drawableWidth * newImageScale).toInt()
+            }
+            90, 270 -> {
+                imageScale = viewWidth / drawableHeight
+                newImageScale = viewWidth / drawableWidth
+                newViewHeight = (drawableHeight * newImageScale).toInt()
+            }
+            else -> {
+                throw
+                UnsupportedOperationException(
+                    "rotation can 0, 90, 180 or 270. \${rotation} is unsupported"
+                )
+            }
         }
 
         val animator = ValueAnimator.ofFloat(0f, 1f).setDuration(1000L)
@@ -204,7 +213,7 @@ class EditActivity : AppCompatActivity() {
                 (complementaryAnimVal * viewHeight + animVal * newViewHeight).toInt()
             val animatedScale = complementaryAnimVal * imageScale + animVal * newImageScale
             val animatedRotation = complementaryAnimVal * rotation + animVal * newRotation
-            binding.iv.getLayoutParams().height = animatedHeight
+            binding.iv.layoutParams.height = animatedHeight
             val matrix: Matrix =
                 rotationMatrix(
                     animatedRotation,
@@ -218,8 +227,8 @@ class EditActivity : AppCompatActivity() {
                 drawableHeight / 2,
             )
             matrix.postTranslate(
-                -(drawableWidth - binding.iv.getMeasuredWidth()) / 2,
-                -(drawableHeight - binding.iv.getMeasuredHeight()) / 2,
+                -(drawableWidth - binding.iv.measuredWidth) / 2,
+                -(drawableHeight - binding.iv.measuredHeight) / 2,
             )
             binding.iv.setImageMatrix(matrix)
             binding.iv.requestLayout()
@@ -267,9 +276,9 @@ class EditActivity : AppCompatActivity() {
      */
     private fun copyExifData(editedImageExif: ExifInterface?) {
         for (attr in sourceExifAttributeList) {
-            Log.d("Tag is  ${attr.first}", "Value is ${attr.second}")
+            Timber.d("Value is ${attr.second}")
             editedImageExif!!.setAttribute(attr.first, attr.second)
-            Log.d("Tag is ${attr.first}", "Value is ${attr.second}")
+            Timber.d("Value is ${attr.second}")
         }
 
         editedImageExif?.saveAttributes()
@@ -298,9 +307,10 @@ class EditActivity : AppCompatActivity() {
         var scaleFactor = 1
 
         if (originalWidth > maxSize || originalHeight > maxSize) {
-            // Calculate the largest power of 2 that is less than or equal to the desired width and height
-            val widthRatio = Math.ceil((originalWidth.toDouble() / maxSize.toDouble())).toInt()
-            val heightRatio = Math.ceil((originalHeight.toDouble() / maxSize.toDouble())).toInt()
+            // Calculate the largest power of 2 that is less than or equal to the desired
+            // width and height
+            val widthRatio = ceil((originalWidth.toDouble() / maxSize.toDouble())).toInt()
+            val heightRatio = ceil((originalHeight.toDouble() / maxSize.toDouble())).toInt()
 
             scaleFactor = if (widthRatio > heightRatio) widthRatio else heightRatio
         }

app/src/main/java/fr/free/nrw/commons/filepicker/Costants.kt

@@ -0,0 +1,29 @@
+package fr.free.nrw.commons.filepicker
+
+interface Constants {
+    companion object {
+        const val DEFAULT_FOLDER_NAME = "CommonsContributions"
+    }
+
+    /**
+     * Provides the request codes for permission handling
+     */
+    interface RequestCodes {
+        companion object {
+            const val LOCATION = 1
+            const val STORAGE = 2
+        }
+    }
+
+    /**
+     * Provides locations as string for corresponding operations
+     */
+    interface BundleKeys {
+        companion object {
+            const val FOLDER_NAME = "fr.free.nrw.commons.folder_name"
+            const val ALLOW_MULTIPLE = "fr.free.nrw.commons.allow_multiple"
+            const val COPY_TAKEN_PHOTOS = "fr.free.nrw.commons.copy_taken_photos"
+            const val COPY_PICKED_IMAGES = "fr.free.nrw.commons.copy_picked_images"
+        }
+    }
+}

app/src/main/java/fr/free/nrw/commons/filepicker/DefaultCallback.kt

@@ -0,0 +1,12 @@
+package fr.free.nrw.commons.filepicker
+
+/**
+ * Provides abstract methods which are overridden while handling Contribution Results
+ * inside the ContributionsController
+ */
+abstract class DefaultCallback: FilePicker.Callbacks {
+
+    override fun onImagePickerError(e: Exception, source: FilePicker.ImageSource, type: Int) {}
+
+    override fun onCanceled(source: FilePicker.ImageSource, type: Int) {}
+}

app/src/main/java/fr/free/nrw/commons/filepicker/ExtendedFileProvider.kt

@@ -0,0 +1,5 @@
+package fr.free.nrw.commons.filepicker
+
+import androidx.core.content.FileProvider
+
+class ExtendedFileProvider: FileProvider() {}