tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert login activity moves

Browse source
This commit is contained in:
dkanada 2021-04-13 17:47:21 +09:00
commit ca84276165
8 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View file

@ -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

2
app/src/main/java/com/dkanada/gramophone/activities/login/LoginActivity.java → app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.activities.login;
package com.dkanada.gramophone.activities;
import android.content.Context;
import android.content.Intent;

2
app/src/main/java/com/dkanada/gramophone/activities/login/SplashActivity.java → app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.activities.login;
package com.dkanada.gramophone.activities;
import android.app.AlertDialog;
import android.content.Context;

2
app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -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;

2
app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java
View file

@ -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;

2
app/src/main/java/com/dkanada/gramophone/util/NavigationUtil.java
View file

@ -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;

2
app/src/main/res/layout/activity_login.xml
View file

@ -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"

2
app/src/main/res/layout/activity_splash.xml
View file

@ -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"