Merge branch 'main' into Circular-Progress-bar-nomination-for-deletion-…

…commons-app#5531

CREDITS

@@ -53,7 +53,6 @@ their contribution to the product.
 * Butterknife
 * GSON
 * Timber
-* MapBox
 
 3rd party open source apps from which significant code has been reused:
 * Android Wikipedia app https://github.com/wikimedia/apps-android-wikipedia

app/build.gradle

@@ -49,10 +49,8 @@ dependencies {
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
-    implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
     implementation "com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:$ADAPTER_DELEGATES_VERSION"
     implementation "com.hannesdorfmann:adapterdelegates4-pagination:$ADAPTER_DELEGATES_VERSION"
     implementation "androidx.paging:paging-runtime-ktx:$PAGING_VERSION"

app/src/main/java/fr/free/nrw/commons/BaseMarker.kt

@@ -0,0 +1,64 @@
+package fr.free.nrw.commons
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import fr.free.nrw.commons.location.LatLng
+import fr.free.nrw.commons.nearby.Place
+
+class BaseMarker {
+    private var _position: LatLng = LatLng(0.0, 0.0, 0f)
+    private var _title: String = ""
+    private var _place: Place = Place()
+    private var _icon: Bitmap? = null
+
+    var position: LatLng
+        get() = _position
+        set(value) {
+            _position = value
+        }
+    var title: String
+        get() = _title
+        set(value) {
+            _title = value
+        }
+
+    var place: Place
+        get() = _place
+        set(value) {
+            _place = value
+        }
+    var icon: Bitmap?
+        get() = _icon
+        set(value) {
+            _icon = value
+        }
+
+    constructor() {
+    }
+
+    fun fromResource(context: Context, drawableResId: Int) {
+        val drawable: Drawable = context.resources.getDrawable(drawableResId)
+        icon = if (drawable is BitmapDrawable) {
+            (drawable as BitmapDrawable).bitmap
+        } else {
+            val bitmap = Bitmap.createBitmap(
+                drawable.intrinsicWidth,
+                drawable.intrinsicHeight, Bitmap.Config.ARGB_8888
+            )
+            val canvas = Canvas(bitmap)
+            drawable.setBounds(0, 0, canvas.width, canvas.height)
+            drawable.draw(canvas)
+            bitmap
+        }
+    }
+}
+
+
+
+
+
+
+

app/src/main/java/fr/free/nrw/commons/CameraPosition.kt

@@ -0,0 +1,33 @@
+package fr.free.nrw.commons
+
+import android.os.Parcel
+import android.os.Parcelable
+
+class CameraPosition(val latitude: Double, val longitude: Double, val zoom: Double) : Parcelable {
+
+    constructor(parcel: Parcel) : this(
+        parcel.readDouble(),
+        parcel.readDouble(),
+        parcel.readDouble()
+    )
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeDouble(latitude)
+        parcel.writeDouble(longitude)
+        parcel.writeDouble(zoom)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<CameraPosition> {
+        override fun createFromParcel(parcel: Parcel): CameraPosition {
+            return CameraPosition(parcel)
+        }
+
+        override fun newArray(size: Int): Array<CameraPosition?> {
+            return arrayOfNulls(size)
+        }
+    }
+}

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

@@ -9,9 +9,11 @@
 import static org.acra.ReportField.USER_COMMENT;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.os.Build;
@@ -22,6 +24,7 @@
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
+import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.items.BookmarkItemsDao.Table;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
@@ -33,6 +36,7 @@
 import fr.free.nrw.commons.data.DBOpenHelper;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
+import fr.free.nrw.commons.language.AppLanguageLookUpTable;
 import fr.free.nrw.commons.logging.FileLoggingTree;
 import fr.free.nrw.commons.logging.LogUtils;
 import fr.free.nrw.commons.media.CustomOkHttpNetworkFetcher;
@@ -57,7 +61,6 @@
 import org.acra.annotation.AcraDialog;
 import org.acra.annotation.AcraMailSender;
 import org.acra.data.StringFormat;
-import fr.free.nrw.commons.language.AppLanguageLookUpTable;
 import timber.log.Timber;
 
 @AcraCore(
@@ -82,6 +85,9 @@
 
 public class CommonsApplication extends MultiDexApplication {
 
+    public static final String loginMessageIntentKey = "loginMessage";
+    public static final String loginUsernameIntentKey = "loginUsername";
+
     public static final String IS_LIMITED_CONNECTION_MODE_ENABLED = "is_limited_connection_mode_enabled";
     @Inject
     SessionManager sessionManager;
@@ -137,12 +143,12 @@ public AppLanguageLookUpTable getLanguageLookUpTable() {
     ContributionDao contributionDao;
 
     /**
-     *  In-memory list of contributions whose uploads have been paused by the user
+     * In-memory list of contributions whose uploads have been paused by the user
      */
     public static Map<String, Boolean> pauseUploads = new HashMap<>();
 
     /**
-     *  In-memory list of uploads that have been cancelled by the user
+     * In-memory list of uploads that have been cancelled by the user
      */
     public static HashSet<String> cancelledUploads = new HashSet<>();
 
@@ -339,4 +345,96 @@ public interface LogoutListener {
 
         void onLogoutComplete();
     }
+
+    /**
+     * This listener is responsible for handling post-logout actions, specifically invoking the LoginActivity
+     * with relevant intent parameters. It does not perform the actual logout operation.
+     */
+    public static class BaseLogoutListener implements CommonsApplication.LogoutListener {
+
+        Context ctx;
+        String loginMessage, userName;
+
+        /**
+         * Constructor for BaseLogoutListener.
+         *
+         * @param ctx Application context
+         */
+        public BaseLogoutListener(final Context ctx) {
+            this.ctx = ctx;
+        }
+
+        /**
+         * Constructor for BaseLogoutListener
+         *
+         * @param ctx           The application context, used for invoking the LoginActivity and passing relevant intent parameters as part of the post-logout process.
+         * @param loginMessage  Message to be displayed on the login page
+         * @param loginUsername Username to be pre-filled on the login page
+         */
+        public BaseLogoutListener(final Context ctx, final String loginMessage,
+            final String loginUsername) {
+            this.ctx = ctx;
+            this.loginMessage = loginMessage;
+            this.userName = loginUsername;
+        }
+
+        @Override
+        public void onLogoutComplete() {
+            Timber.d("Logout complete callback received.");
+            final Intent loginIntent = new Intent(ctx, LoginActivity.class);
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            if (loginMessage != null) {
+                loginIntent.putExtra(loginMessageIntentKey, loginMessage);
+            }
+            if (userName != null) {
+                loginIntent.putExtra(loginUsernameIntentKey, userName);
+            }
+
+            ctx.startActivity(loginIntent);
+        }
+    }
+
+    /**
+     * This class is an extension of BaseLogoutListener, providing additional functionality or customization
+     * for the logout process. It includes specific actions to be taken during logout, such as handling redirection to the login screen.
+     */
+    public static class ActivityLogoutListener extends BaseLogoutListener {
+
+        Activity activity;
+
+
+        /**
+         * Constructor for ActivityLogoutListener.
+         *
+         * @param activity The activity context from which the logout is initiated. Used to perform actions such as finishing the activity.
+         * @param ctx           The application context, used for invoking the LoginActivity and passing relevant intent parameters as part of the post-logout process.
+         */
+        public ActivityLogoutListener(final Activity activity, final Context ctx) {
+            super(ctx);
+            this.activity = activity;
+        }
+
+        /**
+         * Constructor for ActivityLogoutListener with additional parameters for the login screen.
+         *
+         * @param activity      The activity context from which the logout is initiated. Used to perform actions such as finishing the activity.
+         * @param ctx           The application context, used for invoking the LoginActivity and passing relevant intent parameters as part of the post-logout process.
+         * @param loginMessage  Message to be displayed on the login page after logout.
+         * @param loginUsername Username to be pre-filled on the login page after logout.
+         */
+        public ActivityLogoutListener(final Activity activity, final Context ctx,
+            final String loginMessage, final String loginUsername) {
+            super(activity, loginMessage, loginUsername);
+            this.activity = activity;
+        }
+
+        @Override
+        public void onLogoutComplete() {
+            super.onLogoutComplete();
+            activity.finish();
+        }
+    }
 }
+

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

@@ -2,7 +2,8 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
+import fr.free.nrw.commons.CameraPosition;
+import fr.free.nrw.commons.Media;
 
 /**
  * Helper class for starting the activity
@@ -52,6 +53,17 @@ public LocationPicker.IntentBuilder activityKey(
           return this;
         }
 
+        /**
+         * Gets and puts media in intent
+         * @param media Media
+         * @return LocationPicker.IntentBuilder
+         */
+        public LocationPicker.IntentBuilder media(
+                final Media media) {
+              intent.putExtra(LocationPickerConstants.MEDIA, media);
+              return this;
+            }
+
         /**
          * Gets and sets the activity
          * @param activity Activity