Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

More UltraSonic -> Ultrasonic 

Signed-off-by: Óscar García Amor <ogarcia@connectical.com>
This commit is contained in:
Óscar García Amor 2020-09-24 13:03:05 +02:00
parent f0f9e3d438
commit a7d29a4093
No known key found for this signature in database
GPG Key ID: E18B2370D3D566EE
15 changed files with 57 additions and 4357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4300
ultrasonic/lint-baseline.xml
View File

File diff suppressed because it is too large Load Diff

8
ultrasonic/src/main/AndroidManifest.xml
View File

@ -150,7 +150,7 @@
</intent-filter>
</receiver>
<receiver
android:name=".provider.UltraSonicAppWidgetProvider4x1"
android:name=".provider.UltrasonicAppWidgetProvider4X1"
android:label="Ultrasonic (4x1)">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@ -161,7 +161,7 @@
android:resource="@xml/appwidget_info_4x1"/>
</receiver>
<receiver
android:name=".provider.UltraSonicAppWidgetProvider4x2"
android:name=".provider.UltrasonicAppWidgetProvider4X2"
android:label="Ultrasonic (4x2)">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@ -172,7 +172,7 @@
android:resource="@xml/appwidget_info_4x2"/>
</receiver>
<receiver
android:name=".provider.UltraSonicAppWidgetProvider4x3"
android:name=".provider.UltrasonicAppWidgetProvider4X3"
android:label="Ultrasonic (4x3)">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@ -183,7 +183,7 @@
android:resource="@xml/appwidget_info_4x3"/>
</receiver>
<receiver
android:name=".provider.UltraSonicAppWidgetProvider4x4"
android:name=".provider.UltrasonicAppWidgetProvider4X4"
android:label="Ultrasonic (4x4)">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>

4
ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java
View File

@ -198,11 +198,11 @@ public final class HelpActivity extends ResultActivity implements OnClickListene
if ("dark".equalsIgnoreCase(theme) || "fullscreen".equalsIgnoreCase(theme))
{
setTheme(R.style.UltraSonicTheme);
setTheme(R.style.UltrasonicTheme);
}
else if ("light".equalsIgnoreCase(theme) || "fullscreenlight".equalsIgnoreCase(theme))
{
setTheme(R.style.UltraSonicTheme_Light);
setTheme(R.style.UltrasonicTheme_Light);
}
}

12
ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java
View File

