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

move shortcut and widget folders

Browse source
This commit is contained in:
dkanada 2019-07-17 00:33:06 -07:00
commit bbd24b2ea3
47 changed files with 55 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/kabouzeid/gramophone/App.java
View file

@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
import com.anjlab.android.iab.v3.BillingProcessor;
import com.anjlab.android.iab.v3.TransactionDetails;
import com.kabouzeid.appthemehelper.ThemeStore;
import com.kabouzeid.gramophone.appshortcuts.DynamicShortcutManager;
import com.kabouzeid.gramophone.shortcuts.DynamicShortcutManager;
import org.jellyfin.apiclient.interaction.AndroidConnectionManager;
import org.jellyfin.apiclient.interaction.AndroidDevice;

98
app/src/main/java/com/kabouzeid/gramophone/misc/NonProAllowedColors.java
View file

@ -1,98 +0,0 @@
package com.kabouzeid.gramophone.misc;
import android.graphics.Color;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public interface NonProAllowedColors {
int[] PRIMARY_COLORS =
new int[]{
// Red
Color.parseColor("#FFEBEE"),
Color.parseColor("#FFCDD2"),
Color.parseColor("#EF9A9A"),
Color.parseColor("#E57373"),
Color.parseColor("#EF5350"),
Color.parseColor("#F44336"),
Color.parseColor("#E53935"),
Color.parseColor("#D32F2F"),
Color.parseColor("#C62828"),
Color.parseColor("#B71C1C"),
// Pink
Color.parseColor("#FCE4EC"),
Color.parseColor("#F8BBD0"),
Color.parseColor("#F48FB1"),
Color.parseColor("#F06292"),
Color.parseColor("#EC407A"),
Color.parseColor("#E91E63"),
Color.parseColor("#D81B60"),
Color.parseColor("#C2185B"),
Color.parseColor("#AD1457"),
Color.parseColor("#880E4F"),
// Purple
Color.parseColor("#F3E5F5"),
Color.parseColor("#E1BEE7"),
Color.parseColor("#CE93D8"),
Color.parseColor("#BA68C8"),
Color.parseColor("#AB47BC"),
Color.parseColor("#9C27B0"),
Color.parseColor("#8E24AA"),
Color.parseColor("#7B1FA2"),
Color.parseColor("#6A1B9A"),
Color.parseColor("#4A148C"),
// Deep Purple
Color.parseColor("#EDE7F6"),
Color.parseColor("#D1C4E9"),
Color.parseColor("#B39DDB"),
Color.parseColor("#9575CD"),
Color.parseColor("#7E57C2"),
Color.parseColor("#673AB7"),
Color.parseColor("#5E35B1"),
Color.parseColor("#512DA8"),
Color.parseColor("#4527A0"),
Color.parseColor("#311B92"),
// Indigo
Color.parseColor("#E8EAF6"),
Color.parseColor("#C5CAE9"),
Color.parseColor("#9FA8DA"),
Color.parseColor("#7986CB"),
Color.parseColor("#5C6BC0"),
Color.parseColor("#3F51B5"),
Color.parseColor("#3949AB"),
Color.parseColor("#303F9F"),
Color.parseColor("#283593"),
Color.parseColor("#1A237E")
};
int[] ACCENT_COLORS =
new int[]{
// Red
Color.parseColor("#FF8A80"),
Color.parseColor("#FF5252"),
Color.parseColor("#FF1744"),
Color.parseColor("#D50000"),
// Pink
Color.parseColor("#FF80AB"),
Color.parseColor("#FF4081"),
Color.parseColor("#F50057"),
Color.parseColor("#C51162"),
// Purple
Color.parseColor("#EA80FC"),
Color.parseColor("#E040FB"),
Color.parseColor("#D500F9"),
Color.parseColor("#AA00FF"),
// Deep Purple
Color.parseColor("#B388FF"),
Color.parseColor("#7C4DFF"),
Color.parseColor("#651FFF"),
Color.parseColor("#6200EA"),
// Indigo
Color.parseColor("#8C9EFF"),
Color.parseColor("#536DFE"),
Color.parseColor("#3D5AFE"),
Color.parseColor("#304FFE")
};
}

