From b507ef21d0f5379b0f5045908465f378c4bc3bd7 Mon Sep 17 00:00:00 2001 From: Hemanth S Date: Thu, 14 May 2020 20:17:36 +0530 Subject: [PATCH] Removed font Circular font is paid can't use it free --- app/build.gradle | 11 ---- .../fragments/player/color/ColorFragment.kt | 5 +- .../providers/MusicPlaybackQueueStore.java | 7 ++- .../retromusic/service/MusicService.java | 16 ++---- app/src/main/res/values-night-v27/styles.xml | 6 +- app/src/main/res/values-night/styles.xml | 6 +- app/src/main/res/values-v23/styles.xml | 2 +- .../main/res/values-v27/styles_parents.xml | 14 +---- app/src/main/res/values/styles.xml | 53 +++++------------- app/src/main/res/values/styles_parents.xml | 16 ------ appthemehelper/build.gradle | 1 - .../main/res/layout/ate_preference_custom.xml | 2 - .../layout/ate_preference_custom_support.xml | 4 +- fonts/.gitignore | 1 - fonts/build.gradle | 48 ---------------- fonts/consumer-rules.pro | 0 fonts/proguard-rules.pro | 21 ------- .../hemanths/fonts/ExampleInstrumentedTest.kt | 39 ------------- fonts/src/main/AndroidManifest.xml | 16 ------ .../java/dev/hemanths/fonts/CommonAttrs.kt | 5 -- fonts/src/main/res/font/circular.xml | 16 ------ .../src/main/res/font/circular_std_black.otf | Bin 74500 -> 0 bytes fonts/src/main/res/font/circular_std_book.otf | Bin 68940 -> 0 bytes .../src/main/res/font/circular_std_medium.otf | Bin 79304 -> 0 bytes fonts/src/main/res/values/strings.xml | 17 ------ .../dev/hemanths/fonts/ExampleUnitTest.kt | 32 ----------- settings.gradle | 2 +- 27 files changed, 33 insertions(+), 307 deletions(-) delete mode 100644 fonts/.gitignore delete mode 100644 fonts/build.gradle delete mode 100644 fonts/consumer-rules.pro delete mode 100644 fonts/proguard-rules.pro delete mode 100644 fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt delete mode 100644 fonts/src/main/AndroidManifest.xml delete mode 100644 fonts/src/main/java/dev/hemanths/fonts/CommonAttrs.kt delete mode 100644 fonts/src/main/res/font/circular.xml delete mode 100644 fonts/src/main/res/font/circular_std_black.otf delete mode 100644 fonts/src/main/res/font/circular_std_book.otf delete mode 100644 fonts/src/main/res/font/circular_std_medium.otf delete mode 100644 fonts/src/main/res/values/strings.xml delete mode 100644 fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index c4616f9b..9bebfc8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,16 +62,6 @@ android { versionName defaultConfig.versionName + "_" + getDate() dimension "default" } - font { - versionCode defaultConfig.versionCode + 10000 - versionName defaultConfig.versionName + "_" + getDate() - dimension "default" - } - nofont { - versionCode defaultConfig.versionCode + 10000 - versionName defaultConfig.versionName + "_" + getDate() - dimension "default" - } } packagingOptions { @@ -123,7 +113,6 @@ static def getDate() { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':appthemehelper') - implementation project(':fonts') implementation 'androidx.multidex:multidex:2.0.1' implementation "androidx.gridlayout:gridlayout:1.0.0" diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt index 0f0c3f87..88b12c90 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt @@ -39,14 +39,13 @@ class ColorFragment : AbsPlayerFragment() { callbacks?.onPaletteColorChanged() colorGradientBackground?.setBackgroundColor(color.backgroundColor) playerActivity?.setLightNavigationBar(ColorUtil.isColorLight(color.backgroundColor)) - Handler().postDelayed(Runnable { + Handler().post { ToolbarContentTintHelper.colorizeToolbar( playerToolbar, color.secondaryTextColor, requireActivity() ) - }, 100) - + } } override fun onFavoriteToggled() { diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java index 528ca7e9..9ee3fae7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java +++ b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java @@ -25,6 +25,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import java.util.ArrayList; +import java.util.List; import code.name.monkey.retromusic.loaders.SongLoader; import code.name.monkey.retromusic.model.Song; @@ -100,8 +101,8 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper { onCreate(db); } - public synchronized void saveQueues(@NonNull final ArrayList playingQueue, - @NonNull final ArrayList originalPlayingQueue) { + public synchronized void saveQueues(@NonNull final List playingQueue, + @NonNull final List originalPlayingQueue) { saveQueue(PLAYING_QUEUE_TABLE_NAME, playingQueue); saveQueue(ORIGINAL_PLAYING_QUEUE_TABLE_NAME, originalPlayingQueue); } @@ -165,7 +166,7 @@ public class MusicPlaybackQueueStore extends SQLiteOpenHelper { * * @param queue the queue to save */ - private synchronized void saveQueue(final String tableName, @NonNull final ArrayList queue) { + private synchronized void saveQueue(final String tableName, @NonNull final List queue) { final SQLiteDatabase database = getWritableDatabase(); database.beginTransaction(); diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java index c5a4a93e..a8dac80b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java @@ -74,8 +74,8 @@ import code.name.monkey.retromusic.helper.ShuffleHelper; import code.name.monkey.retromusic.model.Playlist; import code.name.monkey.retromusic.model.Song; import code.name.monkey.retromusic.providers.HistoryStore; +import code.name.monkey.retromusic.providers.MusicPlaybackQueueStore; import code.name.monkey.retromusic.providers.SongPlayCountStore; -import code.name.monkey.retromusic.room.NowPlayingQueue; import code.name.monkey.retromusic.service.notification.PlayingNotification; import code.name.monkey.retromusic.service.notification.PlayingNotificationImpl; import code.name.monkey.retromusic.service.notification.PlayingNotificationOreo; @@ -304,7 +304,6 @@ public class MusicService extends Service implements private ThrottledSeekHandler throttledSeekHandler; private Handler uiThreadHandler; private PowerManager.WakeLock wakeLock; - private NowPlayingQueue nowPlayingQueue; private static Bitmap copy(Bitmap bitmap) { Bitmap.Config config = bitmap.getConfig(); @@ -326,9 +325,6 @@ public class MusicService extends Service implements @Override public void onCreate() { super.onCreate(); - - nowPlayingQueue = new NowPlayingQueue(this); - final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE); if (telephonyManager != null) { telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE); @@ -983,10 +979,8 @@ public class MusicService extends Service implements public synchronized void restoreQueuesAndPositionIfNecessary() { if (!queuesRestored && playingQueue.isEmpty()) { - - - List restoredQueue = nowPlayingQueue.getQueue();//MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue(); - List restoredOriginalQueue = nowPlayingQueue.getOriginalQueue();//MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue(); + List restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue(); + List restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue(); int restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION, -1); int restoredPositionInTrack = PreferenceManager.getDefaultSharedPreferences(this) .getInt(SAVED_POSITION_IN_TRACK, -1); @@ -1022,9 +1016,7 @@ public class MusicService extends Service implements } public void saveQueuesImpl() { - //MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue); - nowPlayingQueue.saveQueue(new ArrayList<>(playingQueue)); - nowPlayingQueue.saveOriginalQueue(new ArrayList<>(originalPlayingQueue)); + MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue); } public void saveState() { diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml index ba94dab7..70132899 100644 --- a/app/src/main/res/values-night-v27/styles.xml +++ b/app/src/main/res/values-night-v27/styles.xml @@ -15,13 +15,11 @@ \ No newline at end of file diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml index 09520f40..a6fca6f5 100644 --- a/app/src/main/res/values-v27/styles_parents.xml +++ b/app/src/main/res/values-v27/styles_parents.xml @@ -15,13 +15,11 @@ @@ -58,18 +58,14 @@ 20sp 0.0125 ?android:attr/textColorPrimary - @font/circular - - + - + + + + + + + +