diff --git a/app/build.gradle b/app/build.gradle index 5948be512..5145455e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 367 - versionName '3.4.000-beta10' + versionCode 368 + versionName '3.4.000-beta11' multiDexEnabled true diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 79ab23ab9..05af36868 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ - + diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 000000000..af146924b Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt index cb71c533d..5d3fe46b4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.activities +import android.app.ActivityOptions import android.content.Intent import android.content.res.ColorStateList import android.graphics.Color @@ -9,7 +10,6 @@ import android.view.* import android.view.animation.AnimationUtils import android.widget.ImageView import androidx.core.app.ActivityCompat -import androidx.core.util.Pair import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager @@ -49,6 +49,7 @@ import kotlinx.android.synthetic.main.activity_album.* import kotlinx.android.synthetic.main.activity_album_content.* import java.util.* import javax.inject.Inject +import android.util.Pair as UtilPair class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { @@ -92,8 +93,8 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { setupToolbarMarginHeight() artistImage.setOnClickListener { - val artistPairs = arrayOf>(Pair.create(image, resources.getString(R.string.transition_artist_image))) - NavigationUtil.goToArtist(this, album.artistId, *artistPairs) + val artistPairs = ActivityOptions.makeSceneTransitionAnimation(this, UtilPair.create(artistImage, getString(R.string.transition_artist_image))) + NavigationUtil.goToArtistOptions(this, album.artistId, artistPairs) } playAction.apply { setOnClickListener { MusicPlayerRemote.openQueue(album.songs!!, 0, true) } @@ -283,10 +284,6 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView { startActivityForResult(intent, TAG_EDITOR_REQUEST) return true } - R.id.action_go_to_artist -> { - NavigationUtil.goToArtist(this, album.artistId) - return true - } /*Sort*/ R.id.action_sort_order_title -> sortOrder = AlbumSongSortOrder.SONG_A_Z R.id.action_sort_order_title_desc -> sortOrder = AlbumSongSortOrder.SONG_Z_A diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt index 9b791a4cd..36f2fa4da 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt @@ -1,10 +1,10 @@ package code.name.monkey.retromusic.adapter +import android.app.ActivityOptions import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import androidx.core.util.Pair import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.R @@ -20,7 +20,7 @@ import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.NavigationUtil import com.bumptech.glide.Glide import java.util.* - +import android.util.Pair as UtilPair class SearchAdapter( private val activity: AppCompatActivity, @@ -106,8 +106,16 @@ class SearchAdapter( override fun onClick(v: View?) { val item = dataSet!![adapterPosition] when (itemViewType) { - ALBUM -> NavigationUtil.goToAlbum(activity, (item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art))) - ARTIST -> NavigationUtil.goToArtist(activity, (item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image))) + ALBUM -> { + val options = ActivityOptions.makeSceneTransitionAnimation(activity, + UtilPair.create(image, activity.getString(R.string.transition_album_art))) + NavigationUtil.goToAlbumOptions(activity, (item as Album).id, options) + } + ARTIST -> { + val options = ActivityOptions.makeSceneTransitionAnimation(activity, + UtilPair.create(image, activity.getString(R.string.transition_artist_image))) + NavigationUtil.goToArtistOptions(activity, (item as Artist).id, options) + } SONG -> { val playList = ArrayList() playList.add(item as Song) @@ -119,9 +127,9 @@ class SearchAdapter( companion object { - private val HEADER = 0 - private val ALBUM = 1 - private val ARTIST = 2 - private val SONG = 3 + private const val HEADER = 0 + private const val ALBUM = 1 + private const val ARTIST = 2 + private const val SONG = 3 } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index 424e57f2a..f28b9dbd9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.adapter.album +import android.app.ActivityOptions import android.content.res.ColorStateList import android.graphics.drawable.Drawable import android.view.LayoutInflater @@ -8,9 +9,9 @@ import android.view.View import android.view.ViewGroup import androidx.annotation.LayoutRes import androidx.appcompat.app.AppCompatActivity -import androidx.core.util.Pair import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper +import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.glide.RetroMusicColoredTarget @@ -182,11 +183,8 @@ open class AlbumAdapter(protected val activity: AppCompatActivity, if (isInQuickSelectMode) { toggleChecked(adapterPosition) } else { - val pairImageView = Pair.create(image, activity.resources.getString(code.name.monkey.retromusic.R.string.transition_album_art)) - val pairs = ArrayList>() - pairs.add(pairImageView) - val albumPairs: Array> = pairs.toTypedArray() - NavigationUtil.goToAlbum(activity, dataSet[adapterPosition].id, *albumPairs) + val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art)) + NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt index 174bcf72e..5cf7c8fe8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumFullWidthAdapter.kt @@ -16,11 +16,11 @@ package code.name.monkey.retromusic.adapter.album import android.app.Activity +import android.app.ActivityOptions import android.util.DisplayMetrics import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.util.Pair import code.name.monkey.retromusic.R import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.glide.SongGlideRequest @@ -84,8 +84,8 @@ class AlbumFullWidthAdapter(private val activity: Activity, private val dataSet: inner class FullMetalViewHolder(itemView: View) : MetalRecyclerViewPager.MetalViewHolder(itemView) { override fun onClick(v: View?) { - val albumPairs = arrayOf>(Pair.create(image, activity.resources.getString(R.string.transition_album_art))) - NavigationUtil.goToAlbum(activity, dataSet[adapterPosition].id, *albumPairs) + val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art)) + NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions) } } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index a093ecae3..9cd7aa2c2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -1,17 +1,17 @@ package code.name.monkey.retromusic.adapter.artist +import android.app.ActivityOptions import android.content.res.ColorStateList import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup -import android.widget.ImageView import androidx.annotation.LayoutRes import androidx.appcompat.app.AppCompatActivity -import androidx.core.util.Pair import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper +import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.glide.ArtistGlideRequest @@ -138,9 +138,8 @@ class ArtistAdapter(val activity: AppCompatActivity, if (isInQuickSelectMode) { toggleChecked(adapterPosition) } else { - val artistPairs = arrayOf>(Pair.create(image, - activity.resources.getString(code.name.monkey.retromusic.R.string.transition_artist_image))) - NavigationUtil.goToArtist(activity, dataSet[adapterPosition].id, *artistPairs) + val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_artist_image)) + NavigationUtil.goToArtistOptions(activity, dataSet[adapterPosition].id, activityOptions) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt index f2dcc2d59..95dc7690a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt @@ -1,11 +1,11 @@ package code.name.monkey.retromusic.adapter.song +import android.app.ActivityOptions import android.content.res.ColorStateList import android.view.MenuItem import android.view.View import androidx.annotation.LayoutRes import androidx.appcompat.app.AppCompatActivity -import androidx.core.util.Pair import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R @@ -76,8 +76,8 @@ open class PlaylistSongAdapter(activity: AppCompatActivity, override fun onSongMenuItemClick(item: MenuItem): Boolean { if (item.itemId == R.id.action_go_to_album) { - val albumPairs = arrayOf>(Pair.create(image, activity.getString(R.string.transition_album_art))) - NavigationUtil.goToAlbum(activity, dataSet[adapterPosition - 1].albumId, *albumPairs) + val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(R.string.transition_album_art)) + NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition - 1].albumId, activityOptions) return true } return super.onSongMenuItemClick(item) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java index 834ff01e0..603a632e4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java @@ -1,6 +1,7 @@ package code.name.monkey.retromusic.fragments.mainactivity; import android.app.Activity; +import android.app.ActivityOptions; import android.content.SharedPreferences; import android.os.Bundle; import android.view.LayoutInflater; @@ -15,7 +16,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.widget.Toolbar; -import androidx.core.util.Pair; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -155,8 +155,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde toolbar.setBackgroundColor(RetroColorUtil.toolbarColor(getMainActivity())); toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp); toolbar.setOnClickListener(v -> { - Pair pair = new Pair<>(toolbarContainer, getString(R.string.transition_toolbar)); - NavigationUtil.goToSearch(getMainActivity(), pair); + ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar)); + NavigationUtil.goToSearch(getMainActivity(), options); }); appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> getMainActivity().setLightStatusbar(!ATHUtil.INSTANCE.isWindowBackgroundDark(getContext()))); @@ -366,8 +366,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde int id = item.getItemId(); switch (id) { case R.id.action_search: - Pair pair = new Pair<>(toolbarContainer, getString(R.string.transition_toolbar)); - NavigationUtil.goToSearch(getMainActivity(), pair); + ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar)); + NavigationUtil.goToSearch(getMainActivity(), options); break; case R.id.action_new_playlist: CreatePlaylistDialog.Companion.create().show(getChildFragmentManager(), "CREATE_PLAYLIST"); diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt index 12d58bd34..b1a083e0c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt @@ -1,5 +1,6 @@ package code.name.monkey.retromusic.fragments.mainactivity.home +import android.app.ActivityOptions import android.graphics.Bitmap import android.graphics.Color import android.os.Bundle @@ -7,7 +8,6 @@ import android.util.DisplayMetrics import android.view.* import androidx.appcompat.widget.Toolbar import androidx.core.content.ContextCompat -import androidx.core.util.Pair import androidx.recyclerview.widget.LinearLayoutManager import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.common.ATHToolbarActivity @@ -172,8 +172,8 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba setBackgroundColor(toolbarColor()) setNavigationIcon(R.drawable.ic_menu_white_24dp) setOnClickListener { - val pairImageView = Pair.create(toolbarContainer, resources.getString(R.string.transition_toolbar)) - NavigationUtil.goToSearch(requireActivity(), pairImageView) + val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, toolbarContainer, getString(R.string.transition_toolbar)) + NavigationUtil.goToSearch(requireActivity(), options) } } @@ -226,8 +226,8 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == R.id.action_search) { - val pairImageView = Pair.create(toolbarContainer, resources.getString(R.string.transition_toolbar)) - NavigationUtil.goToSearch(requireActivity(), true, pairImageView) + val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, toolbarContainer, getString(R.string.transition_toolbar)) + NavigationUtil.goToSearch(requireActivity(), true, options) } return super.onOptionsItemSelected(item) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt index 3710b1474..b09d7140d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt @@ -145,7 +145,7 @@ class FullPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca private fun setupArtist() { artistImage.setOnClickListener { - NavigationUtil.goToArtist(activity!!, MusicPlayerRemote.currentSong.artistId) + NavigationUtil.goToArtist(requireActivity(), MusicPlayerRemote.currentSong.artistId) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java index 837500c74..111f66cc5 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java @@ -23,10 +23,10 @@ import android.media.audiofx.AudioEffect; import android.widget.Toast; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.util.Pair; + +import org.jetbrains.annotations.NotNull; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.activities.AboutActivity; @@ -54,36 +54,33 @@ import static code.name.monkey.retromusic.util.RetroUtil.openUrl; public class NavigationUtil { - public static void goToAlbum(@NonNull Activity activity, int i, - @Nullable Pair... sharedElements) { + public static void goToAlbum(@NonNull Activity activity, int albumId) { Intent intent = new Intent(activity, AlbumDetailsActivity.class); - intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, i); - //noinspection unchecked - ActivityCompat.startActivity(activity, intent, - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); + intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, albumId); + ActivityCompat.startActivity(activity, intent, null); } - public static void goToAlbumOptions(@NonNull Activity activity, int albumId, @NonNull ActivityOptions activityOptions) { + public static void goToAlbumOptions(@NonNull Activity activity, + int albumId, + @NonNull ActivityOptions activityOptions) { Intent intent = new Intent(activity, AlbumDetailsActivity.class); intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, albumId); ActivityCompat.startActivity(activity, intent, activityOptions.toBundle()); } - public static void goToArtist(@NonNull Activity activity, int i, - @Nullable Pair... sharedElements) { + public static void goToArtistOptions(@NotNull AppCompatActivity activity, + int artistId, + @NonNull ActivityOptions options) { + Intent intent = new Intent(activity, ArtistDetailActivity.class); - intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, i); - //noinspection unchecked - ActivityCompat.startActivity(activity, intent, - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); + intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId); + ActivityCompat.startActivity(activity, intent, options.toBundle()); } public static void goToArtist(@NonNull Activity activity, int i) { Intent intent = new Intent(activity, ArtistDetailActivity.class); intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, i); - //noinspection unchecked - ActivityCompat.startActivity(activity, intent, - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, null).toBundle()); + ActivityCompat.startActivity(activity, intent, null); } public static void goToPlaylistNew(@NonNull Activity activity, @NonNull Playlist playlist) { @@ -151,16 +148,16 @@ public class NavigationUtil { } public static void goToSearch(@NonNull Activity activity, - @Nullable Pair... sharedElements) { + @NonNull ActivityOptions activityOptions) { ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class), - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); + activityOptions.toBundle()); } public static void goToSearch(@NonNull Activity activity, boolean isMicOpen, - @Nullable Pair... sharedElements) { + @NonNull ActivityOptions activityOptions) { ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class) .putExtra(SearchActivity.EXTRA_SHOW_MIC, isMicOpen), - ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedElements).toBundle()); + activityOptions.toBundle()); } public static void goToSupportDevelopment(@NonNull Activity activity) { @@ -178,4 +175,6 @@ public class NavigationUtil { public static void bugReport(@NonNull Activity activity) { ActivityCompat.startActivity(activity, new Intent(activity, BugReportActivity.class), null); } + + } diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt index 4a0c6dbb9..013587f3e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt @@ -26,7 +26,9 @@ import android.widget.Toast import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil.getSongFileUri +import com.afollestad.materialdialogs.LayoutMode import com.afollestad.materialdialogs.MaterialDialog +import com.afollestad.materialdialogs.bottomsheets.BottomSheet class RingtoneManager(val context: Context) { fun setRingtone(song: Song) { @@ -73,7 +75,8 @@ class RingtoneManager(val context: Context) { } fun getDialog(context: Context): MaterialDialog { - return MaterialDialog(context).show { + return MaterialDialog(context, BottomSheet(LayoutMode.WRAP_CONTENT)).show { + cornerRadius(PreferenceUtil.getInstance(context).dialogCorner) title(R.string.dialog_title_set_ringtone) message(R.string.dialog_message_set_ringtone) positiveButton(android.R.string.ok) { diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml index 94f789f83..622c2cdec 100644 --- a/app/src/main/res/menu/menu_album_detail.xml +++ b/app/src/main/res/menu/menu_album_detail.xml @@ -40,11 +40,6 @@ android:title="@string/action_add_to_playlist" app:showAsAction="never" /> - - - - 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 69eece925..036d09bc5 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,18 +1,4 @@ - - diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..be1d6a643 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.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 cf46dde4d..912c27f24 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 new file mode 100644 index 000000000..be1d6a643 Binary files /dev/null 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 new file mode 100644 index 000000000..6c186bd49 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.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 new file mode 100644 index 000000000..6c186bd49 Binary files /dev/null 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 new file mode 100644 index 000000000..76da62704 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.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 new file mode 100644 index 000000000..76da62704 Binary files /dev/null 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 new file mode 100644 index 000000000..8eab4099a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.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 239370c82..4678e7020 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 new file mode 100644 index 000000000..8eab4099a Binary files /dev/null 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 new file mode 100644 index 000000000..413e33c2d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.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 5e2790a96..02a7dc5e9 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 new file mode 100644 index 000000000..413e33c2d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index bb34a9834..c5d5899fd 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,18 +1,4 @@ - - #FFFFFF \ No newline at end of file