diff --git a/app/build.gradle b/app/build.gradle index ebf755dc4..039701b1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,8 +32,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 274 - versionName '3.0.520' + versionCode 277 + versionName '3.0.530' multiDexEnabled true @@ -130,7 +130,7 @@ dependencies { implementation "androidx.legacy:legacy-preference-v14:$supportLibVersion" implementation "com.google.android.material:material:$supportLibVersion" - implementation "com.squareup.retrofit2:retrofit:2.4.0" + implementation "com.squareup.retrofit2:retrofit:2.5.0" implementation "com.squareup.retrofit2:converter-gson:2.4.0" implementation "com.squareup.retrofit2:adapter-rxjava2:2.4.0" @@ -163,6 +163,7 @@ dependencies { implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5' implementation 'com.github.jetradarmobile:android-snowfall:1.2.0' + implementation 'com.github.takahirom.downloadable.calligraphy:downloadable-calligraphy:0.1.3' kapt 'com.github.bumptech.glide:compiler:4.8.0' } diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 2ed2141f4..43acdcc44 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.0.501

Highlights

Changelog

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

v3.0.501

Highlights

Changelog

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 69c935df1..c3dd3afbe 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt index 0da6736a8..268383ab1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/App.kt +++ b/app/src/main/java/code/name/monkey/retromusic/App.kt @@ -8,7 +8,8 @@ import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.TransactionDetails -import com.bumptech.glide.Glide +import uk.co.chrisjenx.calligraphy.CalligraphyConfig + class App : MultiDexApplication() { @@ -30,6 +31,11 @@ class App : MultiDexApplication() { DynamicShortcutManager(this).initDynamicShortcuts() + CalligraphyConfig.initDefault(CalligraphyConfig.Builder() + .setDefaultFont(R.font.circular_std_book) + .build() + ) + // automatically restores purchases billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, object : BillingProcessor.IBillingHandler { @@ -45,18 +51,6 @@ class App : MultiDexApplication() { }) } - private fun setupErrorHandler() { - Thread.setDefaultUncaughtExceptionHandler { _, throwable -> handleUncaughtException(throwable) } - } - - private fun handleUncaughtException(throwable: Throwable) { - throwable.printStackTrace() - deleteAppData() - //Intent intent = new Intent(this, ErrorHandlerActivity.class); - //intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - //startActivity(intent); - } - override fun onTerminate() { super.onTerminate() billingProcessor.release() @@ -74,20 +68,5 @@ class App : MultiDexApplication() { val isProVersion: Boolean get() = BuildConfig.DEBUG || instance.billingProcessor.isPurchased(PRO_VERSION_PRODUCT_ID) - - fun deleteAppData() { - try { - // clearing app data - val packageName = instance.packageName - val runtime = Runtime.getRuntime() - runtime.exec("pm clear $packageName") - - System.exit(0) - - } catch (e: Exception) { - e.printStackTrace() - } - - } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt index 38f3bfb84..ec6742abd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt +++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt @@ -76,6 +76,8 @@ object Constants { @JvmField val FAQ_LINK = "https://github.com/h4h13/RetroMusicPlayer/blob/master/FAQ.md" @JvmField + val PINTEREST = "https://in.pinterest.com/retromusicapp/" + @JvmField val CAST_SERVER_PORT = 8080 const val BASE_SELECTION = MediaStore.Audio.AudioColumns.IS_MUSIC + "=1" + " AND " + MediaStore.Audio.AudioColumns.TITLE + " != ''" diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt index 9fb9eff40..18b079fbd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt @@ -8,7 +8,6 @@ import android.text.TextUtils import android.view.View import android.widget.RemoteViews import androidx.core.content.ContextCompat -import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.App.Companion.context import code.name.monkey.retromusic.Constants import code.name.monkey.retromusic.R diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt index 613dc7e3f..b105bddd7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt @@ -7,11 +7,11 @@ import code.name.monkey.retromusic.R object HorizontalAdapterHelper { - val LAYOUT_RES = R.layout.item_image + const val LAYOUT_RES = R.layout.item_image - val TYPE_FIRST = 1 - val TYPE_MIDDLE = 2 - val TYPE_LAST = 3 + const val TYPE_FIRST = 1 + const val TYPE_MIDDLE = 2 + const val TYPE_LAST = 3 fun applyMarginToLayoutParams(context: Context, layoutParams: ViewGroup.MarginLayoutParams, viewType: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/SpacesItemDecoration.java b/app/src/main/java/code/name/monkey/retromusic/misc/SpacesItemDecoration.java new file mode 100644 index 000000000..ba47d241a --- /dev/null +++ b/app/src/main/java/code/name/monkey/retromusic/misc/SpacesItemDecoration.java @@ -0,0 +1,21 @@ +package code.name.monkey.retromusic.misc; + +import android.graphics.Rect; +import android.view.View; + +import androidx.recyclerview.widget.RecyclerView; + +public class SpacesItemDecoration extends RecyclerView.ItemDecoration { + private int space; + + public SpacesItemDecoration(int space) { + this.space = space; + } + + @Override + public void getItemOffsets(Rect outRect, View view, + RecyclerView parent, RecyclerView.State state) { + outRect.right = space; + outRect.bottom = space; + } +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt index 3f4034ab7..538046cd4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt @@ -18,6 +18,7 @@ import code.name.monkey.retromusic.Constants.DISCORD_LINK import code.name.monkey.retromusic.Constants.FAQ_LINK import code.name.monkey.retromusic.Constants.GITHUB_PROJECT import code.name.monkey.retromusic.Constants.GOOGLE_PLUS_COMMUNITY +import code.name.monkey.retromusic.Constants.PINTEREST import code.name.monkey.retromusic.Constants.RATE_ON_GOOGLE_PLAY import code.name.monkey.retromusic.Constants.TELEGRAM_CHANGE_LOG import code.name.monkey.retromusic.Constants.TRANSLATE @@ -111,10 +112,12 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener { twitterLink.setOnClickListener(this) changelog.setOnClickListener(this) openSource.setOnClickListener(this) + pinterestLink.setOnClickListener(this) } override fun onClick(view: View) { when (view.id) { + R.id.pinterestLink->openUrl(PINTEREST) R.id.faqLink -> openUrl(FAQ_LINK) R.id.telegramLink -> openUrl(APP_TELEGRAM_LINK) R.id.discordLink -> openUrl(DISCORD_LINK) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt index 6dfd17f45..75b56b317 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AlbumDetailsActivity.kt @@ -141,7 +141,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsContrac toolbar!!.layoutParams = params } - appBarLayout!!.apply { + appBarLayout?.apply { addOnOffsetChangedListener(object : AppBarStateChangeListener() { override fun onStateChanged(appBarLayout: AppBarLayout, state: AppBarStateChangeListener.State) { val color: Int = when (state) { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt index b7f0f8a01..5ee55743b 100755 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/ArtistDetailActivity.kt @@ -140,24 +140,22 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailContrac toolbar!!.layoutParams = params } - if (appBarLayout != null) { - appBarLayout!!.addOnOffsetChangedListener(object : AppBarStateChangeListener() { - override fun onStateChanged(appBarLayout: AppBarLayout, state: AppBarStateChangeListener.State) { - val color: Int = when (state) { - AppBarStateChangeListener.State.COLLAPSED -> { - setLightStatusbar(ColorUtil.isColorLight(ThemeStore.primaryColor(appBarLayout.context))) - ThemeStore.primaryColor(appBarLayout.context) - } - AppBarStateChangeListener.State.EXPANDED, AppBarStateChangeListener.State.IDLE -> { - setLightStatusbar(false) - Color.TRANSPARENT - } - + appBarLayout?.addOnOffsetChangedListener(object : AppBarStateChangeListener() { + override fun onStateChanged(appBarLayout: AppBarLayout, state: AppBarStateChangeListener.State) { + val color: Int = when (state) { + AppBarStateChangeListener.State.COLLAPSED -> { + setLightStatusbar(ColorUtil.isColorLight(ThemeStore.primaryColor(appBarLayout.context))) + ThemeStore.primaryColor(appBarLayout.context) } - ToolbarContentTintHelper.setToolbarContentColorBasedOnToolbarColor(appBarLayout.context, toolbar, color) + AppBarStateChangeListener.State.EXPANDED, AppBarStateChangeListener.State.IDLE -> { + setLightStatusbar(false) + Color.TRANSPARENT + } + } - }) - } + ToolbarContentTintHelper.setToolbarContentColorBasedOnToolbarColor(appBarLayout.context, toolbar, color) + } + }) } private fun setupRecyclerView() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt index 90220a00e..d72c50c47 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/MainActivity.kt @@ -107,7 +107,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP if (intent.hasExtra("expand")) { if (intent.getBooleanExtra("expand", false)) { - //expandPanel(); + expandPanel() intent.putExtra("expand", false) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt index 5bbafb05a..16685b3fc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.kt @@ -1,6 +1,7 @@ package code.name.monkey.retromusic.ui.activities.base import android.Manifest +import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.media.AudioManager @@ -12,8 +13,8 @@ import android.view.KeyEvent import android.view.View import androidx.core.app.ActivityCompat import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.retromusic.R import com.google.android.material.snackbar.Snackbar +import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper abstract class AbsBaseActivity : AbsThemeActivity() { @@ -31,7 +32,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() { } fun getPermissionDeniedMessage(): String { - return if (permissionDeniedMessage == null) getString(R.string.permissions_denied) else permissionDeniedMessage!! + return if (permissionDeniedMessage == null) getString(code.name.monkey.retromusic.R.string.permissions_denied) else permissionDeniedMessage!! } @@ -80,7 +81,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() { protected fun showOverflowMenu() { } - + protected open fun requestPermissions() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { requestPermissions(permissions, PERMISSION_REQUEST) @@ -108,14 +109,14 @@ abstract class AbsBaseActivity : AbsThemeActivity() { //User has deny from permission dialog Snackbar.make(snackBarContainer, permissionDeniedMessage!!, Snackbar.LENGTH_INDEFINITE) - .setAction(R.string.action_grant) { requestPermissions() } + .setAction(code.name.monkey.retromusic.R.string.action_grant) { requestPermissions() } .setActionTextColor(ThemeStore.accentColor(this)) .show() } else { // User has deny permission and checked never show permission dialog so you can redirect to Application settings page Snackbar.make(snackBarContainer, permissionDeniedMessage!!, Snackbar.LENGTH_INDEFINITE) - .setAction(R.string.action_settings) { + .setAction(code.name.monkey.retromusic.R.string.action_settings) { val intent = Intent() intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS val uri = Uri.fromParts("package", this@AbsBaseActivity.packageName, null) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt index 411cfb95a..4bda1999b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsSlidingMusicPanelActivity.kt @@ -237,7 +237,7 @@ abstract class AbsSlidingMusicPanelActivity protected constructor() : AbsMusicSe slidingLayout.panelState = PanelState.COLLAPSED } - private fun expandPanel() { + fun expandPanel() { slidingLayout.panelState = PanelState.EXPANDED } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt index 4da59c5ab..4cb289c2b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumCoverPagerAdapter.kt @@ -57,16 +57,6 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList currentColorReceiver = colorReceiver currentColorReceiverPosition = position } - - /*val fragment = getFragment(position) as AlbumCoverFragment - if (fragment != null) { - currentColorReceiver = null - currentColorReceiverPosition = -1 - fragment.receiveColor(colorReceiver, position) - } else { - currentColorReceiver = colorReceiver - currentColorReceiverPosition = position - }*/ } class AlbumCoverFragment : Fragment() { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt index f72eb3feb..72dc020ed 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/HorizontalAlbumAdapter.kt @@ -65,6 +65,14 @@ class HorizontalAlbumAdapter(activity: AppCompatActivity, dataSet: ArrayList dataSet.size + dataSet.size >= 5 -> 5 + else -> super.getItemCount() + } + } + companion object { val TAG: String = AlbumAdapter::class.java.simpleName } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt index dfe41a210..38f424f2f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/PlayerAlbumCoverFragment.kt @@ -45,6 +45,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan //noinspection ConstantConditions if (PreferenceUtil.getInstance().carouselEffect() && !((PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.FULL) + || (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.ADAPTIVE) || (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.FIT))) { viewPager.clipToPadding = false viewPager.setPadding(96, 0, 96, 0) diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index 78a655500..297bcf08c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt @@ -7,10 +7,10 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.animation.AccelerateInterpolator import android.view.animation.DecelerateInterpolator import android.view.animation.LinearInterpolator import android.widget.SeekBar +import androidx.core.content.ContextCompat import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper @@ -23,11 +23,9 @@ import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.ui.fragments.VolumeFragment import code.name.monkey.retromusic.ui.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.util.MusicUtil -import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_card_blur_player_playback_controls.* import kotlinx.android.synthetic.main.media_button.* import kotlinx.android.synthetic.main.player_time.* -import kotlinx.android.synthetic.main.volume_controls.* class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { @@ -71,7 +69,6 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { TintHelper.setTintAuto(this, Color.BLACK, false) setOnClickListener(PlayPauseButtonOnClickHandler()) } - } private fun updatePlayPauseDrawableState() { @@ -83,7 +80,7 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { private fun setupVolumeControls() { val volumeFragment = childFragmentManager.findFragmentById(R.id.volumeFragment) as VolumeFragment - volumeFragment.tintWhiteColor() + volumeFragment.setTintable(ContextCompat.getColor(context!!, R.color.md_white_1000)) } private fun updateProgressTextColor() { diff --git a/app/src/main/res/drawable/ic_instagram.xml b/app/src/main/res/drawable/ic_instagram_white_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_instagram.xml rename to app/src/main/res/drawable/ic_instagram_white_24dp.xml diff --git a/app/src/main/res/drawable/ic_pinterest_white_24dp.xml b/app/src/main/res/drawable/ic_pinterest_white_24dp.xml new file mode 100644 index 000000000..d53861a36 --- /dev/null +++ b/app/src/main/res/drawable/ic_pinterest_white_24dp.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/font/circular.xml b/app/src/main/res/font/circular.xml new file mode 100644 index 000000000..6f20e75b3 --- /dev/null +++ b/app/src/main/res/font/circular.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/circular_std_black.otf b/app/src/main/res/font/circular_std_black.otf new file mode 100755 index 000000000..c62b210c5 Binary files /dev/null and b/app/src/main/res/font/circular_std_black.otf differ diff --git a/app/src/main/res/font/circular_std_book.otf b/app/src/main/res/font/circular_std_book.otf new file mode 100755 index 000000000..3a1f1ad82 Binary files /dev/null and b/app/src/main/res/font/circular_std_book.otf differ diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml index 5678c0489..3fa4a5640 100644 --- a/app/src/main/res/layout-land/activity_artist_details.xml +++ b/app/src/main/res/layout-land/activity_artist_details.xml @@ -46,56 +46,49 @@ android:layout_width="match_parent" android:layout_height="@dimen/status_bar_padding" /> - - + android:layout_height="wrap_content" + android:orientation="vertical"> + android:orientation="vertical" + android:padding="16dp"> - + android:maxLines="2" + android:textAppearance="@style/TextAppearance.AppCompat.Title" + android:textStyle="bold" + tools:ignore="MissingPrefix" + tools:text="Title" /> - + - - - - - - + + + + @@ -111,8 +104,8 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="10dp" - app:showTitle="true" app:setIcon="@drawable/ic_shuffle_white_24dp" app:setText="@string/action_shuffle_all" + app:showTitle="true" app:shuffleBackgroundColor="@color/md_black_1000" /> diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml index 4bb235dc9..18c49bbd5 100644 --- a/app/src/main/res/layout/abs_playlists.xml +++ b/app/src/main/res/layout/abs_playlists.xml @@ -15,7 +15,6 @@ android:gravity="center_horizontal" android:orientation="horizontal"> - diff --git a/app/src/main/res/layout/bug_report_card_report.xml b/app/src/main/res/layout/bug_report_card_report.xml index 7b5c13985..6020c1e1b 100644 --- a/app/src/main/res/layout/bug_report_card_report.xml +++ b/app/src/main/res/layout/bug_report_card_report.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardCornerRadius="8dp" app:cardBackgroundColor="?cardBackgroundColor" + app:cardCornerRadius="8dp" app:cardUseCompatPadding="true"> + android:inputType="textMultiLine" + android:minLines="3" /> diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml index b4e150fd9..6034c86bf 100644 --- a/app/src/main/res/layout/card_social.xml +++ b/app/src/main/res/layout/card_social.xml @@ -23,6 +23,48 @@ android:orientation="vertical"> + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml index 13ef5e702..48a288d94 100644 --- a/app/src/main/res/layout/fragment_album_cover.xml +++ b/app/src/main/res/layout/fragment_album_cover.xml @@ -8,7 +8,8 @@ + android:layout_height="wrap_content" + android:layout_gravity="center"> + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" + android:textSize="16sp" /> + android:maxLines="1" + android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" /> \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index a55dbb7d0..4ae7d1237 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1 +1,5 @@ - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index ad11744fc..708b3491d 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 9bc0251f8..278b1604f 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 8485a8f76..4ccf37af7 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index ad11744fc..708b3491d 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 715be81c5..5d7f4d8a5 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index d16a54a1f..af1e5d56e 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index a46501728..c3833d63b 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 715be81c5..5d7f4d8a5 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 9f7cdd989..eadda1bf4 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index e6f9dbdf4..fe7517d88 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 6aeef2300..555f7deb9 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 9f7cdd989..eadda1bf4 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index a8ffb4980..62538edcc 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index ca9082b5d..61b257517 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 9f548f76b..3a14131a7 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index a8ffb4980..62538edcc 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index fc889b74e..7344ed9ba 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index e2be82e75..493ff3176 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index f029dd1b9..821a47a5d 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index fc889b74e..7344ed9ba 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d4efede52..dc44f933b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -526,7 +526,7 @@ Made with ❤️ in India Clear app data An unexpected error occurred. Sorry you found this bug, if it - keeps crashing \"Clear app data\" or Send an Email + keeps crashing \"Clear app data\" or send an Email Error Base color theme 9+ now playing themes @@ -591,4 +591,6 @@ Blacklist The content of blacklisted folders is hidden from your library. Send crash log + Pinterest + Hmm diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 19e2cf8d3..1522b120c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -43,6 +43,7 @@