Migrated util module from Java to Kotlin (#5938)

* Rename .java to .kt * Migrated the following files in util module to Kotlin - AbstractTextWatcher - ActivityUtils - CommonsDateUtil - DateUtil * Rename .java to .kt * Migrated the following files in util module to Kotlin - DeviceInfoUtil - ExecutorUtils - FragmentUtils * Rename .java to .kt * Migrated the following files in util module to Kotlin - ImageUtils - ImageUtilsWrapper - LangCodeUtils - LayoutUtils - LengthUtils - LocationUtils - MapUtils * Rename .java to .kt * Migrated all remaining files in util module
commons-app · Nov 18, 2024 · 0fdb004 · 0fdb004
1 parent c439143
commit 0fdb004
Show file tree

Hide file tree

Showing 48 changed files with 1,651 additions and 1,647 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
@@ -87,7 +87,7 @@ public void initiateCameraPick(Activity activity,
             },
             R.string.storage_permission_title,
             R.string.write_storage_permission_rationale,
-            PermissionUtils.PERMISSIONS_STORAGE);
+            PermissionUtils.getPERMISSIONS_STORAGE());
     }
 
     /**
@@ -224,7 +224,7 @@ public void initiateCustomGalleryPickWithPermission(final Activity activity, Act
             () -> FilePicker.openCustomSelector(activity, resultLauncher, 0),
             R.string.storage_permission_title,
             R.string.write_storage_permission_rationale,
-            PermissionUtils.PERMISSIONS_STORAGE);
+            PermissionUtils.getPERMISSIONS_STORAGE());
     }
 
 

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java
@@ -5,7 +5,6 @@
 import static fr.free.nrw.commons.contributions.Contribution.STATE_PAUSED;
 import static fr.free.nrw.commons.nearby.fragments.NearbyParentFragment.WLM_URL;
 import static fr.free.nrw.commons.profile.ProfileActivity.KEY_USERNAME;
-import static fr.free.nrw.commons.utils.ImageUtils.IMAGE_OK;
 import static fr.free.nrw.commons.utils.LengthUtils.computeBearing;
 import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween;
 
@@ -23,12 +22,10 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.activity.result.ActivityResultCallback;
@@ -39,7 +36,6 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager.OnBackStackChangedListener;
 import androidx.fragment.app.FragmentTransaction;
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.databinding.FragmentContributionsBinding;

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -1,13 +1,10 @@
 package fr.free.nrw.commons.contributions;
 
-import android.Manifest.permission;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -16,10 +13,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.viewpager.widget.ViewPager;
 import androidx.work.ExistingWorkPolicy;
 import fr.free.nrw.commons.databinding.MainBinding;
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.auth.SessionManager;
@@ -41,7 +36,6 @@
 import fr.free.nrw.commons.quiz.QuizChecker;
 import fr.free.nrw.commons.settings.SettingsFragment;
 import fr.free.nrw.commons.theme.BaseActivity;
-import fr.free.nrw.commons.upload.UploadActivity;
 import fr.free.nrw.commons.upload.UploadProgressActivity;
 import fr.free.nrw.commons.upload.worker.WorkRequestHelper;
 import fr.free.nrw.commons.utils.PermissionUtils;

diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
@@ -1,10 +1,10 @@
 package fr.free.nrw.commons.delete;
 
 import static fr.free.nrw.commons.notification.NotificationHelper.NOTIFICATION_DELETE;
+import static fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import static fr.free.nrw.commons.utils.LangCodeUtils.getLocalizedResources;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
@@ -16,6 +16,7 @@
 import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException;
 import fr.free.nrw.commons.notification.NotificationHelper;
 import fr.free.nrw.commons.review.ReviewController;
+import fr.free.nrw.commons.utils.LangCodeUtils;
 import fr.free.nrw.commons.utils.ViewUtilWrapper;
 import io.reactivex.Observable;
 import io.reactivex.Single;

diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
@@ -4,14 +4,12 @@
 import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SLIGHTLY_CHANGED;
 import static fr.free.nrw.commons.utils.MapUtils.ZOOM_LEVEL;
 
-import android.Manifest;
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -21,22 +19,17 @@
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.Toast;
-import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatTextView;
 import androidx.core.content.ContextCompat;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import fr.free.nrw.commons.BaseMarker;
 import fr.free.nrw.commons.MapController;
@@ -48,7 +41,6 @@
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.explore.ExploreMapRootFragment;
 import fr.free.nrw.commons.explore.paging.LiveDataConverter;
-import fr.free.nrw.commons.filepicker.Constants;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.location.LocationPermissionsHelper;
@@ -60,7 +52,6 @@
 import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.MapUtils;
 import fr.free.nrw.commons.utils.NetworkUtils;
-import fr.free.nrw.commons.utils.PermissionUtils;
 import fr.free.nrw.commons.utils.SystemThemeUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.Observable;
@@ -310,7 +301,7 @@ private void unregisterNetworkReceiver() {
     }
 
     private void startMapWithoutPermission() {
-        lastKnownLocation = MapUtils.defaultLatLng;
+        lastKnownLocation = MapUtils.getDefaultLatLng();
         moveCameraToPosition(
             new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
         presenter.onMapReady(exploreMapController);
@@ -331,7 +322,7 @@ private void performMapReadyActions() {
             !locationPermissionsHelper.checkLocationPermission(getActivity())) {
             isPermissionDenied = true;
         }
-        lastKnownLocation = MapUtils.defaultLatLng;
+        lastKnownLocation = MapUtils.getDefaultLatLng();
         moveCameraToPosition(
             new GeoPoint(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude()));
         presenter.onMapReady(exploreMapController);

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -318,7 +318,7 @@ public void run() {
     }
 
     public void launchZoomActivity(final View view) {
-        final boolean hasPermission = PermissionUtils.hasPermission(getActivity(), PermissionUtils.PERMISSIONS_STORAGE);
+        final boolean hasPermission = PermissionUtils.hasPermission(getActivity(), PermissionUtils.getPERMISSIONS_STORAGE());
         if (hasPermission) {
             launchZoomActivityAfterPermissionCheck(view);
         } else {
@@ -328,7 +328,7 @@ public void launchZoomActivity(final View view) {
                 },
                 R.string.storage_permission_title,
                 R.string.read_storage_permission_rationale,
-                PermissionUtils.PERMISSIONS_STORAGE
+                PermissionUtils.getPERMISSIONS_STORAGE()
                 );
         }
     }

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
@@ -43,7 +43,6 @@
 import android.view.ViewGroup.LayoutParams;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.Button;
 import android.widget.Toast;
 import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
@@ -701,7 +700,7 @@ private void startMapWithoutPermission() {
                 = new LatLng(Double.parseDouble(locationLatLng[0]),
                 Double.parseDouble(locationLatLng[1]), 1f);
         } else {
-            lastKnownLocation = MapUtils.defaultLatLng;
+            lastKnownLocation = MapUtils.getDefaultLatLng();
         }
         if (binding.map != null) {
             moveCameraToPosition(
@@ -793,7 +792,7 @@ public void initNearbyFilter() {
         hideBottomSheet();
         binding.nearbyFilter.searchViewLayout.searchView.setOnQueryTextFocusChangeListener(
             (v, hasFocus) -> {
-                LayoutUtils.setLayoutHeightAllignedToWidth(1.25,
+                LayoutUtils.setLayoutHeightAlignedToWidth(1.25,
                     binding.nearbyFilterList.getRoot());
                 if (hasFocus) {
                     binding.nearbyFilterList.getRoot().setVisibility(View.VISIBLE);
@@ -834,7 +833,7 @@ public boolean isDarkTheme() {
             .getLayoutParams().width = (int) LayoutUtils.getScreenWidth(getActivity(),
             0.75);
         binding.nearbyFilterList.searchListView.setAdapter(nearbyFilterSearchRecyclerViewAdapter);
-        LayoutUtils.setLayoutHeightAllignedToWidth(1.25, binding.nearbyFilterList.getRoot());
+        LayoutUtils.setLayoutHeightAlignedToWidth(1.25, binding.nearbyFilterList.getRoot());
         compositeDisposable.add(
             RxSearchView.queryTextChanges(binding.nearbyFilter.searchViewLayout.searchView)
                 .takeUntil(RxView.detaches(binding.nearbyFilter.searchViewLayout.searchView))

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.java
@@ -11,13 +11,10 @@
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
 import android.location.Location;
-import android.view.View;
 import androidx.annotation.MainThread;
 import androidx.annotation.Nullable;
-import androidx.work.ExistingWorkPolicy;
 import fr.free.nrw.commons.BaseMarker;
 import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao;
-import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType;
@@ -26,14 +23,10 @@
 import fr.free.nrw.commons.nearby.Label;
 import fr.free.nrw.commons.nearby.MarkerPlaceGroup;
 import fr.free.nrw.commons.nearby.NearbyController;
-import fr.free.nrw.commons.nearby.NearbyFilterState;
 import fr.free.nrw.commons.nearby.Place;
-import fr.free.nrw.commons.nearby.PlaceDao;
 import fr.free.nrw.commons.nearby.contract.NearbyParentFragmentContract;
-import fr.free.nrw.commons.upload.worker.WorkRequestHelper;
 import fr.free.nrw.commons.utils.LocationUtils;
 import fr.free.nrw.commons.wikidata.WikidataEditListener;
-import io.reactivex.disposables.CompositeDisposable;
 import java.lang.reflect.Proxy;
 import java.util.List;
 import timber.log.Timber;

diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java
@@ -12,7 +12,6 @@
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -543,7 +542,7 @@ private String getCurrentLanguageCode(final String preferenceKey) {
      * First checks for external storage permissions and then sends logs via email
      */
     private void checkPermissionsAndSendLogs() {
-        if (PermissionUtils.hasPermission(getActivity(), PermissionUtils.PERMISSIONS_STORAGE)) {
+        if (PermissionUtils.hasPermission(getActivity(), PermissionUtils.getPERMISSIONS_STORAGE())) {
             commonsLogSender.send(getActivity(), null);
         } else {
             requestExternalStoragePermissions();
@@ -556,7 +555,7 @@ private void checkPermissionsAndSendLogs() {
      */
     private void requestExternalStoragePermissions() {
         Dexter.withActivity(getActivity())
-            .withPermissions(PermissionUtils.PERMISSIONS_STORAGE)
+            .withPermissions(PermissionUtils.getPERMISSIONS_STORAGE())
             .withListener(new MultiplePermissionsListener() {
                 @Override
                 public void onPermissionsChecked(MultiplePermissionsReport report) {

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -1,8 +1,8 @@
 package fr.free.nrw.commons.upload;
 
 import static fr.free.nrw.commons.contributions.ContributionController.ACTION_INTERNAL_UPLOADS;
-import static fr.free.nrw.commons.utils.PermissionUtils.PERMISSIONS_STORAGE;
 import static fr.free.nrw.commons.utils.PermissionUtils.checkPermissionsAndPerformAction;
+import static fr.free.nrw.commons.utils.PermissionUtils.getPERMISSIONS_STORAGE;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.SELECTED_NEARBY_PLACE;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.SELECTED_NEARBY_PLACE_CATEGORY;
@@ -32,7 +32,6 @@
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import androidx.work.ExistingWorkPolicy;
-import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.auth.SessionManager;
@@ -277,7 +276,7 @@ protected void checkBlockStatus() {
 
     public void checkStoragePermissions() {
         // Check if all required permissions are granted
-        final boolean hasAllPermissions = PermissionUtils.hasPermission(this, PERMISSIONS_STORAGE);
+        final boolean hasAllPermissions = PermissionUtils.hasPermission(this, getPERMISSIONS_STORAGE());
         final boolean hasPartialAccess = PermissionUtils.hasPartialAccess(this);
         if (hasAllPermissions || hasPartialAccess) {
             // All required permissions are granted, so enable UI elements and perform actions
@@ -297,7 +296,7 @@ public void checkStoragePermissions() {
                         },
                     R.string.storage_permission_title,
                     R.string.write_storage_permission_rationale_for_image_share,
-                    PERMISSIONS_STORAGE);
+                    getPERMISSIONS_STORAGE());
             }
         }
         /* If all permissions are not granted and a dialog is already showing on screen