Removed font
Circular font is paid can't use it free
This commit is contained in:
Hemanth S
parent
4960e08fe9
commit
b507ef21d0
27 changed files with 33 additions and 307 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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<Song> playingQueue,
|
||||
@NonNull final ArrayList<Song> originalPlayingQueue) {
|
||||
public synchronized void saveQueues(@NonNull final List<Song> playingQueue,
|
||||
@NonNull final List<Song> 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<Song> queue) {
|
||||
private synchronized void saveQueue(final String tableName, @NonNull final List<Song> queue) {
|
||||
final SQLiteDatabase database = getWritableDatabase();
|
||||
database.beginTransaction();
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Song> restoredQueue = nowPlayingQueue.getQueue();//MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
|
||||
List<Song> restoredOriginalQueue = nowPlayingQueue.getOriginalQueue();//MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
|
||||
List<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
|
||||
List<Song> 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() {
|
||||
|
|
|
|||
|
|
@ -15,13 +15,11 @@
|
|||
<resources>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
|
||||
<item name="md_background_color">?attr/colorSurface</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
|
|
|
|||
|
|
@ -15,13 +15,11 @@
|
|||
<resources>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
|
||||
<item name="md_background_color">?attr/colorSurface</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
|
||||
<item name="android:breakStrategy">simple</item>
|
||||
<item name="android:hyphenationFrequency">none</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
<item name="android:textSize">13sp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
|
@ -15,13 +15,11 @@
|
|||
<resources>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
|
|
@ -34,14 +32,10 @@
|
|||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
<item name="md_color_button_text">@color/md_white_1000</item>
|
||||
<item name="md_background_color">@color/darkColorPrimary</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
|
|
@ -59,9 +53,6 @@
|
|||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
<item name="md_color_button_text">@color/md_black_1000</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
|
|
@ -72,7 +63,6 @@
|
|||
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<item name="contentInsetStartWithNavigation">0dp</item>
|
||||
<item name="contentInsetStart">0dp</item>
|
||||
<item name="titleMarginStart">16dp</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
|
|
@ -58,18 +58,14 @@
|
|||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:letterSpacing">0.0125</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
|
||||
<style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
|
||||
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
|
||||
</item>
|
||||
<item name="android:textAppearance">@style/TextViewHeadline6</item>
|
||||
</style>
|
||||
|
||||
<style name="BigTitleTextAppearanceToolbar">
|
||||
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
|
||||
</item>
|
||||
<item name="android:fontFamily">@font/circular_std_medium</item>
|
||||
<item name="android:textAppearance">@style/TextViewHeadline6</item>
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
|
|
@ -85,11 +81,9 @@
|
|||
</style>
|
||||
|
||||
<style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="android:textSize">13sp</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="Fab" parent="FabParent" />
|
||||
|
||||
<style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
|
||||
|
|
@ -110,59 +104,38 @@
|
|||
<item name="android:layout_height">wrap_content</item>
|
||||
</style>
|
||||
|
||||
<style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
|
||||
</style>
|
||||
<style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar" />
|
||||
|
||||
<style name="TextViewNormal">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4" />
|
||||
|
||||
<style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5" />
|
||||
|
||||
<style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption" />
|
||||
|
||||
<style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6" />
|
||||
|
||||
<style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3" />
|
||||
|
||||
<style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2" />
|
||||
|
||||
<style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" />
|
||||
|
||||
<style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
</style>
|
||||
<style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2" />
|
||||
|
||||
<style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="lineHeightHint">24sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="lineHeightHint">24sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="TopCornerCardView">
|
||||
|
|
|
|||
|
|
@ -2,13 +2,9 @@
|
|||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
|
|
@ -20,14 +16,10 @@
|
|||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
<item name="md_color_button_text">@color/md_white_1000</item>
|
||||
<item name="md_background_color">@color/darkColorSurface</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
|
|
@ -46,15 +38,11 @@
|
|||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
<item name="md_background_color">@color/blackColorSurface</item>
|
||||
<item name="roundSelector">@drawable/round_selector</item>
|
||||
<item name="rectSelector">@drawable/rect_selector</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
|
|
@ -66,9 +54,6 @@
|
|||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
<item name="md_font_title">@font/circular</item>
|
||||
<item name="md_font_body">@font/circular</item>
|
||||
<item name="md_font_button">@font/circular</item>
|
||||
<item name="md_color_button_text">@color/md_black_1000</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
<item name="windowActionBarOverlay">true</item>
|
||||
|
|
@ -79,7 +64,6 @@
|
|||
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
<item name="android:windowActivityTransitions">true</item>
|
||||
<item name="android:fontFamily">@font/circular</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue