From a7d29a40937e3acbbac80210cce6c9b43a7ac3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= Date: Thu, 24 Sep 2020 13:03:05 +0200 Subject: [PATCH] More UltraSonic -> Ultrasonic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Óscar García Amor --- ultrasonic/lint-baseline.xml | 4300 ----------------- ultrasonic/src/main/AndroidManifest.xml | 8 +- .../ultrasonic/activity/HelpActivity.java | 4 +- .../activity/SubsonicTabActivity.java | 12 +- .../ultrasonic/fragment/SettingsFragment.java | 2 +- ....java => UltrasonicAppWidgetProvider.java} | 4 +- ...va => UltrasonicAppWidgetProvider4X1.java} | 10 +- ...va => UltrasonicAppWidgetProvider4X2.java} | 10 +- ...va => UltrasonicAppWidgetProvider4X3.java} | 10 +- ...va => UltrasonicAppWidgetProvider4X4.java} | 10 +- .../service/MediaPlayerService.java | 24 +- .../org/moire/ultrasonic/util/FileUtil.java | 8 +- .../ultrasonic/activity/EditServerActivity.kt | 4 +- .../activity/ServerSelectorActivity.kt | 4 +- ultrasonic/src/main/res/values/themes.xml | 4 +- 15 files changed, 57 insertions(+), 4357 deletions(-) delete mode 100644 ultrasonic/lint-baseline.xml rename ultrasonic/src/main/java/org/moire/ultrasonic/provider/{UltraSonicAppWidgetProvider.java => UltrasonicAppWidgetProvider.java} (98%) rename ultrasonic/src/main/java/org/moire/ultrasonic/provider/{UltraSonicAppWidgetProvider4x1.java => UltrasonicAppWidgetProvider4X1.java} (76%) rename ultrasonic/src/main/java/org/moire/ultrasonic/provider/{UltraSonicAppWidgetProvider4x2.java => UltrasonicAppWidgetProvider4X2.java} (76%) rename ultrasonic/src/main/java/org/moire/ultrasonic/provider/{UltraSonicAppWidgetProvider4x3.java => UltrasonicAppWidgetProvider4X3.java} (76%) rename ultrasonic/src/main/java/org/moire/ultrasonic/provider/{UltraSonicAppWidgetProvider4x4.java => UltrasonicAppWidgetProvider4X4.java} (76%) diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml deleted file mode 100644 index 9a3a6166..00000000 --- a/ultrasonic/lint-baseline.xml +++ /dev/null @@ -1,4300 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml index 53aaff68..5c9a7d61 100644 --- a/ultrasonic/src/main/AndroidManifest.xml +++ b/ultrasonic/src/main/AndroidManifest.xml @@ -150,7 +150,7 @@ @@ -161,7 +161,7 @@ android:resource="@xml/appwidget_info_4x1"/> @@ -172,7 +172,7 @@ android:resource="@xml/appwidget_info_4x2"/> @@ -183,7 +183,7 @@ android:resource="@xml/appwidget_info_4x3"/> diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java index d2732909..e7ea24dc 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/HelpActivity.java @@ -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); } } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java index e9aee792..b7445beb 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/activity/SubsonicTabActivity.java @@ -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); diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java index 3edebcd7..c5179d6b 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SettingsFragment.java @@ -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); diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java similarity index 98% rename from ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java index 849ded07..4f7d11a5 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.java @@ -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 diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X1.java similarity index 76% rename from ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X1.java index 0dfa8dcf..0c8a8ca8 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x1.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X1.java @@ -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; } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X2.java similarity index 76% rename from ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X2.java index 6dd9a019..3ba12ae6 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x2.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X2.java @@ -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; } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X3.java similarity index 76% rename from ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X3.java index 0038c902..15b2a561 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x3.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X3.java @@ -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; } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X4.java similarity index 76% rename from ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java rename to ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X4.java index 35922218..c28c55ab 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltraSonicAppWidgetProvider4x4.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider4X4.java @@ -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; } diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java index f5a09d03..3fc6de35 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerService.java @@ -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) diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java index f74d4b20..da008be4 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java @@ -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"); diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt index 8956610c..bdbab433 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/EditServerActivity.kt @@ -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) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSelectorActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSelectorActivity.kt index 434392a3..49cc94a5 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSelectorActivity.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ServerSelectorActivity.kt @@ -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) } } diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml index 84a154ba..9895d26c 100644 --- a/ultrasonic/src/main/res/values/themes.xml +++ b/ultrasonic/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ - -