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

move activities to root directory

Browse source
This commit is contained in:
dkanada 2020-12-13 22:08:21 +09:00
commit 53657919af
30 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,14 +22,14 @@
android:theme="@style/Theme.Phonograph.Light"
tools:ignore="UnusedAttribute">
<activity
android:name=".ui.activities.MainActivity"
android:name=".activities.MainActivity"
android:launchMode="singleTop" />
<activity android:name=".ui.activities.details.AlbumDetailActivity" />
<activity android:name=".ui.activities.details.ArtistDetailActivity" />
<activity android:name=".ui.activities.details.GenreDetailActivity" />
<activity android:name=".ui.activities.details.PlaylistDetailActivity" />
<activity android:name=".ui.activities.SearchActivity" />
<activity android:name=".ui.activities.SplashActivity">
<activity android:name=".activities.details.AlbumDetailActivity" />
<activity android:name=".activities.details.ArtistDetailActivity" />
<activity android:name=".activities.details.GenreDetailActivity" />
<activity android:name=".activities.details.PlaylistDetailActivity" />
<activity android:name=".activities.SearchActivity" />
<activity android:name=".activities.SplashActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MUSIC_PLAYER" />
@ -48,13 +48,13 @@
</intent-filter>
</activity>
<activity
android:name=".ui.activities.SettingsActivity"
android:name=".activities.SettingsActivity"
android:label="@string/action_settings" />
<activity
android:name=".ui.activities.AboutActivity"
android:name=".activities.AboutActivity"
android:label="@string/action_about" />
<activity
android:name=".ui.activities.LoginActivity"
android:name=".activities.LoginActivity"
android:label="@string/action_login"
android:theme="@style/LoginScreen" />
<activity

