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

Refactor packages

Browse source
This commit is contained in:
h4h13 2019-04-20 10:59:45 +05:30
parent c386e1fe93
commit 39b0b4c931
188 changed files with 440 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@
<fragment
android:id="@+id/playback_controls_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.lockscreen.LockScreenPlayerControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_lock_screen_playback_controls" />

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="code.name.monkey.retromusic.ui.activities.WhatsNewActivity">
tools:context=".activities.WhatsNewActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout"

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

@ -54,7 +54,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@ -67,7 +67,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_adaptive_player_playback_controls" />

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

@ -48,7 +48,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</code.name.monkey.retromusic.views.WidthFitSquareLayout>
@ -61,7 +61,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.blur.BlurPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>

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

@ -183,7 +183,7 @@
<fragment
android:id="@+id/volume_fragment"
android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"

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

@ -69,7 +69,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
@ -83,7 +83,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_card_blur_player_playback_controls" />

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

@ -11,7 +11,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_album_full_cover" />
@ -68,7 +68,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.card.CardPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_card_player_playback_controls" />

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

@ -42,7 +42,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
class="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
class="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -50,7 +50,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
class="code.name.monkey.retromusic.ui.fragments.player.classic.ClassicPlayerPlaybackControlsFragment"
class="code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/albumCoverContainer" />

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

@ -100,7 +100,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.color.ColorPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_player_playback_controls" />

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

@ -20,7 +20,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_album_full_cover" />
@ -33,7 +33,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.fit.FitPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_player_playback_controls" />

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

@ -51,7 +51,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_player_album_cover" />
@ -64,7 +64,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.flat.FlatPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_flat_player_playback_controls" />

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

@ -9,7 +9,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_album_full_cover" />
@ -32,7 +32,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.full.FullPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"

57
app/src/main/res/layout/fragment_main_options.xml
View file

@ -10,10 +10,10 @@
<LinearLayout
android:id="@+id/userInfoContainer"
android:layout_width="match_parent"
android:padding="16dp"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:gravity="center_vertical"
android:orientation="horizontal"
android:padding="16dp">
<code.name.monkey.retromusic.views.CircularImageView
android:id="@+id/userImage"
@ -35,9 +35,9 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/titleWelcome"
android:layout_width="wrap_content"
android:textSize="18sp"
android:layout_height="wrap_content"
android:padding="0dp" />
android:padding="0dp"
android:textSize="18sp" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/text"
@ -72,41 +72,28 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.MaterialComponents.Overline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="@string/upgrade_to_premium"
android:textColor="@color/md_grey_200" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.MaterialComponents.Overline"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="Upgrade to premium"
android:textColor="@color/md_grey_200" />
<TextView
style="@style/TextAppearance.MaterialComponents.Headline6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="@string/buy_pro"
android:textColor="@color/md_white_1000" />
</LinearLayout>
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="TODO"
android:src="@drawable/promotional"
android:visibility="gone" />
<TextView
style="@style/TextAppearance.MaterialComponents.Headline6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:text="@string/buy_pro"
android:textColor="@color/md_white_1000" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<code.name.monkey.retromusic.views.OptionMenuItemView

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

@ -32,7 +32,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_album_cover" />
@ -45,7 +45,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.material.MaterialControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_material_playback_controls" />

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

@ -65,7 +65,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_player_album_cover" />
@ -78,7 +78,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.plain.PlainPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_plain_controls_fragment" />

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

@ -44,7 +44,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_album_cover" />
@ -57,7 +57,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.normal.PlayerPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_player_playback_controls" />

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

@ -34,7 +34,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_player_album_cover" />
@ -47,7 +47,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.simple.SimplePlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_simple_controls_fragment" />

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

@ -256,7 +256,7 @@
<fragment
android:id="@+id/volumeFragment"
android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"

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

@ -10,7 +10,7 @@
<fragment
android:id="@+id/playerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.PlayerAlbumCoverFragment"
android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_player_album_cover" />
@ -88,7 +88,7 @@
<fragment
android:id="@+id/playbackControlsFragment"
android:name="code.name.monkey.retromusic.ui.fragments.player.tiny.TinyPlaybackControlsFragment"
android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_tiny_controls_fragment" />

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

@ -35,7 +35,7 @@
<fragment
android:id="@+id/miniPlayerFragment"
android:name="code.name.monkey.retromusic.ui.fragments.MiniPlayerFragment"
android:name="code.name.monkey.retromusic.fragments.MiniPlayerFragment"
android:layout_width="match_parent"
android:layout_height="48dp"
tools:layout="@layout/fragment_mini_player" />

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

@ -10,7 +10,7 @@
<!-- <fragment
android:id="@+id/volumeFragment"
android:name="code.name.monkey.retromusic.ui.fragments.VolumeFragment"
android:name="code.name.monkey.retromusic.fragments.VolumeFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"