nyancrimew/PlayerAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed ATETextView from MaterialTextView

Browse source
This commit is contained in:
h4h13 2019-09-29 07:40:25 +05:30
parent 2be114da11
commit b1c0f70f61
28 changed files with 152 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java
View file

@ -77,7 +77,7 @@ public class LicenseActivity extends AbsBaseActivity {
// Inject color values for WebView body background and links
final boolean isDark = INSTANCE.isWindowBackgroundDark(this);
final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, R.attr.md_background_color, Color.parseColor(isDark ? "#424242" : "#ffffff")));
final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, R.attr.colorPrimary, Color.parseColor(isDark ? "#424242" : "#ffffff")));
final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
final String changeLog = buf.toString()
.replace("{style-placeholder}",

5
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
View file

@ -1,6 +1,7 @@
package code.name.monkey.retromusic.fragments.mainactivity
import android.os.Bundle
import android.view.View
import androidx.recyclerview.widget.GridLayoutManager
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
@ -17,6 +18,10 @@ open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Al
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
App.musicComponent.inject(this)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
albumsPresenter.attachView(this)
}

6
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
View file

@ -1,6 +1,7 @@
package code.name.monkey.retromusic.fragments.mainactivity
import android.os.Bundle
import android.view.View
import androidx.recyclerview.widget.GridLayoutManager
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
@ -26,9 +27,12 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
App.musicComponent.inject(this)
artistsPresenter.attachView(this)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
artistsPresenter.attachView(this)
}
override fun onResume() {
super.onResume()
if (adapter!!.dataSet.isEmpty()) {

6
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
View file

@ -15,6 +15,7 @@
package code.name.monkey.retromusic.fragments.mainactivity
import android.os.Bundle
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
@ -55,9 +56,12 @@ class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearL
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
App.musicComponent.inject(this)
genresPresenter.attachView(this)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
genresPresenter.attachView(this)
}
override fun onResume() {
super.onResume()
if (adapter!!.dataSet.isEmpty()) {

7
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
View file

@ -3,6 +3,7 @@ package code.name.monkey.retromusic.fragments.mainactivity
import android.os.Bundle
import android.view.Menu
import android.view.MenuInflater
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
@ -24,7 +25,11 @@ class PlaylistsFragment : AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, L
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
App.musicComponent?.inject(this)
App.musicComponent.inject(this)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
playlistsPresenter.attachView(this)
}

7
app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
View file

@ -8,14 +8,15 @@ import androidx.appcompat.widget.Toolbar
import code.name.monkey.appthemehelper.util.ATHUtil
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.model.Song
import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.model.Song
import kotlinx.android.synthetic.main.fragment_plain_player.*
class PlainPlayerFragment : AbsPlayerFragment() {
override fun playerToolbar(): Toolbar {
override fun playerToolbar(): Toolbar
{
return playerToolbar
}

3
app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java
View file

@ -24,6 +24,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.core.content.ContextCompat;
import code.name.monkey.appthemehelper.ThemeStore;
@ -36,7 +37,7 @@ import code.name.monkey.retromusic.R;
public class OptionMenuItemView extends FrameLayout {
TextView textView;
IconImageView iconImageView;
AppCompatImageView iconImageView;
public OptionMenuItemView(@NonNull Context context) {
this(context, null);

13
app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
View file

@ -20,12 +20,15 @@ import android.text.TextPaint;
import android.util.AttributeSet;
import android.view.Gravity;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
public class VerticalTextView extends AppCompatTextView {
import com.google.android.material.textview.MaterialTextView;
public class VerticalTextView extends MaterialTextView {
final boolean topDown;
public VerticalTextView(Context context, AttributeSet attrs) {
public VerticalTextView(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
final int gravity = getGravity();
if (Gravity.isVertical(gravity) && (gravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.BOTTOM) {
@ -37,12 +40,12 @@ public class VerticalTextView extends AppCompatTextView {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(heightMeasureSpec, widthMeasureSpec);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
setMeasuredDimension(getMeasuredHeight(), getMeasuredWidth());
}
@Override
protected void onDraw(Canvas canvas) {
protected void onDraw(@NonNull Canvas canvas) {
TextPaint textPaint = getPaint();
textPaint.setColor(getCurrentTextColor());
textPaint.drawableState = getDrawableState();

7
app/src/main/res/drawable/color_progress_seek.xml
View file

@ -18,7 +18,7 @@
<item android:id="@android:id/background">
<shape>
<corners android:radius="8dip" />
<solid android:color="?android:colorButtonNormal" />
<solid android:color="?colorButtonNormal" />
</shape>
</item>
@ -26,7 +26,7 @@
<clip>
<shape>
<corners android:radius="8dip" />
<solid android:color="?android:colorButtonNormal" />
<solid android:color="?colorButtonNormal" />
</shape>
</clip>
</item>
@ -40,8 +40,7 @@
</clip>
</item>
</layer-list>
<!--<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
</layer-list><!--<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="8dp" />

6
app/src/main/res/layout-land/fragment_plain_player.xml
View file

@ -54,7 +54,7 @@
android:paddingEnd="16dp"
android:paddingBottom="16dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/playerTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -70,7 +70,7 @@
tools:ignore="MissingPrefix"
tools:text="Title" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/playerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -97,7 +97,7 @@
android:layout_height="wrap_content"
android:layout_weight="0">
<code.name.monkey.appthemehelper.common.views.ATEToolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/playerToolbar"
style="@style/Toolbar"
android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"

9
app/src/main/res/layout-land/pager_item.xml
View file

@ -32,7 +32,7 @@
app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
</com.google.android.material.card.MaterialCardView>
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -42,11 +42,10 @@
android:paddingTop="6dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAppearance="@style/TextViewNormal"
tools:ignore="MissingPrefix"
tools:text="My top tracks" />
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -57,5 +56,5 @@
android:textAppearance="@style/TextViewSubtitle1"
android:textStyle="bold"
tools:ignore="MissingPrefix"
tools:text="My top tracks" />
tools:text="@tools:sample/lorem/random" />
</LinearLayout>

5
app/src/main/res/layout-xlarge-land/pager_item.xml
View file

@ -32,7 +32,7 @@
app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
</com.google.android.material.card.MaterialCardView>
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -42,11 +42,10 @@
android:paddingTop="6dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAppearance="@style/TextViewNormal"
tools:ignore="MissingPrefix"
tools:text="My top tracks" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"

5
app/src/main/res/layout-xlarge/pager_item.xml
View file

@ -32,7 +32,7 @@
app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
</com.google.android.material.card.MaterialCardView>
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -42,11 +42,10 @@
android:paddingTop="6dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAppearance="@style/TextViewNormal"
tools:ignore="MissingPrefix"
tools:text="My top tracks" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"

24
app/src/main/res/layout/bug_report_card_report.xml
View file

@ -32,19 +32,19 @@
android:paddingTop="8dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="8dp"
android:text="@string/bug_report_use_account"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" />
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="8dp"
android:text="@string/your_account_data_is_only_used_for_authentication"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" />
android:textAppearance="@style/TextViewCaption" />
</LinearLayout>
</FrameLayout>
@ -58,13 +58,13 @@
android:paddingEnd="16dp"
android:paddingRight="16dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/bug_report_issue"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textAppearance="@style/TextViewBody2"
android:textColor="?android:textColorSecondary" />
<com.google.android.material.textfield.TextInputLayout
@ -102,13 +102,13 @@
</com.google.android.material.textfield.TextInputLayout>
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/login"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textAppearance="@style/TextViewBody2"
android:textColor="?android:textColorSecondary" />
<com.google.android.material.textfield.TextInputLayout
@ -171,19 +171,19 @@
android:paddingTop="8dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="8dp"
android:text="@string/bug_report_manual"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" />
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="8dp"
android:text="@string/you_will_be_forwarded_to_the_issue_tracker_website"
android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" />
android:textAppearance="@style/TextViewCaption" />
</LinearLayout>
</FrameLayout>
</LinearLayout>

7
app/src/main/res/layout/dialog_add_to_playlist.xml
View file

@ -12,7 +12,7 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/bannerTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -21,14 +21,15 @@
android:text="@string/add_playlist_title"
android:textAppearance="@style/TextViewHeadline6" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionAddPlaylist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:padding="16dp"
android:text="@string/new_playlist_title"
app:srcCompat="@drawable/ic_playlist_add_white_24dp" />
app:srcCompat="@drawable/ic_playlist_add_white_24dp"
app:tint="?colorOnBackground" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView

14
app/src/main/res/layout/dialog_file_details.xml
View file

@ -6,7 +6,7 @@
android:orientation="vertical"
tools:ignore="NewApi,RtlSymmetry">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/filePath"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -15,7 +15,7 @@
android:textAppearance="@style/TextViewNormal"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/fileName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -25,7 +25,7 @@
android:textAppearance="@style/TextViewNormal"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/fileSize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -35,7 +35,7 @@
android:textAppearance="@style/TextViewNormal"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/fileFormat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -45,7 +45,7 @@
android:textAppearance="@style/TextViewNormal"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/trackLength"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -54,7 +54,7 @@
android:paddingEnd="16dp"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/bitrate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -64,7 +64,7 @@
android:textAppearance="@style/TextViewNormal"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/samplingRate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

13
app/src/main/res/layout/fragment_card_player_playback_controls.xml
View file

@ -53,7 +53,7 @@
<FrameLayout
android:id="@+id/volumeFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp">
@ -82,7 +82,7 @@
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="12dp"
@ -92,23 +92,24 @@
android:paddingStart="16dp"
android:paddingEnd="16dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextViewSubtitle1" />
android:textAppearance="@style/TextViewSubtitle1"
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextViewBody1" />
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

20
app/src/main/res/layout/fragment_color_player_playback_controls.xml
View file

@ -18,7 +18,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -29,9 +29,10 @@
android:singleLine="true"
android:textAppearance="@style/TextViewOverline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="00:22" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songTotalTime"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -42,7 +43,8 @@
android:singleLine="true"
android:textAppearance="@style/TextViewOverline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="04:22" />
<androidx.appcompat.widget.AppCompatSeekBar
android:id="@+id/progressSlider"
@ -69,7 +71,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/progressContainer">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -85,9 +87,9 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewSubtitle1"
tools:text="Title" />
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -96,9 +98,9 @@
android:gravity="center"
android:maxLines="1"
android:paddingStart="24dp"
android:paddingTop="24dp"
android:paddingEnd="24dp"
android:textAppearance="@style/TextViewBody2" />
android:textAppearance="@style/TextViewBody2"
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
<RelativeLayout

19
app/src/main/res/layout/fragment_fit_playback_controls.xml
View file

@ -13,7 +13,7 @@
android:layout_height="@dimen/progress_container_height"
android:background="@color/twenty_percent_black_overlay">
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -23,9 +23,10 @@
android:singleLine="true"
android:textAppearance="@style/TextViewOverline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="00:22" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songTotalTime"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -35,7 +36,8 @@
android:singleLine="true"
android:textAppearance="@style/TextViewOverline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
tools:ignore="RtlHardcoded,RtlSymmetry"
tools:text="04:22" />
<androidx.appcompat.widget.AppCompatSeekBar
android:id="@+id/progressSlider"
@ -55,7 +57,7 @@
android:orientation="vertical"
android:padding="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -71,10 +73,9 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="?android:attr/textColorPrimary"
tools:text="Title" />
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -85,7 +86,7 @@
android:maxLines="1"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/TextViewNormal" />
tools:text="@tools:sample/lorem/random" />
</LinearLayout>
<include layout="@layout/media_button" />

9
app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
View file

@ -62,7 +62,7 @@
tools:progress="20" />
</RelativeLayout>
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -84,9 +84,9 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/progressContainer"
tools:text="Title" />
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATEAccentTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -102,7 +102,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
app:layout_constraintTop_toBottomOf="@+id/title"
tools:text="@tools:sample/lorem/random" />
<RelativeLayout

72
app/src/main/res/layout/fragment_main_settings.xml
View file

@ -2,15 +2,15 @@
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/container"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:id="@+id/buyProContainer"
@ -37,7 +37,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -47,7 +47,7 @@
android:text="@string/upgrade_to_premium"
android:textAppearance="@style/TextViewOverline" />
<code.name.monkey.appthemehelper.common.views.ATEAccentTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -57,17 +57,16 @@
android:paddingBottom="8dp"
android:text="@string/buy_pro"
android:textAppearance="@style/TextViewHeadline6"
android:textColor="@color/md_white_1000" />
android:textColor="?colorOnSurface" />
<code.name.monkey.retromusic.views.BaselineGridTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingEnd="0dp"
android:text="@string/pro_summary"
android:textAppearance="@style/TextViewBody1"
android:textColor="@color/md_white_1000" />
android:textColor="?colorOnSurface" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
@ -123,7 +122,7 @@
android:layout_marginStart="16dp"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -132,14 +131,12 @@
android:text="@string/general_settings_title"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/general_settings_summary"
android:textAppearance="@style/TextViewNormal"
tools:text="Summary" />
android:text="@string/general_settings_summary" />
</LinearLayout>
@ -169,7 +166,7 @@
android:layout_marginStart="16dp"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -178,13 +175,12 @@
android:text="@string/now_playing"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/now_playing_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/now_playing_summary" />
</LinearLayout>
</LinearLayout>
@ -213,7 +209,7 @@
android:layout_marginStart="16dp"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -222,13 +218,12 @@
android:text="@string/pref_header_audio"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/audio_settings_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/audio_settings_summary" />
</LinearLayout>
</LinearLayout>
@ -257,7 +252,7 @@
android:layout_marginStart="16dp"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -266,13 +261,12 @@
android:text="@string/personalize"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/personalize_settings_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/personalize_settings_summary" />
</LinearLayout>
</LinearLayout>
@ -300,7 +294,7 @@
android:layout_marginStart="16dp"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -309,13 +303,12 @@
android:text="@string/pref_header_images"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/image_settings_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/image_settings_summary" />
</LinearLayout>
</LinearLayout>
@ -343,7 +336,7 @@
android:layout_marginStart="16dp"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -352,13 +345,12 @@
android:text="@string/notification"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/notification_settings_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/notification_settings_summary" />
</LinearLayout>
</LinearLayout>
@ -388,7 +380,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -397,13 +389,12 @@
android:text="@string/others"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/other_settings_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/other_settings_summary" />
</LinearLayout>
</LinearLayout>
@ -433,7 +424,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -442,12 +433,11 @@
android:text="@string/action_about"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/about_settings_summary"
android:textAppearance="@style/TextViewNormal" />
android:text="@string/about_settings_summary" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@ -85,7 +85,7 @@
android:layout_height="48dp"
android:layout_weight="0">
<code.name.monkey.appthemehelper.common.views.ATEToolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/playerToolbar"
style="@style/Toolbar"
android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"

11
app/src/main/res/layout/fragment_simple_controls_fragment.xml
View file

@ -19,7 +19,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
@ -43,9 +43,9 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" />
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent"
@ -62,9 +62,10 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
app:layout_constraintTop_toBottomOf="@+id/title"
tools:text="@tools:sample/lorem/random" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/songCurrentProgress"
android:layout_width="match_parent"
android:layout_height="wrap_content"

3
app/src/main/res/layout/fragment_simple_slide_large_image.xml
View file

@ -23,7 +23,8 @@
android:orientation="vertical"
android:padding="@dimen/mi_baseline">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
tools:srcCompat="@tools:sample/backgrounds/scenic[4]"
android:id="@id/mi_image"
android:layout_width="wrap_content"
android:layout_height="0dp"

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

@ -11,7 +11,7 @@
<FrameLayout
android:id="@+id/volumeFragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_weight="0"
android:rotation="90"
android:visibility="gone" />
@ -21,7 +21,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/roundSelector"
android:contentDescription="TODO"
android:padding="16dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_repeat_white_24dp"
@ -33,7 +32,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/roundSelector"
android:contentDescription="TODO"
android:padding="16dp"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_shuffle_white_24dp"

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

@ -96,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<code.name.monkey.appthemehelper.common.views.ATEToolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/playerToolbar"
style="@style/Toolbar"
android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"

3
app/src/main/res/layout/fragment_volume.xml
View file

@ -26,7 +26,8 @@
android:layout_weight="1"
android:maxHeight="2dp"
android:progressDrawable="@drawable/color_progress_seek"
tools:progress="20" />
tools:progress="20"
tools:progressTint="?colorControlNormal" />
<androidx.appcompat.widget.AppCompatImageView

1
app/src/main/res/layout/item_option_menu.xml
View file

@ -41,5 +41,6 @@
android:layout_weight="1"
android:text="@string/folders"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnPrimary"
android:textSize="16sp" />
</LinearLayout>