11
app/src/main/java/com/kabouzeid/gramophone/provider/MusicPlaybackQueueStore.java → app/src/main/java/com/kabouzeid/gramophone/provider/QueueStore.java
View file

@ -28,7 +28,6 @@ import androidx.annotation.Nullable;
import com.kabouzeid.gramophone.loader.SongLoader;
import com.kabouzeid.gramophone.model.Song;
import java.util.ArrayList;
import java.util.List;
/**
@ -36,9 +35,9 @@ import java.util.List;
* <p/>
* This keeps track of the music playback and history state of the playback service
*/
public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
public class QueueStore extends SQLiteOpenHelper {
@Nullable
private static MusicPlaybackQueueStore sInstance = null;
private static QueueStore sInstance = null;
public static final String DATABASE_NAME = "music_playback_state.db";
public static final String PLAYING_QUEUE_TABLE_NAME = "playing_queue";
public static final String ORIGINAL_PLAYING_QUEUE_TABLE_NAME = "original_playing_queue";
@ -49,7 +48,7 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
*
* @param context The {@link Context} to use
*/
public MusicPlaybackQueueStore(final Context context) {
public QueueStore(final Context context) {
super(context, DATABASE_NAME, null, VERSION);
}
@ -123,9 +122,9 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
* @return A new instance of this class.
*/
@NonNull
public static synchronized MusicPlaybackQueueStore getInstance(@NonNull final Context context) {
public static synchronized QueueStore getInstance(@NonNull final Context context) {
if (sInstance == null) {
sInstance = new MusicPlaybackQueueStore(context.getApplicationContext());
sInstance = new QueueStore(context.getApplicationContext());
}
return sInstance;
}

16
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -40,10 +40,10 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidgets.AppWidgetBig;
import com.kabouzeid.gramophone.appwidgets.AppWidgetCard;
import com.kabouzeid.gramophone.appwidgets.AppWidgetClassic;
import com.kabouzeid.gramophone.appwidgets.AppWidgetSmall;
import com.kabouzeid.gramophone.widgets.AppWidgetBig;
import com.kabouzeid.gramophone.widgets.AppWidgetCard;
import com.kabouzeid.gramophone.widgets.AppWidgetClassic;
import com.kabouzeid.gramophone.widgets.AppWidgetSmall;
import com.kabouzeid.gramophone.glide.BlurTransformation;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.helper.ShuffleHelper;
@ -53,7 +53,7 @@ import com.kabouzeid.gramophone.model.AbsCustomPlaylist;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.provider.HistoryStore;
import com.kabouzeid.gramophone.provider.MusicPlaybackQueueStore;
import com.kabouzeid.gramophone.provider.QueueStore;
import com.kabouzeid.gramophone.provider.SongPlayCountStore;
import com.kabouzeid.gramophone.service.notification.PlayingNotification;
import com.kabouzeid.gramophone.service.notification.PlayingNotificationImpl;
@ -395,7 +395,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
}
private void saveQueuesImpl() {
MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
QueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
}
private void savePosition() {
@ -429,8 +429,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private synchronized void restoreQueuesAndPositionIfNecessary() {
if (!queuesRestored && playingQueue.isEmpty()) {
List<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
List<Song> restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
List<Song> restoredQueue = QueueStore.getInstance(this).getSavedPlayingQueue();
List<Song> restoredOriginalQueue = QueueStore.getInstance(this).getSavedOriginalPlayingQueue();
int restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION, -1);
int restoredPositionInTrack = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION_IN_TRACK, -1);

2
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutIconGenerator.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutIconGenerator.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appshortcuts;
package com.kabouzeid.gramophone.shortcuts;
import android.content.Context;
import android.graphics.drawable.AdaptiveIconDrawable;

10
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/AppShortcutLauncherActivity.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/AppShortcutLauncherActivity.java
View file

@ -1,12 +1,12 @@
package com.kabouzeid.gramophone.appshortcuts;
package com.kabouzeid.gramophone.shortcuts;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import com.kabouzeid.gramophone.appshortcuts.shortcuttype.LatestShortcutType;
import com.kabouzeid.gramophone.appshortcuts.shortcuttype.ShuffleShortcutType;
import com.kabouzeid.gramophone.appshortcuts.shortcuttype.FrequentShortcutType;
import com.kabouzeid.gramophone.shortcuts.shortcuttype.LatestShortcutType;
import com.kabouzeid.gramophone.shortcuts.shortcuttype.ShuffleShortcutType;
import com.kabouzeid.gramophone.shortcuts.shortcuttype.FrequentShortcutType;
import com.kabouzeid.gramophone.model.Playlist;
import com.kabouzeid.gramophone.model.smartplaylist.LatestPlaylist;
import com.kabouzeid.gramophone.model.smartplaylist.FrequentPlaylist;
@ -18,7 +18,7 @@ import com.kabouzeid.gramophone.service.MusicService;
*/
public class AppShortcutLauncherActivity extends Activity {
public static final String KEY_SHORTCUT_TYPE = "com.kabouzeid.gramophone.appshortcuts.ShortcutType";
public static final String KEY_SHORTCUT_TYPE = "com.kabouzeid.gramophone.shortcuts.ShortcutType";
public static final int SHORTCUT_TYPE_SHUFFLE = 0;
public static final int SHORTCUT_TYPE_FREQUENT = 1;

8
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/DynamicShortcutManager.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/DynamicShortcutManager.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appshortcuts;
package com.kabouzeid.gramophone.shortcuts;
import android.annotation.TargetApi;
import android.content.Context;
@ -8,9 +8,9 @@ import android.content.pm.ShortcutManager;
import android.graphics.drawable.Icon;
import android.os.Build;
import com.kabouzeid.gramophone.appshortcuts.shortcuttype.LatestShortcutType;
import com.kabouzeid.gramophone.appshortcuts.shortcuttype.ShuffleShortcutType;
import com.kabouzeid.gramophone.appshortcuts.shortcuttype.FrequentShortcutType;
import com.kabouzeid.gramophone.shortcuts.shortcuttype.LatestShortcutType;
import com.kabouzeid.gramophone.shortcuts.shortcuttype.ShuffleShortcutType;
import com.kabouzeid.gramophone.shortcuts.shortcuttype.FrequentShortcutType;
import java.util.Arrays;
import java.util.List;

6
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/BaseShortcutType.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/BaseShortcutType.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
package com.kabouzeid.gramophone.shortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
@ -7,7 +7,7 @@ import android.content.pm.ShortcutInfo;
import android.os.Build;
import android.os.Bundle;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos
@ -15,7 +15,7 @@ import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
@TargetApi(Build.VERSION_CODES.N_MR1)
public abstract class BaseShortcutType {
static final String ID_PREFIX = "com.kabouzeid.gramophone.appshortcuts.id.";
static final String ID_PREFIX = "com.kabouzeid.gramophone.shortcuts.id.";
Context context;

6
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/FrequentShortcutType.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/FrequentShortcutType.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
package com.kabouzeid.gramophone.shortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
import android.os.Build;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
import com.kabouzeid.gramophone.shortcuts.AppShortcutIconGenerator;
import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos

6
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LatestShortcutType.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/LatestShortcutType.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
package com.kabouzeid.gramophone.shortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
import android.os.Build;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
import com.kabouzeid.gramophone.shortcuts.AppShortcutIconGenerator;
import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos

6
app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleShortcutType.java → app/src/main/java/com/kabouzeid/gramophone/shortcuts/shortcuttype/ShuffleShortcutType.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appshortcuts.shortcuttype;
package com.kabouzeid.gramophone.shortcuts.shortcuttype;
import android.annotation.TargetApi;
import android.content.Context;
@ -6,8 +6,8 @@ import android.content.pm.ShortcutInfo;
import android.os.Build;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutIconGenerator;
import com.kabouzeid.gramophone.appshortcuts.AppShortcutLauncherActivity;
import com.kabouzeid.gramophone.shortcuts.AppShortcutIconGenerator;
import com.kabouzeid.gramophone.shortcuts.AppShortcutLauncherActivity;
/**
* @author Adrian Campos

29
app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java
View file

@ -24,8 +24,7 @@ import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragment
import com.kabouzeid.appthemehelper.util.ColorUtil;
import com.kabouzeid.gramophone.App;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appshortcuts.DynamicShortcutManager;
import com.kabouzeid.gramophone.misc.NonProAllowedColors;
import com.kabouzeid.gramophone.shortcuts.DynamicShortcutManager;
import com.kabouzeid.gramophone.preferences.LibraryPreference;
import com.kabouzeid.gramophone.preferences.LibraryPreferenceDialog;
import com.kabouzeid.gramophone.preferences.NowPlayingScreenPreference;
@ -71,32 +70,10 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia
public void onColorSelection(@NonNull ColorChooserDialog dialog, @ColorInt int selectedColor) {
switch (dialog.getTitle()) {
case R.string.primary_color:
if (!App.isProVersion()) {
Arrays.sort(NonProAllowedColors.PRIMARY_COLORS);
if (Arrays.binarySearch(NonProAllowedColors.PRIMARY_COLORS, selectedColor) < 0) {
// color wasn't found
Toast.makeText(this, R.string.only_the_first_5_colors_available, Toast.LENGTH_LONG).show();
startActivity(new Intent(this, PurchaseActivity.class));
return;
}
}
ThemeStore.editTheme(this)
.primaryColor(selectedColor)
.commit();
ThemeStore.editTheme(this).primaryColor(selectedColor).commit();
break;
case R.string.accent_color:
if (!App.isProVersion()) {
Arrays.sort(NonProAllowedColors.ACCENT_COLORS);
if (Arrays.binarySearch(NonProAllowedColors.ACCENT_COLORS, selectedColor) < 0) {
// color wasn't found
Toast.makeText(this, R.string.only_the_first_5_colors_available, Toast.LENGTH_LONG).show();
startActivity(new Intent(this, PurchaseActivity.class));
return;
}
}
ThemeStore.editTheme(this)
.accentColor(selectedColor)
.commit();
ThemeStore.editTheme(this).accentColor(selectedColor).commit();
break;
}

4
app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetBig.java → app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appwidgets;
package com.kabouzeid.gramophone.widgets;
import android.app.PendingIntent;
import android.content.ComponentName;
@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.model.Song;
import com.kabouzeid.gramophone.service.MusicService;

4
app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetCard.java → app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appwidgets;
package com.kabouzeid.gramophone.widgets;
import android.app.PendingIntent;
import android.content.ComponentName;
@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
import com.kabouzeid.gramophone.model.Song;

4
app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java → app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appwidgets;
package com.kabouzeid.gramophone.widgets;
import android.app.PendingIntent;
import android.content.ComponentName;
@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
import com.kabouzeid.gramophone.model.Song;

4
app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java → app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appwidgets;
package com.kabouzeid.gramophone.widgets;
import android.app.PendingIntent;
import android.content.ComponentName;
@ -18,7 +18,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.widgets.base.BaseAppWidget;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
import com.kabouzeid.gramophone.model.Song;

2
app/src/main/java/com/kabouzeid/gramophone/appwidgets/BootReceiver.java → app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appwidgets;
package com.kabouzeid.gramophone.widgets;
import android.appwidget.AppWidgetManager;
import android.content.BroadcastReceiver;

2
app/src/main/java/com/kabouzeid/gramophone/appwidgets/base/BaseAppWidget.java → app/src/main/java/com/kabouzeid/gramophone/widgets/base/BaseAppWidget.java
View file

@ -1,4 +1,4 @@
package com.kabouzeid.gramophone.appwidgets.base;
package com.kabouzeid.gramophone.widgets.base;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;