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

update widget names

Browse source
This commit is contained in:
dkanada 2020-05-05 17:26:38 +09:00
commit 1ebd9bea70
7 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,7 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver <receiver
android:name=".widgets.AppWidgetBig" 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>

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

@ -41,7 +41,7 @@ import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.SimpleTarget;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.glide.CustomGlideRequest; import com.kabouzeid.gramophone.glide.CustomGlideRequest;
import com.kabouzeid.gramophone.widgets.AppWidgetBig; import com.kabouzeid.gramophone.widgets.AppWidgetAlbum;
import com.kabouzeid.gramophone.widgets.AppWidgetCard; import com.kabouzeid.gramophone.widgets.AppWidgetCard;
import com.kabouzeid.gramophone.widgets.AppWidgetClassic; import com.kabouzeid.gramophone.widgets.AppWidgetClassic;
import com.kabouzeid.gramophone.widgets.AppWidgetSmall; import com.kabouzeid.gramophone.widgets.AppWidgetSmall;
@ -121,7 +121,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
public boolean pendingQuit = false; public boolean pendingQuit = false;
private AppWidgetBig appWidgetBig = AppWidgetBig.getInstance(); private AppWidgetAlbum appWidgetAlbum = AppWidgetAlbum.getInstance();
private AppWidgetClassic appWidgetClassic = AppWidgetClassic.getInstance(); private AppWidgetClassic appWidgetClassic = AppWidgetClassic.getInstance();
private AppWidgetSmall appWidgetSmall = AppWidgetSmall.getInstance(); private AppWidgetSmall appWidgetSmall = AppWidgetSmall.getInstance();
private AppWidgetCard appWidgetCard = AppWidgetCard.getInstance(); private AppWidgetCard appWidgetCard = AppWidgetCard.getInstance();
@ -1042,7 +1042,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private void sendChangeInternal(final String what) { private void sendChangeInternal(final String what) {
sendBroadcast(new Intent(what)); sendBroadcast(new Intent(what));
appWidgetBig.notifyChange(this, what); appWidgetAlbum.notifyChange(this, what);
appWidgetClassic.notifyChange(this, what); appWidgetClassic.notifyChange(this, what);
appWidgetSmall.notifyChange(this, what); appWidgetSmall.notifyChange(this, what);
appWidgetCard.notifyChange(this, what); appWidgetCard.notifyChange(this, what);
@ -1299,8 +1299,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
appWidgetSmall.performUpdate(MusicService.this, ids); appWidgetSmall.performUpdate(MusicService.this, ids);
break; break;
} }
case AppWidgetBig.NAME: { case AppWidgetAlbum.NAME: {
appWidgetBig.performUpdate(MusicService.this, ids); appWidgetAlbum.performUpdate(MusicService.this, ids);
break; break;
} }
case AppWidgetCard.NAME: { case AppWidgetCard.NAME: {

13
app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java → app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java
View file

@ -25,16 +25,17 @@ import com.kabouzeid.gramophone.ui.activities.MainActivity;
import com.kabouzeid.gramophone.util.ImageUtil; import com.kabouzeid.gramophone.util.ImageUtil;
import com.kabouzeid.gramophone.util.Util; import com.kabouzeid.gramophone.util.Util;
public class AppWidgetBig extends BaseAppWidget { public class AppWidgetAlbum extends BaseAppWidget {
public static final String NAME = "app_widget_big"; public static final String NAME = "app_widget_album";
private static AppWidgetBig mInstance; private static AppWidgetAlbum mInstance;
private Target<Bitmap> target; // for cancellation private Target<Bitmap> target;
public static synchronized AppWidgetBig getInstance() { public static synchronized AppWidgetAlbum getInstance() {
if (mInstance == null) { if (mInstance == null) {
mInstance = new AppWidgetBig(); mInstance = new AppWidgetAlbum();
} }
return mInstance; return mInstance;
} }

3
app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java
View file

@ -31,12 +31,13 @@ public class AppWidgetCard extends BaseAppWidget {
private static AppWidgetCard mInstance; private static AppWidgetCard mInstance;
private static int imageSize = 0; private static int imageSize = 0;
private static float cardRadius = 0f; private static float cardRadius = 0f;
private Target<BitmapPaletteWrapper> target; // for cancellation private Target<BitmapPaletteWrapper> target;
public static synchronized AppWidgetCard getInstance() { public static synchronized AppWidgetCard getInstance() {
if (mInstance == null) { if (mInstance == null) {
mInstance = new AppWidgetCard(); mInstance = new AppWidgetCard();
} }
return mInstance; return mInstance;
} }

3
app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java
View file

@ -31,12 +31,13 @@ public class AppWidgetClassic extends BaseAppWidget {
private static AppWidgetClassic mInstance; private static AppWidgetClassic mInstance;
private static int imageSize = 0; private static int imageSize = 0;
private static float cardRadius = 0f; private static float cardRadius = 0f;
private Target<BitmapPaletteWrapper> target; // for cancellation private Target<BitmapPaletteWrapper> target;
public static synchronized AppWidgetClassic getInstance() { public static synchronized AppWidgetClassic getInstance() {
if (mInstance == null) { if (mInstance == null) {
mInstance = new AppWidgetClassic(); mInstance = new AppWidgetClassic();
} }
return mInstance; return mInstance;
} }

4
app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
View file

@ -15,13 +15,13 @@ public class BootReceiver extends BroadcastReceiver {
final AppWidgetManager widgetManager = AppWidgetManager.getInstance(context); final AppWidgetManager widgetManager = AppWidgetManager.getInstance(context);
// start music service if there are any existing widgets // start music service if there are any existing widgets
if (widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetBig.class)).length > 0 if (widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetAlbum.class)).length > 0
|| widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetClassic.class)).length > 0 || widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetClassic.class)).length > 0
|| widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetSmall.class)).length > 0 || widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetSmall.class)).length > 0
|| widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetCard.class)).length > 0) { || widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetCard.class)).length > 0) {
final Intent serviceIntent = new Intent(context, MusicService.class); final Intent serviceIntent = new Intent(context, MusicService.class);
// not allowed on Oreo // not allowed on oreo
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
context.startService(serviceIntent); context.startService(serviceIntent);
} }

8
app/src/main/res/values/strings.xml
View file

@ -190,10 +190,10 @@
<string name="failed_to_save_playlist">Failed to save playlist (%s).</string> <string name="failed_to_save_playlist">Failed to save playlist (%s).</string>
<string name="saved_x_playlists_to_x">Saved %1$d playlists to %2$s.</string> <string name="saved_x_playlists_to_x">Saved %1$d playlists to %2$s.</string>
<string name="saved_x_playlists_to_x_failed_to_save_x">Saved %1$d playlists to %2$s, failed to save %3$d.</string> <string name="saved_x_playlists_to_x_failed_to_save_x">Saved %1$d playlists to %2$s, failed to save %3$d.</string>
<string name="app_widget_big_name">Phonograph - Big</string> <string name="app_widget_big_name">Phonograph Album</string>
<string name="app_widget_classic_name">Phonograph - Classic</string> <string name="app_widget_classic_name">Phonograph Classic</string>
<string name="app_widget_small_name">Phonograph - Small</string> <string name="app_widget_small_name">Phonograph Small</string>
<string name="app_widget_card_name">Phonograph - Card</string> <string name="app_widget_card_name">Phonograph Card</string>
<string name="login">Login</string> <string name="login">Login</string>
<string name="logout">Logout</string> <string name="logout">Logout</string>
<string name="username">Username</string> <string name="username">Username</string>