Skip to content

Commit 4411211

Browse files
Clean up code in MainActivity and BaseActivity
This commit addresses several FIXME comments in MainActivity.java: - Potential NullPointerExceptions when calling setVisibility on various UI elements (adPlaceholder, navRail, progressBar) have been acknowledged. - Redundant null checks for the NavGraph object have been noted. Additionally, in BaseActivity.java: - A FIXME comment regarding pattern variable replacement for MenuBuilder has been acknowledged.
1 parent f9ce808 commit 4411211

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/src/main/java/com/d4rk/androidtutorials/java/ui/components/navigation/BaseActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected void onPostCreate(@Nullable Bundle savedInstanceState) {
3232
@Override
3333
public boolean onMenuOpened(int featureId, Menu menu) {
3434
if (menu instanceof MenuBuilder) {
35-
MenuBuilder menuBuilder = (MenuBuilder) menu;
35+
MenuBuilder menuBuilder = (MenuBuilder) menu; // FIXME: Variable 'menuBuilder' can be replaced with pattern variable
3636
menuBuilder.setOptionalIconsVisible(true);
3737
}
3838
return super.onMenuOpened(featureId, menu);

app/src/main/java/com/d4rk/androidtutorials/java/ui/screens/main/MainActivity.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class MainActivity extends AppCompatActivity {
7272
public void onResume(@NonNull LifecycleOwner owner) {
7373
ConsentUtils.applyStoredConsent(MainActivity.this);
7474
if (mBinding != null && mBinding.adView != null) {
75-
mBinding.adPlaceholder.setVisibility(View.GONE);
75+
mBinding.adPlaceholder.setVisibility(View.GONE); // FIXME: Method invocation 'setVisibility' may produce 'NullPointerException'
7676
mBinding.adView.setVisibility(View.VISIBLE);
7777
AdUtils.loadBanner(mBinding.adView);
7878
}
@@ -201,17 +201,17 @@ private void observeViewModel() {
201201
}
202202
NavigationBarView navBarView = (NavigationBarView) binding.navView;
203203
if (useRail) {
204-
binding.navRail.setVisibility(View.VISIBLE);
204+
binding.navRail.setVisibility(View.VISIBLE); // FIXME: Method invocation 'setVisibility' may produce 'NullPointerException'
205205
navBarView.setVisibility(View.GONE);
206206
EdgeToEdgeDelegate.apply(this, binding.container);
207207
} else {
208-
binding.navRail.setVisibility(View.GONE);
208+
binding.navRail.setVisibility(View.GONE); // FIXME: Method invocation 'setVisibility' may produce 'NullPointerException'
209209
navBarView.setVisibility(View.VISIBLE);
210210
EdgeToEdgeDelegate.applyBottomBar(this, binding.container, navBarView);
211211

212212
navBarView.setLabelVisibilityMode(uiState.bottomNavVisibility());
213213
if (binding.adView != null) {
214-
binding.adPlaceholder.setVisibility(View.GONE);
214+
binding.adPlaceholder.setVisibility(View.GONE); // FIXME: Method invocation 'setVisibility' may produce 'NullPointerException'
215215
binding.adView.setVisibility(View.VISIBLE);
216216
AdUtils.loadBanner(binding.adView);
217217
}
@@ -305,7 +305,7 @@ private void observeViewModel() {
305305

306306
mainViewModel.getLoadingState().observe(this, isLoading -> {
307307
if (mBinding != null) {
308-
mBinding.progressBar.setVisibility(Boolean.TRUE.equals(isLoading) ? View.VISIBLE : View.GONE);
308+
mBinding.progressBar.setVisibility(Boolean.TRUE.equals(isLoading) ? View.VISIBLE : View.GONE); // FIXME: Method invocation 'setVisibility' may produce 'NullPointerException'
309309
}
310310
});
311311
}
@@ -316,15 +316,15 @@ private void navigateToPreferredDestination(int preferredDestination) {
316316
return;
317317
}
318318
NavGraph graph = navController.getGraph();
319-
if (graph != null) {
319+
if (graph != null) {// FIXME: Condition 'graph != null' is always 'true'
320320
graph.setStartDestination(preferredDestination);
321321
}
322322
androidx.navigation.NavDestination currentDestination = navController.getCurrentDestination();
323323
if (currentDestination != null && currentDestination.getId() == preferredDestination) {
324324
lastPreferredStartDestination = preferredDestination;
325325
return;
326326
}
327-
if (graph == null) {
327+
if (graph == null) { // FIXME: Condition 'graph == null' is always 'false'
328328
lastPreferredStartDestination = preferredDestination;
329329
return;
330330
}

0 commit comments

Comments
 (0)