diff --git a/src/main/java/de/dennisguse/opentracks/AboutActivity.java b/src/main/java/de/dennisguse/opentracks/AboutActivity.java index f8de0289b..c3c06ebcc 100644 --- a/src/main/java/de/dennisguse/opentracks/AboutActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AboutActivity.java @@ -3,6 +3,7 @@ package de.dennisguse.opentracks; import android.os.Bundle; import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import de.dennisguse.opentracks.databinding.AboutBinding; @@ -29,7 +30,8 @@ public class AboutActivity extends AbstractActivity { ViewUtils.makeClickableLinks(findViewById(android.R.id.content)); } - protected View getRootView() { + @NonNull + protected View createRootView() { viewBinding = AboutBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java index 42b7c6826..0acfe0ddf 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java @@ -47,7 +47,7 @@ public abstract class AbstractActivity extends AppCompatActivity { // Set volume control stream for text to speech setVolumeControlStream(TTSManager.AUDIO_STREAM); - View rootView = getRootView(); + View rootView = createRootView(); setContentView(rootView); apply_insets(rootView); @@ -93,5 +93,6 @@ public abstract class AbstractActivity extends AppCompatActivity { return true; } - protected abstract View getRootView(); + @NonNull + protected abstract View createRootView(); } diff --git a/src/main/java/de/dennisguse/opentracks/HelpActivity.java b/src/main/java/de/dennisguse/opentracks/HelpActivity.java index c6be03390..3c9963df5 100644 --- a/src/main/java/de/dennisguse/opentracks/HelpActivity.java +++ b/src/main/java/de/dennisguse/opentracks/HelpActivity.java @@ -3,6 +3,7 @@ package de.dennisguse.opentracks; import android.os.Bundle; import android.view.View; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import de.dennisguse.opentracks.databinding.HelpBinding; @@ -19,8 +20,9 @@ public class HelpActivity extends AbstractActivity { ViewUtils.makeClickableLinks(findViewById(android.R.id.content)); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { helpBinding = HelpBinding.inflate(getLayoutInflater()); return helpBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java b/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java index c285a2952..f2f06403f 100644 --- a/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ShowErrorActivity.java @@ -7,6 +7,8 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; +import androidx.annotation.NonNull; + import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -28,8 +30,9 @@ public class ShowErrorActivity extends AbstractActivity { setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = ActivityShowErrorBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 17446b822..41c2d8036 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -115,8 +115,9 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit outState.putSerializable(ICON_VALUE_KEY, activityType); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = TrackEditBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index b19f8d4fb..ef1227e48 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -30,6 +30,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.content.res.AppCompatResources; import androidx.core.content.ContextCompat; @@ -242,8 +243,9 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co adapter = null; } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = TrackListBinding.inflate(getLayoutInflater()); viewBinding.trackListSearchView.getEditText().setOnEditorActionListener((v, actionId, event) -> { diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java index b073da72f..0b2561fb5 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java @@ -136,8 +136,9 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement outState.putInt(CURRENT_TAB_TAG_KEY, viewBinding.trackDetailActivityViewPager.getCurrentItem()); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = TrackRecordedBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 0b5dcb75d..edbd4e56c 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -250,8 +250,9 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc trackRecordingServiceConnection = null; } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = TrackRecordingBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java index b1d94e58f..5223815e0 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java @@ -7,6 +7,8 @@ import android.util.Pair; import android.view.View; import android.widget.ArrayAdapter; +import androidx.annotation.NonNull; + import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.ActivityType; import de.dennisguse.opentracks.data.models.DistanceFormatter; @@ -110,8 +112,9 @@ public class TrackStoppedActivity extends AbstractTrackDeleteActivity implements contentProviderUtils); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = TrackStoppedBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java b/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java index bb921af4b..36ba0d462 100644 --- a/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java +++ b/src/main/java/de/dennisguse/opentracks/introduction/IntroductionActivity.java @@ -47,8 +47,9 @@ public class IntroductionActivity extends AbstractActivity { viewBinding.introductionViewPager.setUserInputEnabled(false); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = IntroductionBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java index e344056c5..d8792b6f5 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java @@ -72,8 +72,9 @@ public class SettingsActivity extends AbstractActivity implements ChooseActivity } } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = SettingsBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutEditActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutEditActivity.java index fc962e49e..9fe262def 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutEditActivity.java @@ -116,8 +116,9 @@ public class SettingsCustomLayoutEditActivity extends AbstractActivity implement recordingLayoutFieldsVisible = null; } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = ActivitySettingsCustomLayoutBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java index cfeb8ee0a..8b016d3f2 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsCustomLayoutListActivity.java @@ -108,8 +108,9 @@ public class SettingsCustomLayoutListActivity extends AbstractActivity implement adapter.reloadLayouts(); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { PreferencesUtils.getCustomLayout(); viewBinding = ActivitySettingsCustomLayoutListBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java index 04c0a23f3..645459061 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java @@ -83,8 +83,9 @@ public class AggregatedStatisticsActivity extends AbstractActivity implements Fi outState.putBoolean(STATE_ARE_FILTERS_APPLIED, areFiltersApplied); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = AggregatedStatsBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java index afcfcfd8a..2fc639882 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java @@ -110,8 +110,9 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar); } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = MarkerDetailActivityBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java index cc933246b..10bfce2ae 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerEditActivity.java @@ -85,8 +85,9 @@ public class MarkerEditActivity extends AbstractActivity { // UI elements private MarkerEditBinding viewBinding; + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = MarkerEditBinding.inflate(getLayoutInflater()); return viewBinding.getRoot(); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java index 20c482a30..7f5cee204 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListActivity.java @@ -145,8 +145,9 @@ public class MarkerListActivity extends AbstractActivity implements DeleteMarker contentProviderUtils = null; } + @NonNull @Override - protected View getRootView() { + protected View createRootView() { viewBinding = MarkerListBinding.inflate(getLayoutInflater()); viewBinding.markerListSearchView.getEditText().setOnEditorActionListener((v, actionId, event) -> {