From 913d2e61b0b7eca66b4f082d0e22826ad1c28d07 Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sat, 19 Oct 2024 23:42:57 +1100
Subject: [PATCH 01/13] Check how many times these methods are called in one
 test

---
 .idea/inspectionProfiles/Project_Default.xml  |  6 --
 app/.idea/gradle.xml                          | 13 ++++
 app/.idea/vcs.xml                             |  6 ++
 app/.idea/workspace.xml                       | 70 +++++++++++++++++++
 .../nrw/commons/review/ReviewActivity.java    |  3 +
 build.gradle                                  |  2 +-
 6 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 app/.idea/gradle.xml
 create mode 100644 app/.idea/vcs.xml
 create mode 100644 app/.idea/workspace.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index a5d456928e..dabfc6386e 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,8 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="AndroidLintNewerVersionAvailable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ClassWithOnlyPrivateConstructors" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ConfusingElse" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="reportWhenNoStatementFollow" value="true" />
@@ -10,7 +8,6 @@
     <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="DefaultNotLastCaseInSwitch" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ExplicitThis" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="REPORT_VARIABLES" value="true" />
       <option name="REPORT_PARAMETERS" value="true" />
@@ -25,13 +22,11 @@
       <option name="ignoreInMatchingInstanceof" value="false" />
     </inspection_tool>
     <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantFieldInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreSerializable" value="false" />
       <option name="ignoreCloneable" value="false" />
     </inspection_tool>
-    <inspection_tool class="RedundantMethodOverride" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="SimplifiableEqualsExpression" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="TypeParameterExtendsFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessarilyQualifiedStaticUsage" enabled="true" level="WARNING" enabled_by_default="true">
@@ -47,6 +42,5 @@
     <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessarySuperConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UnnecessaryThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryToStringCall" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml
