pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Switch to use BundleCompat

Browse source 
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-10-05 09:52:03 +03:00
parent 56d37dbe64
commit 4cadc099ba
8 changed files with 22 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/app/build.gradle
View file

@ -109,6 +109,7 @@ dependencies {
// > A failure occurred while executing com.android.build.gradle.internal.tasks.CheckDuplicatesRunnable
// We don't use Kotlin, but some dependencies are actively using it.
// See https://stackoverflow.com/a/75719642
implementation 'androidx.core:core:1.12.0'
implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.9.10'))
implementation 'androidx.annotation:annotation:1.7.0'
implementation 'androidx.appcompat:appcompat:1.6.1'

8
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
View file

@ -13,6 +13,7 @@ import android.widget.EditText;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.BundleCompat;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
@ -43,10 +44,9 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
public void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
final Bundle args = getArguments();
if (args == null)
throw new IllegalArgumentException("Args must not be null");
mCategory = Objects.requireNonNull(Utils.getParcelable(args, BookmarkCategorySettingsActivity.EXTRA_BOOKMARK_CATEGORY, BookmarkCategory.class));
final Bundle args = requireArguments();
mCategory = Objects.requireNonNull(BundleCompat.getParcelable(args,
BookmarkCategorySettingsActivity.EXTRA_BOOKMARK_CATEGORY, BookmarkCategory.class));
}
@Nullable

12
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
View file

@ -16,6 +16,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.os.BundleCompat;
import androidx.recyclerview.widget.ConcatAdapter;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;
@ -46,6 +47,7 @@ import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter>
implements BookmarkManager.BookmarksSharingListener,
@ -107,13 +109,9 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
@NonNull
private BookmarkCategory getCategoryOrThrow()
{
Bundle args = getArguments();
BookmarkCategory category;
if (args == null || (args.getBundle(EXTRA_BUNDLE) == null) ||
((category = Utils.getParcelable(args.getBundle(EXTRA_BUNDLE), EXTRA_CATEGORY, BookmarkCategory.class))) == null)
throw new IllegalArgumentException("Category not exist in bundle");
return category;
final Bundle args = requireArguments();
final Bundle extra = Objects.requireNonNull(args.getBundle(EXTRA_BUNDLE));
return Objects.requireNonNull(BundleCompat.getParcelable(extra, EXTRA_CATEGORY, BookmarkCategory.class));
}
@NonNull

8
android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
View file

@ -8,6 +8,7 @@ import android.view.ViewGroup;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.BundleCompat;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
@ -42,8 +43,11 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
super.onViewCreated(view, savedInstanceState);
final Bundle args = getArguments();
if (args != null && args.containsKey(FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY))
mSelectedCategory = Utils.getParcelable(args, FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY, FeatureCategory.class);
if (args != null)
{
mSelectedCategory = BundleCompat.getParcelable(args, FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY,
FeatureCategory.class);
}
mToolbarController = new SearchToolbarController(view, requireActivity())
{
@Override

5
android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
View file

@ -17,6 +17,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.os.BundleCompat;
import androidx.fragment.app.FragmentManager;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@ -115,8 +116,8 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
final Bundle args = getArguments();
if (args == null)
throw new IllegalArgumentException("Args must not be null");
mFrom = Utils.getParcelable(args, EXTRA_FROM, HoursMinutes.class);
mTo = Utils.getParcelable(args, EXTRA_TO, HoursMinutes.class);
mFrom = BundleCompat.getParcelable(args, EXTRA_FROM, HoursMinutes.class);
mTo = BundleCompat.getParcelable(args, EXTRA_TO, HoursMinutes.class);
mSelectedTab = args.getInt(EXTRA_SELECT_FIRST);
mId = args.getInt(EXTRA_ID);
}

18
android/app/src/main/java/app/organicmaps/util/Utils.java
View file

@ -829,23 +829,6 @@ public class Utils
}
}
@SuppressWarnings({"deprecation", "unchecked"})
@Nullable
private static <T> T getParcelableOld(Bundle args, String key)
{
return (T) args.getParcelable(key);
}
@Nullable
public static <T> T getParcelable(@NonNull Bundle args, String key, Class<T> clazz)
{
args.setClassLoader(clazz.getClassLoader());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU)
return getParcelableOld(args, key);
return args.getParcelable(key, clazz);
}
@SuppressWarnings({"deprecation", "unchecked"})
@Nullable
private static <T extends Serializable> T getSerializableOld(Bundle args, String key)
@ -862,7 +845,6 @@ public class Utils
return args.getSerializable(key, clazz);
}
@SuppressWarnings("deprecation")
private static Spanned fromHtmlOld(@NonNull String htmlDescription)
{

3
android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java
View file

@ -10,6 +10,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.BundleCompat;
import app.organicmaps.Framework;
import app.organicmaps.R;
@ -52,7 +53,7 @@ public class DirectionFragment extends BaseMwmDialogFragment
});
initViews(root);
if (savedInstanceState != null)
setMapObject(Utils.getParcelable(savedInstanceState, EXTRA_MAP_OBJECT, MapObject.class));
setMapObject(BundleCompat.getParcelable(savedInstanceState, EXTRA_MAP_OBJECT, MapObject.class));
return root;
}

2
android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
View file

@ -133,7 +133,7 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
public void onRestore(@NonNull Bundle inState)
{
// mElevationInfo = Utils.getParcelable(inState, PlacePageUtils.EXTRA_PLACE_PAGE_DATA, ElevationInfo.class);
// mElevationInfo = BundleCompat.getParcelable(inState, PlacePageUtils.EXTRA_PLACE_PAGE_DATA, ElevationInfo.class);
// if (mElevationInfo != null)
// render(mElevationInfo);
}