simplify code

KunMinX · Jun 14, 2023 · 37b0ab5 · 37b0ab5
1 parent 5460514
commit 37b0ab5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/app/src/main/java/com/kunminx/puremusic/MainActivity.java b/app/src/main/java/com/kunminx/puremusic/MainActivity.java
@@ -32,6 +32,8 @@
 import com.kunminx.puremusic.domain.message.PageMessenger;
 import com.kunminx.puremusic.domain.proxy.PlayerManager;
 
+import java.util.Objects;
+
 /**
  * Create by KunMinX at 19/10/16
  */
@@ -50,7 +52,7 @@ protected void initViewModel() {
   @Override
   protected DataBindingConfig getDataBindingConfig() {
     return new DataBindingConfig(R.layout.activity_main, BR.vm, mStates)
-      .addBindingParam(BR.listener, new ListenerHandler());
+            .addBindingParam(BR.listener, new ListenerHandler());
   }
 
   @Override
@@ -61,7 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
       switch (messages.eventId) {
         case Messages.EVENT_CLOSE_ACTIVITY_IF_ALLOWED:
           NavController nav = Navigation.findNavController(this, R.id.main_fragment_host);
-          if (nav.getCurrentDestination() != null && nav.getCurrentDestination().getId() != R.id.mainFragment) {
+          if (Objects.requireNonNull(nav.getCurrentDestination()).getId() != R.id.mainFragment) {
             nav.navigateUp();
           } else if (Boolean.TRUE.equals(mStates.isDrawerOpened.get())) {
             mStates.openDrawer.set(false);

diff --git a/app/src/main/java/com/kunminx/puremusic/data/api/APIs.java b/app/src/main/java/com/kunminx/puremusic/data/api/APIs.java
diff --git a/app/src/main/java/com/kunminx/puremusic/ui/page/MainFragment.java b/app/src/main/java/com/kunminx/puremusic/ui/page/MainFragment.java
@@ -96,12 +96,6 @@ public class ClickProxy {
     public void openMenu() {
       mMessenger.input(new Messages(Messages.EVENT_OPEN_DRAWER));
     }
-    public void login() {
-      nav().navigate(R.id.action_mainFragment_to_loginFragment);
-    }
-    public void search() {
-      nav().navigate(R.id.action_mainFragment_to_searchFragment);
-    }
   }
 
   public static class MainStates extends StateHolder {

diff --git a/app/src/main/java/com/kunminx/puremusic/ui/view/PlayPauseView.java b/app/src/main/java/com/kunminx/puremusic/ui/view/PlayPauseView.java
@@ -138,5 +138,4 @@ public void pause() {
     mAnimatorSet.setDuration(PLAY_PAUSE_ANIMATION_DURATION);
     pausePlayAnim.start();
   }
-
 }
diff --git a/app/src/main/java/com/kunminx/puremusic/ui/widget/PlayerService.java b/app/src/main/java/com/kunminx/puremusic/ui/widget/PlayerService.java
@@ -201,5 +201,4 @@ public IBinder onBind(Intent intent) {
     return null;
   }
 
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,5 +138,4 @@ public void pause() { @@
         mAnimatorSet.setDuration(PLAY_PAUSE_ANIMATION_DURATION);
         pausePlayAnim.start();
       }
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -201,5 +201,4 @@ public IBinder onBind(Intent intent) {
		return null;
		}


		}