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

fix android manifest and update imports

Browse source
This commit is contained in:
dkanada 2020-05-09 04:51:21 +09:00
commit 97f3fcbaf5
16 changed files with 25 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.kabouzeid.gramophone"> package="com.dkanada.gramophone">
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@ -12,7 +12,7 @@
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<application <application
android:name="com.dkanada.gramophone.App" android:name=".App"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
@ -20,13 +20,13 @@
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:theme="@style/Theme.Phonograph.Light" android:theme="@style/Theme.Phonograph.Light"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute">
<activity android:name="com.dkanada.gramophone.ui.activities.MainActivity" /> <activity android:name=".ui.activities.MainActivity" />
<activity android:name="com.dkanada.gramophone.ui.activities.AlbumDetailActivity" /> <activity android:name=".ui.activities.AlbumDetailActivity" />
<activity android:name="com.dkanada.gramophone.ui.activities.ArtistDetailActivity" /> <activity android:name=".ui.activities.ArtistDetailActivity" />
<activity android:name="com.dkanada.gramophone.ui.activities.GenreDetailActivity" /> <activity android:name=".ui.activities.GenreDetailActivity" />
<activity android:name="com.dkanada.gramophone.ui.activities.PlaylistDetailActivity" /> <activity android:name=".ui.activities.PlaylistDetailActivity" />
<activity android:name="com.dkanada.gramophone.ui.activities.SearchActivity" /> <activity android:name=".ui.activities.SearchActivity" />
<activity android:name="com.dkanada.gramophone.ui.activities.SplashActivity"> <activity android:name=".ui.activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MUSIC_PLAYER" /> <action android:name="android.intent.action.MUSIC_PLAYER" />
@ -45,24 +45,24 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name="com.dkanada.gramophone.ui.activities.SettingsActivity" android:name=".ui.activities.SettingsActivity"
android:label="@string/action_settings" /> android:label="@string/action_settings" />
<activity <activity
android:name="com.dkanada.gramophone.ui.activities.AboutActivity" android:name=".ui.activities.AboutActivity"
android:label="@string/action_about" /> android:label="@string/action_about" />
<activity <activity
android:name="com.dkanada.gramophone.ui.activities.LoginActivity" android:name=".ui.activities.LoginActivity"
android:label="@string/action_login" /> android:label="@string/action_login" />
<activity <activity
android:name="com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity" android:name=".shortcuts.AppShortcutLauncherActivity"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:theme="@android:style/Theme.Translucent.NoTitleBar" /> android:theme="@android:style/Theme.Translucent.NoTitleBar" />
<service <service
android:name="com.dkanada.gramophone.service.MusicService" android:name=".service.MusicService"
android:enabled="true" /> android:enabled="true" />
<receiver android:name="com.dkanada.gramophone.service.MediaButtonIntentReceiver"> <receiver android:name=".service.MediaButtonIntentReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" /> <action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter> </intent-filter>
@ -78,7 +78,7 @@
android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule" android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
android:value="GlideModule" /> android:value="GlideModule" />
<receiver android:name="com.dkanada.gramophone.widgets.BootReceiver"> <receiver android:name=".widgets.BootReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" /> <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@ -86,7 +86,7 @@
</receiver> </receiver>
<receiver <receiver
android:name="com.dkanada.gramophone.widgets.AppWidgetAlbum" android:name=".widgets.AppWidgetAlbum"
android:exported="false" android:exported="false"
android:label="@string/app_widget_big_name"> android:label="@string/app_widget_big_name">
<intent-filter> <intent-filter>
@ -98,7 +98,7 @@
android:resource="@xml/app_widget_album_info" /> android:resource="@xml/app_widget_album_info" />
</receiver> </receiver>
<receiver <receiver
android:name="com.dkanada.gramophone.widgets.AppWidgetClassic" android:name=".widgets.AppWidgetClassic"
android:exported="false" android:exported="false"
android:label="@string/app_widget_classic_name"> android:label="@string/app_widget_classic_name">
<intent-filter> <intent-filter>
@ -110,7 +110,7 @@
android:resource="@xml/app_widget_classic_info" /> android:resource="@xml/app_widget_classic_info" />
</receiver> </receiver>
<receiver <receiver
android:name="com.dkanada.gramophone.widgets.AppWidgetCard" android:name=".widgets.AppWidgetCard"
android:exported="false" android:exported="false"
android:label="@string/app_widget_card_name"> android:label="@string/app_widget_card_name">
<intent-filter> <intent-filter>

2
app/src/main/java/com/dkanada/gramophone/adapter/artist/ArtistAdapter.java
View file