4
app/src/main/java/com/dkanada/gramophone/ui/activities/AboutActivity.java → app/src/main/java/com/dkanada/gramophone/activities/AboutActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities;
package com.dkanada.gramophone.activities;
import android.content.Context;
import android.content.Intent;
@ -17,7 +17,7 @@ import com.dkanada.gramophone.databinding.CardAuthorBinding;
import com.dkanada.gramophone.databinding.CardSpecialThanksBinding;
import com.dkanada.gramophone.databinding.CardSupportDevelopmentBinding;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
@SuppressWarnings("FieldCanBeLocal")
public class AboutActivity extends AbsBaseActivity implements View.OnClickListener {

4
app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java → app/src/main/java/com/dkanada/gramophone/activities/LoginActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities;
package com.dkanada.gramophone.activities;
import android.content.Context;
import android.content.Intent;
@ -13,7 +13,7 @@ import androidx.annotation.NonNull;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.databinding.ActivityLoginBinding;
import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.kabouzeid.appthemehelper.ThemeStore;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/MainActivity.java → app/src/main/java/com/dkanada/gramophone/activities/MainActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities;
package com.dkanada.gramophone.activities;
import android.content.Intent;
import android.os.Build;
@ -25,7 +25,7 @@ import com.dkanada.gramophone.R;
import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.QueryUtil;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/SearchActivity.java → app/src/main/java/com/dkanada/gramophone/activities/SearchActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities;
package com.dkanada.gramophone.activities;
import android.os.Bundle;
import android.os.Handler;
@ -18,7 +18,7 @@ import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsMusicServiceActivity;
import com.dkanada.gramophone.activities.base.AbsMusicServiceActivity;
import com.dkanada.gramophone.util.QueryUtil;
import com.dkanada.gramophone.util.Util;
import com.kabouzeid.appthemehelper.ThemeStore;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java → app/src/main/java/com/dkanada/gramophone/activities/SettingsActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities;
package com.dkanada.gramophone.activities;
import android.content.SharedPreferences;
import android.os.Build;
@ -29,7 +29,7 @@ import com.dkanada.gramophone.preferences.CategoryPreference;
import com.dkanada.gramophone.preferences.CategoryPreferenceDialog;
import com.dkanada.gramophone.preferences.NowPlayingScreenPreference;
import com.dkanada.gramophone.preferences.NowPlayingScreenPreferenceDialog;
import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.util.PreferenceUtil;
public class SettingsActivity extends AbsBaseActivity implements ColorChooserDialog.ColorCallback {

4
app/src/main/java/com/dkanada/gramophone/ui/activities/SplashActivity.java → app/src/main/java/com/dkanada/gramophone/activities/SplashActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities;
package com.dkanada.gramophone.activities;
import android.app.AlertDialog;
import android.content.Context;
@ -12,7 +12,7 @@ import androidx.annotation.RequiresApi;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.ui.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.activities.base.AbsBaseActivity;
import com.dkanada.gramophone.util.PreferenceUtil;
import org.jellyfin.apiclient.interaction.EmptyResponse;

2
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsBaseActivity.java → app/src/main/java/com/dkanada/gramophone/activities/base/AbsBaseActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.base;
package com.dkanada.gramophone.activities.base;
import android.Manifest;
import android.content.Intent;

2
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsMusicServiceActivity.java → app/src/main/java/com/dkanada/gramophone/activities/base/AbsMusicServiceActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.base;
package com.dkanada.gramophone.activities.base;
import android.Manifest;
import android.content.BroadcastReceiver;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java → app/src/main/java/com/dkanada/gramophone/activities/base/AbsSlidingMusicPanelActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.base;
package com.dkanada.gramophone.activities.base;
import android.animation.ValueAnimator;
import android.content.Intent;
@ -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.ui.activities.SplashActivity;
import com.dkanada.gramophone.activities.SplashActivity;
import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.MiniPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.NowPlayingScreen;

2
app/src/main/java/com/dkanada/gramophone/ui/activities/base/AbsThemeActivity.java → app/src/main/java/com/dkanada/gramophone/activities/base/AbsThemeActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.base;
package com.dkanada.gramophone.activities.base;
import android.os.Build;
import android.os.Bundle;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/details/AlbumDetailActivity.java → app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.details;
package com.dkanada.gramophone.activities.details;
import android.graphics.PorterDuff;
import android.os.Bundle;
@ -29,7 +29,7 @@ import com.dkanada.gramophone.interfaces.PaletteColorHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.util.ThemeUtil;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/details/ArtistDetailActivity.java → app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.details;
package com.dkanada.gramophone.activities.details;
import android.graphics.PorterDuff;
import android.os.Bundle;
@ -31,7 +31,7 @@ import com.dkanada.gramophone.interfaces.PaletteColorHolder;
import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.PreferenceUtil;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/details/GenreDetailActivity.java → app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.details;
package com.dkanada.gramophone.activities.details;
import android.os.Bundle;
import android.view.Menu;
@ -20,7 +20,7 @@ import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.model.Genre;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.QueryUtil;
import com.dkanada.gramophone.util.ViewUtil;

4
app/src/main/java/com/dkanada/gramophone/ui/activities/details/PlaylistDetailActivity.java → app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.ui.activities.details;
package com.dkanada.gramophone.activities.details;
import android.os.Bundle;
import android.view.Menu;
@ -26,7 +26,7 @@ import com.dkanada.gramophone.interfaces.MediaCallback;
import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.model.PlaylistSong;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.PlaylistUtil;
import com.dkanada.gramophone.util.ViewUtil;

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

@ -10,7 +10,7 @@ import androidx.fragment.app.DialogFragment;
import com.afollestad.materialdialogs.MaterialDialog;
import com.dkanada.gramophone.App;
import com.dkanada.gramophone.R;
import com.dkanada.gramophone.ui.activities.LoginActivity;
import com.dkanada.gramophone.activities.LoginActivity;
import org.jellyfin.apiclient.interaction.EmptyResponse;

2
app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl.java
View file

@ -27,7 +27,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.util.ImageUtil;
import com.dkanada.gramophone.util.ThemeUtil;
import com.dkanada.gramophone.util.PreferenceUtil;

2
app/src/main/java/com/dkanada/gramophone/service/notification/PlayingNotificationImpl24.java
View file

@ -21,7 +21,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.util.PreferenceUtil;
import static com.dkanada.gramophone.service.MusicService.ACTION_REWIND;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/AbsMusicServiceFragment.java
View file

@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import com.dkanada.gramophone.interfaces.MusicServiceEventListener;
import com.dkanada.gramophone.ui.activities.base.AbsMusicServiceActivity;
import com.dkanada.gramophone.activities.base.AbsMusicServiceActivity;
public class AbsMusicServiceFragment extends Fragment implements MusicServiceEventListener {
private AbsMusicServiceActivity activity;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/AbsMainActivityFragment.java
View file

@ -4,7 +4,7 @@ import android.os.Bundle;
import androidx.fragment.app.Fragment;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.activities.MainActivity;
public abstract class AbsMainActivityFragment extends Fragment {
public MainActivity getMainActivity() {

4
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java
View file

@ -31,8 +31,8 @@ import com.dkanada.gramophone.dialogs.CreatePlaylistDialog;
import com.dkanada.gramophone.helper.sort.SortMethod;
import com.dkanada.gramophone.helper.sort.SortOrder;
import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.ui.activities.SearchActivity;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.activities.SearchActivity;
import com.dkanada.gramophone.ui.fragments.mainactivity.AbsMainActivityFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.pager.AlbumsFragment;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/card/CardPlayerFragment.java
View file

@ -37,7 +37,7 @@ import com.dkanada.gramophone.dialogs.SongShareDialog;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.SongMenuHelper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment;
import com.dkanada.gramophone.util.ImageUtil;

2
app/src/main/java/com/dkanada/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java
View file

@ -35,7 +35,7 @@ import com.dkanada.gramophone.dialogs.SongShareDialog;
import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.SongMenuHelper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.activities.base.AbsSlidingMusicPanelActivity;
import com.dkanada.gramophone.ui.fragments.player.AbsPlayerFragment;
import com.dkanada.gramophone.ui.fragments.player.PlayerAlbumCoverFragment;
import com.dkanada.gramophone.util.ImageUtil;

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

@ -12,10 +12,10 @@ import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Genre;
import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.ui.activities.details.AlbumDetailActivity;
import com.dkanada.gramophone.ui.activities.details.ArtistDetailActivity;
import com.dkanada.gramophone.ui.activities.details.GenreDetailActivity;
import com.dkanada.gramophone.ui.activities.details.PlaylistDetailActivity;
import com.dkanada.gramophone.activities.details.AlbumDetailActivity;
import com.dkanada.gramophone.activities.details.ArtistDetailActivity;
import com.dkanada.gramophone.activities.details.GenreDetailActivity;
import com.dkanada.gramophone.activities.details.PlaylistDetailActivity;
public class NavigationUtil {

2
app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java
View file

@ -23,7 +23,7 @@ import com.dkanada.gramophone.R;
import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.util.ImageUtil;
import com.dkanada.gramophone.util.Util;

2
app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java
View file

@ -24,7 +24,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.util.ImageUtil;
public class AppWidgetCard extends BaseAppWidget {

2
app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java
View file

@ -24,7 +24,7 @@ import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.palette.BitmapPaletteWrapper;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.service.MusicService;
import com.dkanada.gramophone.ui.activities.MainActivity;
import com.dkanada.gramophone.activities.MainActivity;
import com.dkanada.gramophone.util.ImageUtil;
public class AppWidgetClassic extends BaseAppWidget {

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

@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ui.activities.AboutActivity">
tools:context=".activities.AboutActivity">
<include layout="@layout/status_bar" />

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=".ui.activities.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=".ui.activities.SplashActivity">
tools:context=".activities.SplashActivity">
<ProgressBar
android:layout_width="wrap_content"