From ca84276165ba15418568494b794b2e19a0df3054 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Tue, 13 Apr 2021 17:47:21 +0900
Subject: [PATCH] revert login activity moves

---
 app/src/main/AndroidManifest.xml                              | 4 ++--
 .../gramophone/activities/{login => }/LoginActivity.java      | 2 +-
 .../gramophone/activities/{login => }/SplashActivity.java     | 2 +-
 .../activities/base/AbsSlidingMusicPanelActivity.java         | 2 +-
 .../com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java   | 2 --
 .../main/java/com/dkanada/gramophone/util/NavigationUtil.java | 2 +-
 app/src/main/res/layout/activity_login.xml                    | 2 +-
 app/src/main/res/layout/activity_splash.xml                   | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename app/src/main/java/com/dkanada/gramophone/activities/{login => }/LoginActivity.java (99%)
 rename app/src/main/java/com/dkanada/gramophone/activities/{login => }/SplashActivity.java (98%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1685c08..715c3ea7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         <activity android:name=".activities.details.GenreDetailActivity" />
         <activity android:name=".activities.details.PlaylistDetailActivity" />
         <activity android:name=".activities.SearchActivity" />
-        <activity android:name=".activities.login.SplashActivity">
+        <activity android:name=".activities.SplashActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -54,7 +54,7 @@
             android:name=".activities.AboutActivity"
             android:label="@string/action_about" />
         <activity
-            android:name=".activities.login.LoginActivity"
+            android:name=".activities.LoginActivity"
             android:label="@string/action_login"
             android:theme="@style/LoginScreen" />
         <activity
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/login/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
similarity index 99%
rename from app/src/main/java/com/dkanada/gramophone/activities/login/LoginActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
index 61ed6448..bb796f28 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/login/LoginActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.activities.login;
+package com.dkanada.gramophone.activities;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/login/SplashActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
similarity index 98%
rename from app/src/main/java/com/dkanada/gramophone/activities/login/SplashActivity.java
rename to app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
index 639fb624..97ca7f61 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/login/SplashActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
@@ -1,4 +1,4 @@
-package com.dkanada.gramophone.activities.login;
+package com.dkanada.gramophone.activities;
 
 import android.app.AlertDialog;
 import android.content.Context;
diff --git a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
index 59e5481c..bde4c165 100644
--- a/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
+++ b/app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
@@ -18,7 +18,7 @@ import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
 import com.dkanada.gramophone.databinding.SlidingMusicPanelLayoutBinding;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
-import com.dkanada.gramophone.activities.login.SplashActivity;
+import com.dkanada.gramophone.activities.SplashActivity;
 import com.dkanada.gramophone.fragments.player.AbsPlayerFragment;
 import com.dkanada.gramophone.fragments.player.MiniPlayerFragment;
 import com.dkanada.gramophone.fragments.player.NowPlayingScreen;
diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
index e049f6db..a0194e9e 100644
--- a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
+++ b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
@@ -1,7 +1,6 @@
 package com.dkanada.gramophone.dialogs;
 
 import android.app.Dialog;
-import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -10,7 +9,6 @@ import androidx.fragment.app.DialogFragment;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.dkanada.gramophone.App;
 import com.dkanada.gramophone.R;
-import com.dkanada.gramophone.activities.login.LoginActivity;
 import com.dkanada.gramophone.helper.MusicPlayerRemote;
 import com.dkanada.gramophone.util.NavigationUtil;
 
diff --git a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
index c25b0181..2d423c22 100644
--- a/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
+++ b/app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.util.Pair;
 
-import com.dkanada.gramophone.activities.login.LoginActivity;
+import com.dkanada.gramophone.activities.LoginActivity;
 import com.dkanada.gramophone.activities.MainActivity;
 import com.dkanada.gramophone.model.Album;
 import com.dkanada.gramophone.model.Artist;
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ba100314..0188e885 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activities.login.LoginActivity">
+    tools:context=".activities.LoginActivity">
 
     <include layout="@layout/status_bar"
         android:id="@+id/status_bar"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index f0f22072..04de21fa 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activities.login.SplashActivity">
+    tools:context=".activities.SplashActivity">
 
     <ProgressBar
         android:layout_width="wrap_content"