@ -20,13 +20,11 @@ import com.dkanada.gramophone.adapter.base.MediaEntryViewHolder;
import com.dkanada.gramophone.glide.CustomGlideRequest; import com.dkanada.gramophone.glide.CustomGlideRequest;
import com.dkanada.gramophone.glide.CustomPaletteTarget; import com.dkanada.gramophone.glide.CustomPaletteTarget;
import com.dkanada.gramophone.helper.menu.SongsMenuHelper; import com.dkanada.gramophone.helper.menu.SongsMenuHelper;
import com.dkanada.gramophone.helper.sort.SortMethod;
import com.dkanada.gramophone.interfaces.CabHolder; import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.model.Artist; import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Song; import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.util.MusicUtil; import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.NavigationUtil; import com.dkanada.gramophone.util.NavigationUtil;
import com.dkanada.gramophone.util.PreferenceUtil;
import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
import java.util.ArrayList; import java.util.ArrayList;

1
app/src/main/java/com/dkanada/gramophone/adapter/song/PlaylistSongAdapter.java
View file

@ -16,7 +16,6 @@ import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.util.MusicUtil; import com.dkanada.gramophone.util.MusicUtil;
import com.dkanada.gramophone.util.NavigationUtil; import com.dkanada.gramophone.util.NavigationUtil;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class PlaylistSongAdapter extends AbsOffsetSongAdapter { public class PlaylistSongAdapter extends AbsOffsetSongAdapter {

1
app/src/main/java/com/dkanada/gramophone/adapter/song/ShuffleButtonSongAdapter.java
View file

@ -13,7 +13,6 @@ import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.interfaces.CabHolder; import com.dkanada.gramophone.interfaces.CabHolder;
import com.dkanada.gramophone.model.Song; import com.dkanada.gramophone.model.Song;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class ShuffleButtonSongAdapter extends AbsOffsetSongAdapter { public class ShuffleButtonSongAdapter extends AbsOffsetSongAdapter {

2
app/src/main/java/com/dkanada/gramophone/glide/palette/BitmapPaletteTranscoder.java
View file

@ -29,6 +29,6 @@ public class BitmapPaletteTranscoder implements ResourceTranscoder<Bitmap, Bitma
@Override @Override
public String getId() { public String getId() {
return "BitmapPaletteTranscoder.com.kabouzeid.gramophone.glide.palette"; return "BitmapPaletteTranscoder.com.dkanada.gramophone.glide.palette";
} }
} }

3
app/src/main/java/com/dkanada/gramophone/model/Album.java
View file

@ -3,10 +3,7 @@ package com.dkanada.gramophone.model;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.dkanada.gramophone.App;
import org.jellyfin.apiclient.model.dto.BaseItemDto; import org.jellyfin.apiclient.model.dto.BaseItemDto;
import org.jellyfin.apiclient.model.dto.ImageOptions;
import org.jellyfin.apiclient.model.entities.ImageType; import org.jellyfin.apiclient.model.entities.ImageType;
import java.util.ArrayList; import java.util.ArrayList;

1
app/src/main/java/com/dkanada/gramophone/service/MediaButtonIntentReceiver.java
View file

@ -17,7 +17,6 @@ import android.annotation.SuppressLint;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;

6
app/src/main/java/com/dkanada/gramophone/service/MusicService.java
View file

@ -63,7 +63,7 @@ import java.util.List;
import java.util.Random; import java.util.Random;
public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks { public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
public static final String PHONOGRAPH_PACKAGE_NAME = "com.kabouzeid.gramophone"; public static final String PHONOGRAPH_PACKAGE_NAME = "com.dkanada.gramophone";
public static final String MUSIC_PACKAGE_NAME = "com.android.music"; public static final String MUSIC_PACKAGE_NAME = "com.android.music";
public static final String ACTION_TOGGLE_PAUSE = PHONOGRAPH_PACKAGE_NAME + ".togglepause"; public static final String ACTION_TOGGLE_PAUSE = PHONOGRAPH_PACKAGE_NAME + ".togglepause";
@ -212,7 +212,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
mediaSession.setActive(true); mediaSession.setActive(true);
sendBroadcast(new Intent("com.kabouzeid.gramophone.PHONOGRAPH_MUSIC_SERVICE_CREATED")); sendBroadcast(new Intent("com.dkanada.gramophone.PHONOGRAPH_MUSIC_SERVICE_CREATED"));
} }
private AudioManager getAudioManager() { private AudioManager getAudioManager() {
@ -348,7 +348,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this); PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this);
wakeLock.release(); wakeLock.release();
sendBroadcast(new Intent("com.kabouzeid.gramophone.PHONOGRAPH_MUSIC_SERVICE_DESTROYED")); sendBroadcast(new Intent("com.dkanada.gramophone.PHONOGRAPH_MUSIC_SERVICE_DESTROYED"));
} }
@Override @Override