@ -1,5 +1,5 @@
/*
This file is part of UltraSonic.
This file is part of Ultrasonic.
Subsonic is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -301,11 +301,11 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
if ("dark".equalsIgnoreCase(theme) || "fullscreen".equalsIgnoreCase(theme))
{
setTheme(R.style.UltraSonicTheme);
setTheme(R.style.UltrasonicTheme);
}
else if ("light".equalsIgnoreCase(theme) || "fullscreenlight".equalsIgnoreCase(theme))
{
setTheme(R.style.UltraSonicTheme_Light);
setTheme(R.style.UltrasonicTheme_Light);
}
}
@ -1231,11 +1231,11 @@ public class SubsonicTabActivity extends ResultActivity implements OnClickListen
try
{
file = new File(FileUtil.getUltraSonicDirectory(context), filename);
file = new File(FileUtil.getUltrasonicDirectory(context), filename);
printWriter = new PrintWriter(file);
printWriter.println("Android API level: " + Build.VERSION.SDK_INT);
printWriter.println("UltraSonic version name: " + Util.getVersionName(context));
printWriter.println("UltraSonic version code: " + Util.getVersionCode(context));
printWriter.println("Ultrasonic version name: " + Util.getVersionName(context));
printWriter.println("Ultrasonic version code: " + Util.getVersionCode(context));
printWriter.println();
throwable.printStackTrace(printWriter);
Log.i(TAG, "Stack trace written to " + file);

2
ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java
View File

@ -341,7 +341,7 @@ public class SettingsFragment extends PreferenceFragment
}
private void setHideMedia(boolean hide) {
File nomediaDir = new File(FileUtil.getUltraSonicDirectory(getActivity()), ".nomedia");
File nomediaDir = new File(FileUtil.getUltrasonicDirectory(getActivity()), ".nomedia");
if (hide && !nomediaDir.exists()) {
if (!nomediaDir.mkdir()) {
Log.w(LOG_TAG, "Failed to create " + nomediaDir);

4
ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java
View File

@ -22,10 +22,10 @@ import org.moire.ultrasonic.service.MediaPlayerController;
import org.moire.ultrasonic.util.Constants;
import org.moire.ultrasonic.util.FileUtil;
public class UltraSonicAppWidgetProvider extends AppWidgetProvider
public class UltrasonicAppWidgetProvider extends AppWidgetProvider
{
private final static String TAG = UltraSonicAppWidgetProvider.class.getSimpleName();
private final static String TAG = UltrasonicAppWidgetProvider.class.getSimpleName();
protected int layoutId;
@Override

10
ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X1.java
View File

@ -20,22 +20,22 @@ package org.moire.ultrasonic.provider;
import org.moire.ultrasonic.R;
public class UltraSonicAppWidgetProvider4x1 extends UltraSonicAppWidgetProvider
public class UltrasonicAppWidgetProvider4X1 extends UltrasonicAppWidgetProvider
{
public UltraSonicAppWidgetProvider4x1()
public UltrasonicAppWidgetProvider4X1()
{
super();
this.layoutId = R.layout.appwidget4x1;
}
private static UltraSonicAppWidgetProvider4x1 instance;
private static UltrasonicAppWidgetProvider4X1 instance;
public static synchronized UltraSonicAppWidgetProvider4x1 getInstance()
public static synchronized UltrasonicAppWidgetProvider4X1 getInstance()
{
if (instance == null)
{
instance = new UltraSonicAppWidgetProvider4x1();
instance = new UltrasonicAppWidgetProvider4X1();
}
return instance;
}

10
ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X2.java
View File

@ -20,22 +20,22 @@ package org.moire.ultrasonic.provider;
import org.moire.ultrasonic.R;
public class UltraSonicAppWidgetProvider4x2 extends UltraSonicAppWidgetProvider
public class UltrasonicAppWidgetProvider4X2 extends UltrasonicAppWidgetProvider
{
public UltraSonicAppWidgetProvider4x2()
public UltrasonicAppWidgetProvider4X2()
{
super();
this.layoutId = R.layout.appwidget4x2;
}
private static UltraSonicAppWidgetProvider4x2 instance;
private static UltrasonicAppWidgetProvider4X2 instance;
public static synchronized UltraSonicAppWidgetProvider4x2 getInstance()
public static synchronized UltrasonicAppWidgetProvider4X2 getInstance()
{
if (instance == null)
{
instance = new UltraSonicAppWidgetProvider4x2();
instance = new UltrasonicAppWidgetProvider4X2();
}
return instance;
}

10
ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X3.java
View File

@ -20,22 +20,22 @@ package org.moire.ultrasonic.provider;
import org.moire.ultrasonic.R;
public class UltraSonicAppWidgetProvider4x3 extends UltraSonicAppWidgetProvider
public class UltrasonicAppWidgetProvider4X3 extends UltrasonicAppWidgetProvider
{
public UltraSonicAppWidgetProvider4x3()
public UltrasonicAppWidgetProvider4X3()
{
super();
this.layoutId = R.layout.appwidget4x3;
}
private static UltraSonicAppWidgetProvider4x3 instance;
private static UltrasonicAppWidgetProvider4X3 instance;
public static synchronized UltraSonicAppWidgetProvider4x3 getInstance()
public static synchronized UltrasonicAppWidgetProvider4X3 getInstance()
{
if (instance == null)
{
instance = new UltraSonicAppWidgetProvider4x3();
instance = new UltrasonicAppWidgetProvider4X3();
}
return instance;
}

10
ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java → ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X4.java
View File

@ -20,22 +20,22 @@ package org.moire.ultrasonic.provider;
import org.moire.ultrasonic.R;
public class UltraSonicAppWidgetProvider4x4 extends UltraSonicAppWidgetProvider
public class UltrasonicAppWidgetProvider4X4 extends UltrasonicAppWidgetProvider
{
public UltraSonicAppWidgetProvider4x4()
public UltrasonicAppWidgetProvider4X4()
{
super();
this.layoutId = R.layout.appwidget4x4;
}
private static UltraSonicAppWidgetProvider4x4 instance;
private static UltrasonicAppWidgetProvider4X4 instance;
public static synchronized UltraSonicAppWidgetProvider4x4 getInstance()
public static synchronized UltrasonicAppWidgetProvider4X4 getInstance()
{
if (instance == null)
{
instance = new UltraSonicAppWidgetProvider4x4();
instance = new UltrasonicAppWidgetProvider4X4();
}
return instance;
}

24
ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java
View File

@ -27,10 +27,10 @@ import org.moire.ultrasonic.domain.PlayerState;
import org.moire.ultrasonic.domain.RepeatMode;
import org.moire.ultrasonic.featureflags.Feature;
import org.moire.ultrasonic.featureflags.FeatureStorage;
import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x1;
import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x2;
import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x3;
import org.moire.ultrasonic.provider.UltraSonicAppWidgetProvider4x4;
import org.moire.ultrasonic.provider.UltrasonicAppWidgetProvider4X1;
import org.moire.ultrasonic.provider.UltrasonicAppWidgetProvider4X2;
import org.moire.ultrasonic.provider.UltrasonicAppWidgetProvider4X3;
import org.moire.ultrasonic.provider.UltrasonicAppWidgetProvider4X4;
import org.moire.ultrasonic.util.FileUtil;
import org.moire.ultrasonic.util.ShufflePlayBuffer;
import org.moire.ultrasonic.util.SimpleServiceBinder;
@ -276,10 +276,10 @@ public class MediaPlayerService extends Service
// Update widget
PlayerState playerState = localMediaPlayer.playerState;
MusicDirectory.Entry song = currentPlaying == null? null : currentPlaying.getSong();
UltraSonicAppWidgetProvider4x1.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltraSonicAppWidgetProvider4x2.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, true);
UltraSonicAppWidgetProvider4x3.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltraSonicAppWidgetProvider4x4.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltrasonicAppWidgetProvider4X1.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltrasonicAppWidgetProvider4X2.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, true);
UltrasonicAppWidgetProvider4X3.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltrasonicAppWidgetProvider4X4.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
SubsonicTabActivity tabInstance = SubsonicTabActivity.getInstance();
@ -484,10 +484,10 @@ public class MediaPlayerService extends Service
downloader.downloadList.indexOf(currentPlaying) + 1, getPlayerPosition());
// Update widget
UltraSonicAppWidgetProvider4x1.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltraSonicAppWidgetProvider4x2.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, true);
UltraSonicAppWidgetProvider4x3.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltraSonicAppWidgetProvider4x4.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltrasonicAppWidgetProvider4X1.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltrasonicAppWidgetProvider4X2.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, true);
UltrasonicAppWidgetProvider4X3.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
UltrasonicAppWidgetProvider4X4.getInstance().notifyChange(MediaPlayerService.this, song, playerState == PlayerState.STARTED, false);
SubsonicTabActivity tabInstance = SubsonicTabActivity.getInstance();
if (show)

8
ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
View File

@ -91,7 +91,7 @@ public class FileUtil
public static File getPlaylistDirectory(Context context)
{
File playlistDir = new File(getUltraSonicDirectory(context), "playlists");
File playlistDir = new File(getUltrasonicDirectory(context), "playlists");
ensureDirectoryExistsAndIsReadWritable(playlistDir);
return playlistDir;
}
@ -301,7 +301,7 @@ public class FileUtil
public static File getAlbumArtDirectory(Context context)
{
File albumArtDir = new File(getUltraSonicDirectory(context), "artwork");
File albumArtDir = new File(getUltrasonicDirectory(context), "artwork");
ensureDirectoryExistsAndIsReadWritable(albumArtDir);
ensureDirectoryExistsAndIsReadWritable(new File(albumArtDir, ".nomedia"));
return albumArtDir;
@ -351,7 +351,7 @@ public class FileUtil
private static File getOrCreateDirectory(Context context, String name)
{
File dir = new File(getUltraSonicDirectory(context), name);
File dir = new File(getUltrasonicDirectory(context), name);
if (!dir.exists() && !dir.mkdirs())
{
@ -361,7 +361,7 @@ public class FileUtil
return dir;
}
public static File getUltraSonicDirectory(Context context)
public static File getUltrasonicDirectory(Context context)
{
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
return new File(Environment.getExternalStorageDirectory(), "Android/data/org.moire.ultrasonic");

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt
View File

@ -131,12 +131,12 @@ internal class EditServerActivity : AppCompatActivity() {
"dark".equals(theme, ignoreCase = true) ||
"fullscreen".equals(theme, ignoreCase = true)
) {
setTheme(R.style.UltraSonicTheme)
setTheme(R.style.UltrasonicTheme)
} else if (
"light".equals(theme, ignoreCase = true) ||
"fullscreenlight".equals(theme, ignoreCase = true)
) {
setTheme(R.style.UltraSonicTheme_Light)
setTheme(R.style.UltrasonicTheme_Light)
}
}

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSelectorActivity.kt
View File

@ -116,12 +116,12 @@ internal class ServerSelectorActivity : AppCompatActivity() {
"dark".equals(theme, ignoreCase = true) ||
"fullscreen".equals(theme, ignoreCase = true)
) {
setTheme(R.style.UltraSonicTheme)
setTheme(R.style.UltrasonicTheme)
} else if (
"light".equals(theme, ignoreCase = true) ||
"fullscreenlight".equals(theme, ignoreCase = true)
) {
setTheme(R.style.UltraSonicTheme_Light)
setTheme(R.style.UltrasonicTheme_Light)
}
}

4
ultrasonic/src/main/res/values/themes.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="UltraSonicTheme" parent="Theme.AppCompat">
<style name="UltrasonicTheme" parent="Theme.AppCompat">
<item name="color_background">@color/background_color_dark</item>
<item name="color_selected">@color/selected_color_dark</item>
<item name="star_hollow">@drawable/ic_star_hollow_dark</item>
@ -54,7 +54,7 @@
<item name="list_selector_holo_selected">@drawable/list_selector_holo_dark_selected</item>
</style>
<style name="UltraSonicTheme.Light" parent="Theme.AppCompat.Light">
<style name="UltrasonicTheme.Light" parent="Theme.AppCompat.Light">
<item name="color_background">@color/background_color_light</item>
<item name="color_selected">@color/selected_color_light</item>
<item name="star_hollow">@drawable/ic_star_hollow_light</item>