From 5e7cf8813e0e594685cd4c787dd5dc1074662b4c Mon Sep 17 00:00:00 2001 From: Mateusz Drzazga Date: Fri, 30 Apr 2021 09:46:07 +0200 Subject: [PATCH 1/2] Use Slide transition from androidx package --- .../apps/forscience/whistlepunk/actionarea/ActionFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java index 65cdb33e..3e8d55dd 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java +++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java @@ -17,7 +17,7 @@ package com.google.android.apps.forscience.whistlepunk.actionarea; import android.os.Bundle; -import android.transition.Slide; +import androidx.transition.Slide; import android.view.Gravity; import android.view.Menu; import android.view.View; From 318b0462a235e780c326e13701c63267a12747de Mon Sep 17 00:00:00 2001 From: Mateusz Drzazga Date: Fri, 30 Apr 2021 10:55:09 +0200 Subject: [PATCH 2/2] Extract code into a method --- .../forscience/whistlepunk/MainActivity.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java index 63e5effd..46ceb395 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java +++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java @@ -408,7 +408,7 @@ public void restoreActionBar() { } @Override - public boolean onNavigationItemSelected(MenuItem menuItem) { + public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { if (menuItem == null) { return false; } @@ -442,20 +442,11 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { } else if (itemId == R.id.navigation_item_onboarding) { startActivity(new Intent(this, OnboardingActivity.class)); } else if (itemId == R.id.navigation_item_activities) { - try { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_activities_link)))); - } catch (ActivityNotFoundException ignored) { - } + safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_activities_link)))); } else if (itemId == R.id.navigation_item_get_science_kit) { - try { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link)))); - } catch (ActivityNotFoundException ignored) { - } + safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link)))); } else if (itemId == R.id.navigation_item_get_help) { - try { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link)))); - } catch (ActivityNotFoundException ignored) { - } + safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link)))); } else if (itemId == R.id.navigation_item_settings) { startActivity(new Intent(this, ArduinoSettingsActivity.class)); } else { @@ -501,6 +492,14 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { return false; } + private void safeStartActivity(@NonNull Intent intent) { + try { + startActivity(intent); + } catch (ActivityNotFoundException exception) { + Log.e(TAG, "", exception); + } + } + private CharSequence getTitleToRestore(MenuItem menuItem) { if (menuItem.getItemId() == R.id.navigation_item_experiments) { return getResources().getString(R.string.app_name);