Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed previously missed package names

Browse source
This commit is contained in:
Muntashir Al-Islam 2020-06-18 01:32:44 +06:00
parent 301ac10570
commit aa8ed9475b
16 changed files with 50 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -24,7 +24,7 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId 'io.github.muntashirakon.Music'
versionCode 440
versionCode 441
versionName '3.5.8'
multiDexEnabled true

2
app/proguard-rules.pro vendored
View file

@ -60,7 +60,7 @@
#-keep class org.jaudiotagger.** { *; }
#For cast
-keep class code.name.monkey.retromusic.cast.CastOptionsProvider { *; }
-keep class io.github.muntashirakon.music.cast.CastOptionsProvider { *; }
-keep class android.support.** { *; }
-keep class com.google.** { *; }
-keep class java.nio.file.** { *; }

10
app/src/main/java/io/github/muntashirakon/music/service/MusicService.java
View file

@ -98,7 +98,7 @@ public class MusicService extends Service implements
SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
public static final String TAG = MusicService.class.getSimpleName();
public static final String RETRO_MUSIC_PACKAGE_NAME = "code.name.monkey.retromusic";
public static final String RETRO_MUSIC_PACKAGE_NAME = "io.github.muntashirakon.music";
public static final String MUSIC_PACKAGE_NAME = "com.android.music";
public static final String ACTION_TOGGLE_PAUSE = RETRO_MUSIC_PACKAGE_NAME + ".togglepause";
public static final String ACTION_PLAY = RETRO_MUSIC_PACKAGE_NAME + ".play";
@ -392,7 +392,7 @@ public class MusicService extends Service implements
restoreState();
sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_CREATED"));
sendBroadcast(new Intent(RETRO_MUSIC_PACKAGE_NAME + ".RETRO_MUSIC_SERVICE_CREATED"));
registerHeadsetEvents();
registerBluetoothConnected();
@ -421,7 +421,7 @@ public class MusicService extends Service implements
PreferenceUtil.INSTANCE.unregisterOnSharedPreferenceChangedListener(this);
wakeLock.release();
sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_DESTROYED"));
sendBroadcast(new Intent(RETRO_MUSIC_PACKAGE_NAME + ".RETRO_MUSIC_SERVICE_DESTROYED"));
}
public void acquireWakeLock(long milli) {
@ -1053,7 +1053,6 @@ public class MusicService extends Service implements
final Song song = getCurrentSong();
if (song != null) {
intent.putExtra("id", song.getId());
intent.putExtra("artist", song.getArtistName());
intent.putExtra("album", song.getAlbumName());
@ -1064,7 +1063,6 @@ public class MusicService extends Service implements
intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME);
sendStickyBroadcast(intent);
}
}
public void toggleShuffle() {
if (getShuffleMode() == SHUFFLE_MODE_NONE) {
@ -1350,7 +1348,7 @@ public class MusicService extends Service implements
0);
mediaSession = new MediaSessionCompat(this,
"RetroMusicPlayer",
"M",
mediaButtonReceiverComponentName,
mediaButtonReceiverPendingIntent);
MediaSessionCallback mediasessionCallback = new MediaSessionCallback(

4
app/src/main/res/layout/fragment_blur.xml
View file

@ -44,7 +44,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
@ -54,7 +54,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.blur.BlurPlaybackControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/playerToolbar"

4
app/src/main/res/layout/fragment_classic_player.xml
View file

@ -14,7 +14,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="1:1"
@ -73,7 +73,7 @@
app:behavior_hideable="false"
app:cardCornerRadius="0dp"
app:cardElevation="12dp"
app:layout_behavior="code.name.monkey.retromusic.io.github.muntashirakon.music.RetroBottomSheetBehavior">
app:layout_behavior="io.github.muntashirakon.music.RetroBottomSheetBehavior">
<LinearLayout
android:layout_width="match_parent"

4
app/src/main/res/layout/fragment_color_player.xml
View file

@ -33,7 +33,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
@ -43,7 +43,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.color.ColorPlaybackControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/playerToolbar"

4
app/src/main/res/layout/fragment_fit.xml
View file

@ -24,7 +24,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_album_full_cover" />
@ -39,7 +39,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.fit.FitPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_gradient_controls" />

4
app/src/main/res/layout/fragment_flat_player.xml
View file

@ -45,7 +45,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
@ -57,7 +57,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.flat.FlatPlaybackControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"

4
app/src/main/res/layout/fragment_full.xml
View file

@ -10,7 +10,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
@ -33,7 +33,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.full.FullPlaybackControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="bottom"

4
app/src/main/res/layout/fragment_gradient_player.xml
View file

@ -14,7 +14,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constrainedHeight="true"
@ -63,7 +63,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:behavior_hideable="false"
app:layout_behavior="code.name.monkey.retromusic.io.github.muntashirakon.music.RetroBottomSheetBehavior">
app:layout_behavior="io.github.muntashirakon.music.RetroBottomSheetBehavior">
<LinearLayout
android:id="@+id/container"

2
app/src/main/res/layout/fragment_home_player.xml
View file

@ -7,7 +7,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"

4
app/src/main/res/layout/fragment_material.xml
View file

@ -24,7 +24,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
@ -34,7 +34,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.material.MaterialControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/playerToolbar"

4
app/src/main/res/layout/fragment_peak_player.xml
View file

@ -49,7 +49,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_marginStart="16dp"
@ -116,7 +116,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.peak.PeakPlayerControlFragment"
android:name="io.github.muntashirakon.music.fragments.player.peak.PeakPlayerControlFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_plain_player.xml
View file

@ -63,7 +63,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
@ -73,7 +73,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.plain.PlainPlaybackControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/playerToolbar"

4
app/src/main/res/layout/fragment_simple_player.xml
View file

@ -27,7 +27,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintEnd_toEndOf="parent"
@ -37,7 +37,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.simple.SimplePlaybackControlsFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/playerToolbar"

4
app/src/main/res/layout/fragment_tiny_player.xml
View file

@ -9,7 +9,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
@ -107,7 +107,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
android:name="io.github.muntashirakon.music.fragments.player.tiny.TinyPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_tiny_controls_fragment" />