new file mode 100644
index 0000000000..4019936a4d
--- /dev/null
+++ b/app/.idea/gradle.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="resolveExternalAnnotations" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
new file mode 100644
index 0000000000..6c0b863585
--- /dev/null
+++ b/app/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/.idea/workspace.xml b/app/.idea/workspace.xml
new file mode 100644
index 0000000000..a280d2e353
--- /dev/null
+++ b/app/.idea/workspace.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="cede988b-a065-4b78-9289-58368dc2c403" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/../.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/../build.gradle" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ClangdSettings">
+    <option name="formatViaClangd" value="false" />
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand />
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 6
+}</component>
+  <component name="ProjectId" id="2nBUlxnjPg3kVufGM7QIT8yfWKt" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "android.gradle.sync.needed": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "main",
+    "ignore.virus.scanning.warn.message": "true",
+    "last_opened_file_path": "D:/idea java project/apps-android-commons",
+    "project.structure.last.edited": "SDK Location",
+    "project.structure.proportion": "0.17",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "preferences.lookFeel"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="cede988b-a065-4b78-9289-58368dc2c403" name="Changes" comment="" />
+      <created>1728446117690</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1728446117690</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 5eb758ada8..33cb050948 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -29,6 +29,8 @@
 
 public class ReviewActivity extends BaseActivity {
 
+    public static int runRandomizerCallCount = 0;
+
 
     private ActivityReviewBinding binding;
 
@@ -133,6 +135,7 @@ public boolean onSupportNavigateUp() {
 
     @SuppressLint("CheckResult")
     public boolean runRandomizer() {
+        runRandomizerCallCount++;
         hasNonHiddenCategories = false;
         binding.pbReviewImage.setVisibility(View.VISIBLE);
         binding.viewPagerReview.setCurrentItem(0);
diff --git a/build.gradle b/build.gradle
index 003163cb8f..9f976f5c74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.3.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'

From 4521b5fe9919096d76447e998151d140c4505b14 Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sat, 19 Oct 2024 23:55:19 +1100
Subject: [PATCH 02/13] back to original

---
 .../main/java/fr/free/nrw/commons/review/ReviewActivity.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 33cb050948..17efebe3b1 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -29,9 +29,6 @@
 
 public class ReviewActivity extends BaseActivity {
 
-    public static int runRandomizerCallCount = 0;
-
-
     private ActivityReviewBinding binding;
 
     MediaDetailFragment mediaDetailFragment;
@@ -135,7 +132,7 @@ public boolean onSupportNavigateUp() {
 
     @SuppressLint("CheckResult")
     public boolean runRandomizer() {
-        runRandomizerCallCount++;
+
         hasNonHiddenCategories = false;
         binding.pbReviewImage.setVisibility(View.VISIBLE);
         binding.viewPagerReview.setCurrentItem(0);

From febed893e8f2a4cda9a304872c659753e2c6d14d Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sun, 20 Oct 2024 00:43:18 +1100
Subject: [PATCH 03/13] Caching mechanism to reduce API calls

---
 .../nrw/commons/review/ReviewActivity.java    | 108 +++++++++++++-----
 1 file changed, 80 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 17efebe3b1..f4d3012c8e 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -22,9 +23,12 @@
 import fr.free.nrw.commons.theme.BaseActivity;
 import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.ViewUtil;
+import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
+import java.util.ArrayList;
+import java.util.List;
 import javax.inject.Inject;
 
 public class ReviewActivity extends BaseActivity {
@@ -34,6 +38,10 @@ public class ReviewActivity extends BaseActivity {
     MediaDetailFragment mediaDetailFragment;
     public ReviewPagerAdapter reviewPagerAdapter;
     public ReviewController reviewController;
+
+
+
+
     @Inject
     ReviewHelper reviewHelper;
     @Inject
@@ -52,6 +60,13 @@ public class ReviewActivity extends BaseActivity {
     final String SAVED_MEDIA = "saved_media";
     private Media media;
 
+    private List<Media> cachedMedia = new ArrayList<>();
+
+    private static final String PREF_NAME = "ReviewActivityPrefs";
+    private static final String LAST_CACHE_TIME_KEY = "lastCacheTime";
+    private static final int CACHE_SIZE = 50;
+    private static final long CACHE_EXPIRY_TIME = 24 * 60 * 60 * 1000;
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -99,10 +114,10 @@ protected void onCreate(Bundle savedInstanceState) {
         d[2].setColorFilter(getApplicationContext().getResources().getColor(R.color.button_blue), PorterDuff.Mode.SRC_IN);
 
         if (savedInstanceState != null && savedInstanceState.getParcelable(SAVED_MEDIA) != null) {
-            updateImage(savedInstanceState.getParcelable(SAVED_MEDIA)); // Use existing media if we have one
+            updateImage(savedInstanceState.getParcelable(SAVED_MEDIA));
             setUpMediaDetailOnOrientation();
         } else {
-            runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added
+            runRandomizer();
         }
 
         binding.skipImage.setOnClickListener(view -> {
@@ -132,35 +147,69 @@ public boolean onSupportNavigateUp() {
 
     @SuppressLint("CheckResult")
     public boolean runRandomizer() {
-
         hasNonHiddenCategories = false;
         binding.pbReviewImage.setVisibility(View.VISIBLE);
         binding.viewPagerReview.setCurrentItem(0);
-        // Finds non-hidden categories from Media instance
-        compositeDisposable.add(reviewHelper.getRandomMedia()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::checkWhetherFileIsUsedInWikis));
+
+        if (cachedMedia.isEmpty() || isCacheExpired()) {
+            fetchAndCacheMedia();
+        } else {
+            processNextCachedMedia();
+        }
         return true;
     }
 
+    private void fetchAndCacheMedia() {
+        compositeDisposable.add(Observable.range(0, CACHE_SIZE)
+            .flatMap(i -> reviewHelper.getRandomMedia().toObservable())
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .toList()
+            .subscribe(mediaList -> {
+                cachedMedia.clear();
+                cachedMedia.addAll(mediaList);
+                updateLastCacheTime();
+                processNextCachedMedia();
+            }, this::handleError));
+    }
+
+    private void processNextCachedMedia() {
+        if (!cachedMedia.isEmpty()) {
+            Media media = cachedMedia.remove(0);
+            checkWhetherFileIsUsedInWikis(media);
+        } else {
+            fetchAndCacheMedia();
+        }
+    }
+
+    private boolean isCacheExpired() {
+        SharedPreferences prefs = getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        long lastCacheTime = prefs.getLong(LAST_CACHE_TIME_KEY, 0);
+        long currentTime = System.currentTimeMillis();
+        return (currentTime - lastCacheTime) > CACHE_EXPIRY_TIME;
+    }
+
+    private void updateLastCacheTime() {
+        SharedPreferences prefs = getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putLong(LAST_CACHE_TIME_KEY, System.currentTimeMillis());
+        editor.apply();
+    }
+
     /**
      * Check whether media is used or not in any Wiki Page
      */
-    @SuppressLint("CheckResult")
     private void checkWhetherFileIsUsedInWikis(final Media media) {
         compositeDisposable.add(reviewHelper.checkFileUsage(media.getFilename())
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(result -> {
-                // result false indicates media is not used in any wiki
                 if (!result) {
-                    // Finds non-hidden categories from Media instance
                     findNonHiddenCategories(media);
                 } else {
-                    runRandomizer();
+                    processNextCachedMedia();
                 }
-            }));
+            }, this::handleError));
     }
 
     /**
@@ -181,7 +230,6 @@ private void findNonHiddenCategories(Media media) {
         updateImage(media);
     }
 
-    @SuppressLint("CheckResult")
     private void updateImage(Media media) {
         reviewHelper.addViewedImagesToDB(media.getPageId());
         this.media = media;
@@ -191,27 +239,26 @@ private void updateImage(Media media) {
             return;
         }
 
-        //If The Media User and Current Session Username is same then Skip the Image
         if (media.getUser() != null && media.getUser().equals(AccountUtil.getUserName(getApplicationContext()))) {
-            runRandomizer();
+            processNextCachedMedia();
             return;
         }
 
         binding.reviewImageView.setImageURI(media.getImageUrl());
 
-        reviewController.onImageRefreshed(media); //file name is updated
+        reviewController.onImageRefreshed(media);
         compositeDisposable.add(reviewHelper.getFirstRevisionOfFile(fileName)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(revision -> {
-                    reviewController.firstRevision = revision;
-                    reviewPagerAdapter.updateFileInformation();
-                    @SuppressLint({"StringFormatInvalid", "LocalSuppress"}) String caption = String.format(getString(R.string.review_is_uploaded_by), fileName, revision.getUser());
-                    binding.tvImageCaption.setText(caption);
-                    binding.pbReviewImage.setVisibility(View.GONE);
-                    reviewImageFragment = getInstanceOfReviewImageFragment();
-                    reviewImageFragment.enableButtons();
-                }));
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(revision -> {
+                reviewController.firstRevision = revision;
+                reviewPagerAdapter.updateFileInformation();
+                String caption = String.format(getString(R.string.review_is_uploaded_by), fileName, revision.getUser());
+                binding.tvImageCaption.setText(caption);
+                binding.pbReviewImage.setVisibility(View.GONE);
+                reviewImageFragment = getInstanceOfReviewImageFragment();
+                reviewImageFragment.enableButtons();
+            }, this::handleError));
         binding.viewPagerReview.setCurrentItem(0);
     }
 
@@ -258,6 +305,11 @@ public void showReviewImageInfo() {
                 null,
                 null);
     }
+    private void handleError(Throwable error) {
+        binding.pbReviewImage.setVisibility(View.GONE);
+        ViewUtil.showShortSnackbar(binding.drawerLayout, R.string.error_review);
+        // 可以添加更详细的错误处理逻辑
+    }
 
 
     @Override

From 66f917b18965d16f3fd74c68ad02e5ee0f7be347 Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sat, 26 Oct 2024 05:09:48 +1100
Subject: [PATCH 04/13] Caching mechanism to reduce API calls

---
 .../main/java/fr/free/nrw/commons/review/ReviewActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index f4d3012c8e..3c832687f3 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -308,7 +308,7 @@ public void showReviewImageInfo() {
     private void handleError(Throwable error) {
         binding.pbReviewImage.setVisibility(View.GONE);
         ViewUtil.showShortSnackbar(binding.drawerLayout, R.string.error_review);
-        // 可以添加更详细的错误处理逻辑
+
     }
 
 

From 55e59b8ec790795938547c9ccb32305af93d8840 Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sat, 26 Oct 2024 06:04:15 +1100
Subject: [PATCH 05/13] change the ReviewHelper for api called

---
 .../free/nrw/commons/review/ReviewHelper.kt   | 80 ++++++++++++++-----
 1 file changed, 60 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
index 8a77c11edb..b7dea9c1ab 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
@@ -23,13 +23,17 @@ class ReviewHelper
         @JvmField @Inject
         var dao: ReviewDao? = null
 
-        /**
-         * Fetches recent changes from MediaWiki API
-         * Calls the API to get the latest 50 changes
-         * When more results are available, the query gets continued beyond this range
-         *
-         * @return
-         */
+
+
+    /**
+     * Gets multiple random media items for review.
+     * - Fetches recent changes and filters them
+     * - Checks if files are nominated for deletion
+     * - Filters out already reviewed images
+     *
+     * @param count Number of media items to fetch
+     * @return Observable of Media items
+     */
         private fun getRecentChanges() =
             reviewInterface
                 .getRecentChanges()
@@ -38,19 +42,40 @@ class ReviewHelper
                 .flatMapIterable { changes: List<MwQueryPage>? -> changes }
                 .filter { isChangeReviewable(it) }
 
-        /**
-         * Gets a random file change for review.  Checks if the image has already been shown to the user
-         * - Picks a random file from those changes
-         * - Checks if the file is nominated for deletion
-         * - Retries upto 5 times for getting a file which is not nominated for deletion
-         *
-         * @return Random file change
-         */
-        fun getRandomMedia(): Single<Media> =
-            getRecentChanges()
-                .flatMapSingle(::getRandomMediaFromRecentChange)
-                .filter { !it.filename.isNullOrBlank() && !getReviewStatus(it.pageId) }
-                .firstOrError()
+    /**
+     * Gets multiple random media items for review.
+     * - Fetches recent changes and filters them
+     * - Checks if files are nominated for deletion
+     * - Filters out already reviewed images
+     *
+     * @param count Number of media items to fetch
+     * @return Observable of Media items
+     */
+    fun getRandomMediaBatch(count: Int): Observable<Media> =
+        getRecentChanges()
+            .flatMapSingle(::getRandomMediaFromRecentChange)
+            .filter { media ->
+                !media.filename.isNullOrBlank() &&
+                        !getReviewStatus(media.pageId)
+            }
+            .take(count.toLong())
+            .onErrorResumeNext { error: Throwable ->
+                Timber.e(error, "Error getting random media batch")
+                Observable.empty()
+            }
+
+
+
+    /**
+     * Gets a random file change for review.
+     *
+     * @return Random file change
+     */
+    fun getRandomMedia(): Single<Media> =
+        getRandomMediaBatch(1)
+            .firstOrError()
+
+
 
         /**
          * Returns a proper Media object if the file is not already nominated for deletion
@@ -108,6 +133,20 @@ class ReviewHelper
                 .getGlobalUsageInfo(filename)
                 .map { it.query()?.firstPage()?.checkWhetherFileIsUsedInWikis() }
 
+
+
+
+    fun checkFileUsageBatch(filenames: List<String>): Observable<Pair<String, Boolean>> =
+        Observable.fromIterable(filenames)
+            .flatMap { filename ->
+                checkFileUsage(filename)
+                    .map { isUsed -> Pair(filename, isUsed) }
+            }
+            .onErrorResumeNext { error: Throwable ->
+                Timber.e(error, "Error checking file usage batch")
+                Observable.empty()
+            }
+
         /**
          * Checks if the change is reviewable or not.
          * - checks the type and revisionId of the change
@@ -145,5 +184,6 @@ class ReviewHelper
 
         companion object {
             private val imageExtensions = arrayOf(".jpg", ".jpeg", ".png")
+            private const val MAX_RETRIES = 3
         }
     }

From 7ffa271d433cb634fb2811ef22966d0c76cc6313 Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sat, 26 Oct 2024 16:53:50 +1100
Subject: [PATCH 06/13] change the ReviewHelper for api called

---
 .../nrw/commons/review/ReviewActivity.java    | 170 ++++++++++++++++--
 .../free/nrw/commons/review/ReviewHelper.kt   |  26 ++-
 2 files changed, 178 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 3c832687f3..9e998adf14 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -12,6 +12,7 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.core.util.Pair;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import fr.free.nrw.commons.Media;
@@ -62,9 +63,14 @@ public class ReviewActivity extends BaseActivity {
 
     private List<Media> cachedMedia = new ArrayList<>();
 
+    /** Constants for managing media cache in the review activity */
+    // Name of SharedPreferences file for storing review activity preferences
     private static final String PREF_NAME = "ReviewActivityPrefs";
+    // Key for storing the timestamp of last cache update
     private static final String LAST_CACHE_TIME_KEY = "lastCacheTime";
+    // Maximum number of media files to store in cache
     private static final int CACHE_SIZE = 50;
+    // Cache expiration time in milliseconds (24 hours)
     private static final long CACHE_EXPIRY_TIME = 24 * 60 * 60 * 1000;
 
     @Override
@@ -113,10 +119,21 @@ protected void onCreate(Bundle savedInstanceState) {
         Drawable d[]=binding.skipImage.getCompoundDrawablesRelative();
         d[2].setColorFilter(getApplicationContext().getResources().getColor(R.color.button_blue), PorterDuff.Mode.SRC_IN);
 
+        /**
+         * Restores the previous state of the activity or initializes a new review session.
+         * Checks if there's a saved media state from a previous session (e.g., before screen rotation).
+         * If found, restores the last viewed image and its detail view.
+         * Otherwise, starts a new random image review session.
+         *
+         * @param savedInstanceState Bundle containing the activity's previously saved state, if any
+         */
         if (savedInstanceState != null && savedInstanceState.getParcelable(SAVED_MEDIA) != null) {
+            // Restore the previously viewed image if state exists
             updateImage(savedInstanceState.getParcelable(SAVED_MEDIA));
+            // Restore media detail view (handles configuration changes like screen rotation)
             setUpMediaDetailOnOrientation();
         } else {
+            // Start fresh review session with a random image
             runRandomizer();
         }
 
@@ -145,54 +162,173 @@ public boolean onSupportNavigateUp() {
         return true;
     }
 
+    /**
+     * Initiates the process of loading a random media file for review.
+     * This method:
+     * - Resets the UI state
+     * - Shows loading indicator
+     * - Manages media cache
+     * - Either loads from cache or fetches new media
+     *
+     * The method is annotated with @SuppressLint("CheckResult") as the Observable
+     * subscription is handled through CompositeDisposable in the implementation.
+     *
+     * @return true indicating successful initiation of the randomization process
+     */
     @SuppressLint("CheckResult")
     public boolean runRandomizer() {
+        // Reset flag for tracking presence of non-hidden categories
         hasNonHiddenCategories = false;
+        // Display loading indicator while fetching media
         binding.pbReviewImage.setVisibility(View.VISIBLE);
+        // Reset view pager to first page
         binding.viewPagerReview.setCurrentItem(0);
 
+        // Check cache status and determine source of next media
         if (cachedMedia.isEmpty() || isCacheExpired()) {
+            // Fetch and cache new media if cache is empty or expired
             fetchAndCacheMedia();
         } else {
+            // Use next media file from existing cache
             processNextCachedMedia();
         }
         return true;
     }
 
+    /**
+     * Batch checks whether multiple files from the cache are used in wikis.
+     * This is a more efficient way to process multiple files compared to checking them one by one.
+     *
+     * @param mediaList List of Media objects to check for usage
+     */
+    /**
+     * Batch checks whether multiple files from the cache are used in wikis.
+     * This is a more efficient way to process multiple files compared to checking them one by one.
+     *
+     * @param mediaList List of Media objects to check for usage
+     */
+    private void batchCheckFilesUsage(List<Media> mediaList) {
+        // Extract filenames from media objects
+        List<String> filenames = new ArrayList<>();
+        for (Media media : mediaList) {
+            if (media.getFilename() != null) {
+                filenames.add(media.getFilename());
+            }
+        }
+
+        compositeDisposable.add(
+            reviewHelper.checkFileUsageBatch(filenames)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .toList()
+                .subscribe(results -> {
+                    // Process each result
+                    for (kotlin.Pair<String, Boolean> result : results) {
+                        String filename = result.getFirst();
+                        Boolean isUsed = result.getSecond();
+
+                        // Find corresponding media object
+                        for (Media media : mediaList) {
+                            if (filename.equals(media.getFilename())) {
+                                if (!isUsed) {
+                                    // If file is not used, proceed with category check
+                                    findNonHiddenCategories(media);
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }, this::handleError));
+    }
+
+
+    /**
+     * Fetches and caches new media files for review.
+     * Uses RxJava to:
+     * - Generate a range of indices for the desired cache size
+     * - Fetch random media files asynchronously
+     * - Handle thread scheduling between IO and UI operations
+     * - Store the fetched media in cache
+     *
+     * The operation is added to compositeDisposable for proper lifecycle management.
+     */
     private void fetchAndCacheMedia() {
-        compositeDisposable.add(Observable.range(0, CACHE_SIZE)
-            .flatMap(i -> reviewHelper.getRandomMedia().toObservable())
-            .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
-            .toList()
-            .subscribe(mediaList -> {
-                cachedMedia.clear();
-                cachedMedia.addAll(mediaList);
-                updateLastCacheTime();
-                processNextCachedMedia();
-            }, this::handleError));
+        compositeDisposable.add(
+            Observable.range(0, CACHE_SIZE)
+                .flatMap(i -> reviewHelper.getRandomMedia().toObservable())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .toList()
+                .subscribe(mediaList -> {
+                    // Clear existing cache
+                    cachedMedia.clear();
+
+                    // Start batch check process
+                    batchCheckFilesUsage(mediaList);
+
+                    // Update cache with new media
+                    cachedMedia.addAll(mediaList);
+                    updateLastCacheTime();
+
+                    // Process first media item if available
+                    if (!cachedMedia.isEmpty()) {
+                        processNextCachedMedia();
+                    }
+                }, this::handleError));
     }
 
+    /**
+     * Processes the next media file from the cache.
+     * If cache is not empty, removes and processes the first media file.
+     * If cache is empty, triggers a new fetch operation.
+     *
+     * This method ensures continuous flow of media files for review
+     * while maintaining the cache mechanism.
+     */
     private void processNextCachedMedia() {
         if (!cachedMedia.isEmpty()) {
+            // Remove and get the first media from cache
             Media media = cachedMedia.remove(0);
+
             checkWhetherFileIsUsedInWikis(media);
         } else {
+            // Refill cache if empty
             fetchAndCacheMedia();
         }
     }
 
+    /**
+     * Checks if the current cache has expired.
+     * Cache expiration is determined by comparing the last cache time
+     * with the current time against the configured expiry duration.
+     *
+     * @return true if cache has expired, false otherwise
+     */
     private boolean isCacheExpired() {
+        // Get shared preferences instance
         SharedPreferences prefs = getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+
         long lastCacheTime = prefs.getLong(LAST_CACHE_TIME_KEY, 0);
+
         long currentTime = System.currentTimeMillis();
+
         return (currentTime - lastCacheTime) > CACHE_EXPIRY_TIME;
     }
 
+
+    /**
+     * Updates the timestamp of the last cache operation.
+     * Stores the current time in SharedPreferences to track
+     * cache freshness for future operations.
+     */
     private void updateLastCacheTime() {
+
         SharedPreferences prefs = getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+
         SharedPreferences.Editor editor = prefs.edit();
+        // Store current timestamp as last cache time
         editor.putLong(LAST_CACHE_TIME_KEY, System.currentTimeMillis());
+        // Apply changes asynchronously
         editor.apply();
     }
 
@@ -305,10 +441,20 @@ public void showReviewImageInfo() {
                 null,
                 null);
     }
+    /**
+     * Handles errors that occur during media processing operations.
+     * This is a generic error handler that:
+     * - Hides the loading indicator
+     * - Shows a user-friendly error message via Snackbar
+     *
+     * Used as error callback for RxJava operations and other async tasks.
+     *
+     * @param error The Throwable that was caught during operation
+     */
     private void handleError(Throwable error) {
         binding.pbReviewImage.setVisibility(View.GONE);
+        // Show error message to user via Snackbar
         ViewUtil.showShortSnackbar(binding.drawerLayout, R.string.error_review);
-
     }
 
 
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
index b7dea9c1ab..ad0cd061e2 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
@@ -26,13 +26,11 @@ class ReviewHelper
 
 
     /**
-     * Gets multiple random media items for review.
-     * - Fetches recent changes and filters them
-     * - Checks if files are nominated for deletion
-     * - Filters out already reviewed images
+     * Fetches recent changes from MediaWiki API
+     * Calls the API to get the latest 50 changes
+     * When more results are available, the query gets continued beyond this range
      *
-     * @param count Number of media items to fetch
-     * @return Observable of Media items
+     * @return
      */
         private fun getRecentChanges() =
             reviewInterface
@@ -136,13 +134,29 @@ class ReviewHelper
 
 
 
+
+    /**
+     * Batch checks whether multiple files are being used in any wiki pages.
+     * This method processes a list of filenames in parallel using RxJava Observables.
+     *
+     * @param filenames A list of filenames to check for usage
+     * @return Observable emitting pairs of filename and usage status:
+     *         - The String represents the filename
+     *         - The Boolean indicates whether the file is used (true) or not (false)
+     *         If an error occurs during processing, it will log the error and emit an empty Observable
+     */
     fun checkFileUsageBatch(filenames: List<String>): Observable<Pair<String, Boolean>> =
+        // Convert the list of filenames into an Observable stream
         Observable.fromIterable(filenames)
+            // For each filename, check its usage and pair it with the result
             .flatMap { filename ->
                 checkFileUsage(filename)
+                    // Create a pair of the filename and its usage status
                     .map { isUsed -> Pair(filename, isUsed) }
             }
+            // Handle any errors that occur during processing
             .onErrorResumeNext { error: Throwable ->
+                // Log the error and continue with an empty Observable
                 Timber.e(error, "Error checking file usage batch")
                 Observable.empty()
             }

From 36dcc43f41bc04763fec270b8b2aecdc412732c4 Mon Sep 17 00:00:00 2001
From: 24-S2-2-C-Interactive <u7634090@anu.edu.au>
Date: Sun, 27 Oct 2024 19:48:11 +1100
Subject: [PATCH 07/13] change the ReviewHelper for api called

---
 .../main/java/fr/free/nrw/commons/review/ReviewActivity.java    | 2 +-
 app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
index 9e998adf14..9361bef528 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java
@@ -69,7 +69,7 @@ public class ReviewActivity extends BaseActivity {
     // Key for storing the timestamp of last cache update
     private static final String LAST_CACHE_TIME_KEY = "lastCacheTime";
     // Maximum number of media files to store in cache
-    private static final int CACHE_SIZE = 50;
+    private static final int CACHE_SIZE = 5;
     // Cache expiration time in milliseconds (24 hours)
     private static final long CACHE_EXPIRY_TIME = 24 * 60 * 60 * 1000;
 
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
index ad0cd061e2..a513a5df75 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt
@@ -133,8 +133,6 @@ class ReviewHelper
 
 
 
-
-
     /**
      * Batch checks whether multiple files are being used in any wiki pages.
      * This method processes a list of filenames in parallel using RxJava Observables.

From 62a2a3385822773b5f07fa9e171e78abdcb65dc7 Mon Sep 17 00:00:00 2001
From: Zining He <zining.he@anu.edu.au>
Date: Sun, 27 Oct 2024 19:55:58 +1100
Subject: [PATCH 08/13] Add .idea to .gitignore

---
 .gitignore                                   |   1 +
 .idea/codeStyles/Project.xml                 | 322 -------------------
 .idea/codeStyles/codeStyleConfig.xml         |   5 -
 .idea/inspectionProfiles/Project_Default.xml |  45 ---
 4 files changed, 1 insertion(+), 372 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.gitignore b/.gitignore
index e54ea2551a..ece6db6685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.iml
 *.ipr
 *.iws
+.idea/
 /.idea/*
 app/src/main/gen/*
 
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 5c297a65ea..0000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,322 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="OTHER_INDENT_OPTIONS">
-      <value>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </value>
-    </option>
-    <JSCodeStyleSettings>
-      <option name="INDENT_CHAINED_CALLS" value="false" />
-    </JSCodeStyleSettings>
-    <JavaCodeStyleSettings>
-      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="" withSubpackages="true" static="true" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="false" />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <Objective-C>
-      <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
-      <option name="INDENT_C_STRUCT_MEMBERS" value="2" />
-      <option name="INDENT_CLASS_MEMBERS" value="2" />
-      <option name="INDENT_VISIBILITY_KEYWORDS" value="1" />
-      <option name="INDENT_INSIDE_CODE_BLOCK" value="2" />
-      <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
-      <option name="FUNCTION_PARAMETERS_WRAP" value="5" />
-      <option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />
-      <option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />
-      <option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />
-      <option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />
-      <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
-    </Objective-C>
-    <Python>
-      <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
-    </Python>
-    <TypeScriptCodeStyleSettings>
-      <option name="INDENT_CHAINED_CALLS" value="false" />
-    </TypeScriptCodeStyleSettings>
-    <files>
-      <extensions>
-        <pair source="cc" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </files>
-    <codeStyleSettings language="CSS">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="ECMA Script Level 4">
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_FOR" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="BINARY_OPERATION_WRAP" value="1" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_WRAP" value="1" />
-      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-      <option name="FOR_STATEMENT_WRAP" value="1" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-    </codeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
-      <option name="ALIGN_MULTILINE_FOR" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="THROWS_KEYWORD_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="BINARY_OPERATION_WRAP" value="1" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_WRAP" value="1" />
-      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-      <option name="FOR_STATEMENT_WRAP" value="1" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-      <option name="WRAP_COMMENTS" value="true" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JSON">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="RIGHT_MARGIN" value="80" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_FOR" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="BINARY_OPERATION_WRAP" value="1" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_WRAP" value="1" />
-      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-      <option name="FOR_STATEMENT_WRAP" value="1" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="ObjectiveC">
-      <option name="RIGHT_MARGIN" value="80" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
-      <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
-      <option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
-      <option name="BLANK_LINES_AROUND_CLASS" value="0" />
-      <option name="BLANK_LINES_AROUND_METHOD" value="0" />
-      <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
-      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="FOR_STATEMENT_WRAP" value="1" />
-      <option name="ASSIGNMENT_WRAP" value="1" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="PROTO">
-      <option name="RIGHT_MARGIN" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Python">
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="RIGHT_MARGIN" value="80" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="SASS">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="SCSS">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-    <codeStyleSettings language="protobuf">
-      <option name="RIGHT_MARGIN" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2b..0000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index f39734eb4b..0000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ClassWithOnlyPrivateConstructors" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ConfusingElse" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="reportWhenNoStatementFollow" value="true" />
-    </inspection_tool>
-    <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="ExplicitThis" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="REPORT_VARIABLES" value="true" />
-      <option name="REPORT_PARAMETERS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="LongLine" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="ignoreObjectMethods" value="true" />
-      <option name="ignoreAnonymousClassMethods" value="false" />
-    </inspection_tool>
-    <inspection_tool class="NonFinalUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="OverlyStrongTypeCast" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreInMatchingInstanceof" value="false" />
-    </inspection_tool>
-    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantFieldInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSerializable" value="false" />
-      <option name="ignoreCloneable" value="false" />
-    </inspection_tool>
-    <inspection_tool class="SimplifiableEqualsExpression" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="TypeParameterExtendsFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessarilyQualifiedStaticUsage" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="m_ignoreStaticFieldAccesses" value="false" />
-      <option name="m_ignoreStaticMethodCalls" value="false" />
-      <option name="m_ignoreStaticAccessFromStaticContext" value="false" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessarilyQualifiedStaticallyImportedElement" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryConstantArrayCreationExpression" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryConstructor" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreAnnotations" value="true" />
-    </inspection_tool>
-    <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessarySuperConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryThis" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file

From f8c092f0f3d76702d09886b43ce0ee3f292cf152 Mon Sep 17 00:00:00 2001
From: Zining He <zining.he@anu.edu.au>
Date: Sun, 27 Oct 2024 19:59:40 +1100
Subject: [PATCH 09/13] pull upstream

---
 .gitignore   | 2 +-
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ece6db6685..7d11b0e005 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 *.iml
 *.ipr
 *.iws
-.idea/
+app/.idea
 /.idea/*
 app/src/main/gen/*
 
diff --git a/build.gradle b/build.gradle
index b0bad89a5c..e11d4f4fa4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.0'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         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'

From 9dc81dfaab9f1dd09fea45a11e2eefac791659ff Mon Sep 17 00:00:00 2001
From: Zining He <zining.he@anu.edu.au>
Date: Sun, 27 Oct 2024 20:00:00 +1100
Subject: [PATCH 10/13] add to gitignore

---
 .idea/codeStyles/Project.xml                 | 322 +++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml         |   5 +
 .idea/inspectionProfiles/Project_Default.xml |  45 +++
 3 files changed, 372 insertions(+)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000000..5c297a65ea
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,322 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </value>
+    </option>
+    <JSCodeStyleSettings>
+      <option name="INDENT_CHAINED_CALLS" value="false" />
+    </JSCodeStyleSettings>
+    <JavaCodeStyleSettings>
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <Objective-C>
+      <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
+      <option name="INDENT_C_STRUCT_MEMBERS" value="2" />
+      <option name="INDENT_CLASS_MEMBERS" value="2" />
+      <option name="INDENT_VISIBILITY_KEYWORDS" value="1" />
+      <option name="INDENT_INSIDE_CODE_BLOCK" value="2" />
+      <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
+      <option name="FUNCTION_PARAMETERS_WRAP" value="5" />
+      <option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />
+      <option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />
+      <option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />
+      <option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />
+      <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
+    </Objective-C>
+    <Python>
+      <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
+    </Python>
+    <TypeScriptCodeStyleSettings>
+      <option name="INDENT_CHAINED_CALLS" value="false" />
+    </TypeScriptCodeStyleSettings>
+    <files>
+      <extensions>
+        <pair source="cc" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </files>
+    <codeStyleSettings language="CSS">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="ECMA Script Level 4">
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+    </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="WRAP_COMMENTS" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="RIGHT_MARGIN" value="80" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="ObjectiveC">
+      <option name="RIGHT_MARGIN" value="80" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+      <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
+      <option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
+      <option name="BLANK_LINES_AROUND_CLASS" value="0" />
+      <option name="BLANK_LINES_AROUND_METHOD" value="0" />
+      <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="PROTO">
+      <option name="RIGHT_MARGIN" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Python">
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="RIGHT_MARGIN" value="80" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="SASS">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="SCSS">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+    <codeStyleSettings language="protobuf">
+      <option name="RIGHT_MARGIN" value="80" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000000..79ee123c2b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000000..f39734eb4b
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,45 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ClassWithOnlyPrivateConstructors" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ConfusingElse" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="reportWhenNoStatementFollow" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="ExplicitThis" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="LocalCanBeFinal" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="REPORT_VARIABLES" value="true" />
+      <option name="REPORT_PARAMETERS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="LongLine" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="MissingOverrideAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="ignoreObjectMethods" value="true" />
+      <option name="ignoreAnonymousClassMethods" value="false" />
+    </inspection_tool>
+    <inspection_tool class="NonFinalUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="OverlyStrongTypeCast" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreInMatchingInstanceof" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="RedundantFieldInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreSerializable" value="false" />
+      <option name="ignoreCloneable" value="false" />
+    </inspection_tool>
+    <inspection_tool class="SimplifiableEqualsExpression" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TypeParameterExtendsFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessarilyQualifiedStaticUsage" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_ignoreStaticFieldAccesses" value="false" />
+      <option name="m_ignoreStaticMethodCalls" value="false" />
+      <option name="m_ignoreStaticAccessFromStaticContext" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessarilyQualifiedStaticallyImportedElement" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryConstantArrayCreationExpression" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryConstructor" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreAnnotations" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryQualifierForThis" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessarySuperConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryThis" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file

From 3a989768cc1ed8094f90210ab88bbadfe6daeeee Mon Sep 17 00:00:00 2001
From: Zining He <zining.he@anu.edu.au>
Date: Sun, 27 Oct 2024 20:01:04 +1100
Subject: [PATCH 11/13] add to gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7d11b0e005..aa4a7283f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,9 @@
 *.iml
 *.ipr
 *.iws
-app/.idea
+app/.idea/gradle.xml
+app/.idea/vcs.xml
+app/.idea/workspace.xml
 /.idea/*
 app/src/main/gen/*
 

From d7c883d274055a02482e148a752fa4b338879f34 Mon Sep 17 00:00:00 2001
From: Zining He <zining.he@anu.edu.au>
Date: Sun, 27 Oct 2024 20:02:27 +1100
Subject: [PATCH 12/13] delete .idea file

---
 app/.idea/gradle.xml    | 13 --------
 app/.idea/vcs.xml       |  6 ----
 app/.idea/workspace.xml | 70 -----------------------------------------
 build.gradle            |  2 +-
 4 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 app/.idea/gradle.xml
 delete mode 100644 app/.idea/vcs.xml
 delete mode 100644 app/.idea/workspace.xml

diff --git a/app/.idea/gradle.xml b/app/.idea/gradle.xml
deleted file mode 100644
index 4019936a4d..0000000000
--- a/app/.idea/gradle.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
deleted file mode 100644
index 6c0b863585..0000000000
--- a/app/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/.idea/workspace.xml b/app/.idea/workspace.xml
deleted file mode 100644
index a280d2e353..0000000000
--- a/app/.idea/workspace.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="cede988b-a065-4b78-9289-58368dc2c403" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/../.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/../build.gradle" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view>
-          <tree_state>
-            <expand />
-            <select />
-          </tree_state>
-        </projects_view>
-      </state>
-    </system>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 6
-}</component>
-  <component name="ProjectId" id="2nBUlxnjPg3kVufGM7QIT8yfWKt" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "android.gradle.sync.needed": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "main",
-    "ignore.virus.scanning.warn.message": "true",
-    "last_opened_file_path": "D:/idea java project/apps-android-commons",
-    "project.structure.last.edited": "SDK Location",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.lookFeel"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="cede988b-a065-4b78-9289-58368dc2c403" name="Changes" comment="" />
-      <created>1728446117690</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1728446117690</updated>
-    </task>
-    <servers />
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e11d4f4fa4..b0bad89a5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.6.0'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         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'

From 8ec6c2f8cdd91ff878c9860cf8c3aff61a1485d9 Mon Sep 17 00:00:00 2001
From: Zining He <zining.he@anu.edu.au>
Date: Sun, 27 Oct 2024 20:02:57 +1100
Subject: [PATCH 13/13] delete .idea file

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa4a7283f6..e54ea2551a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,6 @@
 *.iml
 *.ipr
 *.iws
-app/.idea/gradle.xml
-app/.idea/vcs.xml
-app/.idea/workspace.xml
 /.idea/*
 app/src/main/gen/*