From 2d173acc3f930d945925f4ce28d131ce06ac3e1c Mon Sep 17 00:00:00 2001
From: Eugene Cheung <ey.cheung@outlook.com>
Date: Wed, 5 Sep 2018 22:46:30 -0400
Subject: [PATCH] Replace if blocks with switch blocks

---
 .../gramophone/service/MusicService.java      | 30 +++++++++++--------
 .../base/AbsSlidingMusicPanelActivity.java    | 18 ++++++-----
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 3d516a74..30279b48 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -1272,18 +1272,24 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         public void onReceive(final Context context, final Intent intent) {
             final String command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME);
 
-            if (AppWidgetClassic.NAME.equals(command)) {
-                final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-                appWidgetClassic.performUpdate(MusicService.this, ids);
-            } else if (AppWidgetSmall.NAME.equals(command)) {
-                final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-                appWidgetSmall.performUpdate(MusicService.this, ids);
-            } else if (AppWidgetBig.NAME.equals(command)) {
-                final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-                appWidgetBig.performUpdate(MusicService.this, ids);
-            } else if (AppWidgetCard.NAME.equals(command)) {
-                final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-                appWidgetCard.performUpdate(MusicService.this, ids);
+            final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
+            switch (command) {
+                case AppWidgetClassic.NAME: {
+                    appWidgetClassic.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetSmall.NAME: {
+                    appWidgetSmall.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetBig.NAME: {
+                    appWidgetBig.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetCard.NAME: {
+                    appWidgetCard.performUpdate(MusicService.this, ids);
+                    break;
+                }
             }
         }
     };
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
index 4d381c05..0da6d312 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java
@@ -81,13 +81,17 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi
             public void onGlobalLayout() {
                 slidingUpPanelLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
-                if (getPanelState() == SlidingUpPanelLayout.PanelState.EXPANDED) {
-                    onPanelSlide(slidingUpPanelLayout, 1);
-                    onPanelExpanded(slidingUpPanelLayout);
-                } else if (getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) {
-                    onPanelCollapsed(slidingUpPanelLayout);
-                } else {
-                    playerFragment.onHide();
+                switch (getPanelState()) {
+                    case EXPANDED:
+                        onPanelSlide(slidingUpPanelLayout, 1);
+                        onPanelExpanded(slidingUpPanelLayout);
+                        break;
+                    case COLLAPSED:
+                        onPanelCollapsed(slidingUpPanelLayout);
+                        break;
+                    default:
+                        playerFragment.onHide();
+                        break;
                 }
             }
         });