Skip to content

Feature/improve code readability #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 4, 2021
Merged

Feature/improve code readability #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e7cf88
Use Slide transition from androidx package
mateuszdrzazga Apr 30, 2021
318b046
Extract code into a method
mateuszdrzazga Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions ...nk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ public void restoreActionBar() {
}

@Override
public boolean onNavigationItemSelected(MenuItem menuItem) {
public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
if (menuItem == null) {
return false;
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/google/android/apps/forscience/whistlepunk/actionarea/ActionFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down