2
app/src/main/java/com/dkanada/gramophone/shortcuts/AppShortcutLauncherActivity.java
View file

@ -11,7 +11,7 @@ import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.service.MusicService; import com.dkanada.gramophone.service.MusicService;
public class AppShortcutLauncherActivity extends Activity { public class AppShortcutLauncherActivity extends Activity {
public static final String KEY_SHORTCUT_TYPE = "com.kabouzeid.gramophone.shortcuts.ShortcutType"; public static final String KEY_SHORTCUT_TYPE = "com.dkanada.gramophone.shortcuts.ShortcutType";
public static final int SHORTCUT_TYPE_SHUFFLE = 0; public static final int SHORTCUT_TYPE_SHUFFLE = 0;
public static final int SHORTCUT_TYPE_FREQUENT = 1; public static final int SHORTCUT_TYPE_FREQUENT = 1;

2
app/src/main/java/com/dkanada/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
View file

@ -12,7 +12,7 @@ import com.dkanada.gramophone.shortcuts.AppShortcutLauncherActivity;
@TargetApi(Build.VERSION_CODES.N_MR1) @TargetApi(Build.VERSION_CODES.N_MR1)
public abstract class BaseShortcutType { public abstract class BaseShortcutType {
static final String ID_PREFIX = "com.kabouzeid.gramophone.shortcuts.id."; static final String ID_PREFIX = "com.dkanada.gramophone.shortcuts.id.";
Context context; Context context;

1
app/src/main/java/com/dkanada/gramophone/ui/activities/PlaylistDetailActivity.java
View file

@ -19,7 +19,6 @@ import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.ThemeStore;
import com.dkanada.gramophone.R; import com.dkanada.gramophone.R;
import com.dkanada.gramophone.adapter.song.OrderablePlaylistSongAdapter; import com.dkanada.gramophone.adapter.song.OrderablePlaylistSongAdapter;
import com.dkanada.gramophone.adapter.song.PlaylistSongAdapter;
import com.dkanada.gramophone.adapter.song.SongAdapter; import com.dkanada.gramophone.adapter.song.SongAdapter;
import com.dkanada.gramophone.helper.MusicPlayerRemote; import com.dkanada.gramophone.helper.MusicPlayerRemote;
import com.dkanada.gramophone.helper.menu.PlaylistMenuHelper; import com.dkanada.gramophone.helper.menu.PlaylistMenuHelper;

1
app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerFragment.java
View file

@ -1,7 +1,6 @@
package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager; package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager;
import android.os.Bundle; import android.os.Bundle;
import androidx.loader.app.LoaderManager;
import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment; import com.dkanada.gramophone.ui.fragments.AbsMusicServiceFragment;
import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment; import com.dkanada.gramophone.ui.fragments.mainactivity.library.LibraryFragment;

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

@ -2,11 +2,9 @@ package com.dkanada.gramophone.ui.fragments.player.card;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorSet; import android.animation.AnimatorSet;
import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;

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

@ -2,11 +2,9 @@ package com.dkanada.gramophone.ui.fragments.player.flat;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorSet; import android.animation.AnimatorSet;
import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;

1
app/src/main/java/com/dkanada/gramophone/util/MusicUtil.java
View file

@ -14,7 +14,6 @@ import com.dkanada.gramophone.R;
import com.dkanada.gramophone.model.Album; import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist; import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Genre; import com.dkanada.gramophone.model.Genre;
import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.model.Song; import com.dkanada.gramophone.model.Song;
import org.jellyfin.apiclient.interaction.Response; import org.jellyfin.apiclient.interaction.Response;

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

@ -11,7 +11,6 @@ import com.dkanada.gramophone.model.Album;
import com.dkanada.gramophone.model.Artist; import com.dkanada.gramophone.model.Artist;
import com.dkanada.gramophone.model.Genre; import com.dkanada.gramophone.model.Genre;
import com.dkanada.gramophone.model.Playlist; import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.model.Song;
import com.dkanada.gramophone.ui.activities.AlbumDetailActivity; import com.dkanada.gramophone.ui.activities.AlbumDetailActivity;
import com.dkanada.gramophone.ui.activities.ArtistDetailActivity; import com.dkanada.gramophone.ui.activities.ArtistDetailActivity;
import com.dkanada.gramophone.ui.activities.GenreDetailActivity; import com.dkanada.gramophone.ui.activities.GenreDetailActivity;