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

Added android 10 dark theme support

Browse source
This commit is contained in:
h4h13 2019-09-27 21:06:10 +05:30
parent 46cdedce0b
commit 153f1bd9d0
33 changed files with 372 additions and 352 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -13,8 +13,8 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
versionCode 371
versionName '3.4.000-beta-final'
versionCode 372
versionName '3.4.000'
multiDexEnabled true
@ -67,7 +67,7 @@ android {
sourceCompatibility '1.8'
targetCompatibility '1.8'
}
buildToolsVersion = '29.0.1'
buildToolsVersion = '29.0.2'
configurations.all {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
@ -102,7 +102,7 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.fragment:fragment:1.2.0-alpha03'
implementation 'androidx.fragment:fragment:1.2.0-alpha04'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
implementation "androidx.gridlayout:gridlayout:1.0.0"

2
app/src/main/assets/retro-changelog.html
View file

File diff suppressed because one or more lines are too long

14
app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
View file

@ -9,8 +9,6 @@ import android.view.View
import androidx.core.app.ShareCompat
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.LinearLayoutManager
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
import code.name.monkey.retromusic.Constants.APP_INSTAGRAM_LINK
import code.name.monkey.retromusic.Constants.APP_TELEGRAM_LINK
import code.name.monkey.retromusic.Constants.APP_TWITTER_LINK
@ -60,16 +58,13 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_about)
setStatusbarColorAuto()
setNavigationbarColorAuto()
setLightNavigationBar(true)
loadContributors()
setUpToolbar()
setSupportActionBar(toolbar)
appVersion.text = getAppVersion()
setUpView()
}
@ -83,10 +78,9 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
}
private fun setUpToolbar() {
appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this))
toolbar.setBackgroundColor(ThemeStore.primaryColor(this))
setSupportActionBar(toolbar)
ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.textColorSecondary(this))
//appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this))
//toolbar.setBackgroundColor(ThemeStore.primaryColor(this))
//ToolbarContentTintHelper.colorBackButton(toolbar, ThemeStore.textColorSecondary(this))
}
private fun openUrl(url: String) {

15
app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
View file

@ -9,7 +9,6 @@ import android.transition.Slide
import android.view.*
import android.view.animation.AnimationUtils
import android.widget.ImageView
import androidx.core.app.ActivityCompat
import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
@ -85,7 +84,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
contentContainer?.setCardBackgroundColor(ColorStateList.valueOf(ThemeStore.primaryColor(this)))
ActivityCompat.postponeEnterTransition(this)
postponeEnterTransition()
artistImage = findViewById(R.id.artistImage)
@ -169,7 +168,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
}
override fun complete() {
ActivityCompat.startPostponedEnterTransition(this)
scheduleStartPostponedTransition(image)
}
override fun album(album: Album) {
@ -224,6 +223,16 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView {
})
}
private fun scheduleStartPostponedTransition(image: ImageView) {
image.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean {
image.viewTreeObserver.removeOnPreDrawListener(this)
startPostponedEnterTransition();
return true;
}
})
}
private fun setColors(color: Int) {
val themeColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color
else ThemeStore.accentColor(this)

20
app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
View file

@ -78,28 +78,18 @@ open class SongAdapter @JvmOverloads constructor(
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val song = dataSet[position]
val isChecked = isChecked(song)
holder.itemView.isActivated = isChecked
if (holder.title != null) {
holder.title!!.text = getSongTitle(song)
}
if (holder.text != null) {
holder.text!!.text = getSongText(song)
}
holder.title?.text = getSongTitle(song)
holder.text?.text = getSongText(song)
loadAlbumCover(song, holder)
}
private fun setColors(color: Int, holder: ViewHolder) {
if (holder.paletteColorContainer != null) {
holder.paletteColorContainer!!.setBackgroundColor(color)
if (holder.title != null) {
holder.title!!.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
}
if (holder.text != null) {
holder.text!!.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
}
holder.paletteColorContainer?.setBackgroundColor(color)
holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
}
}

4
app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
View file

@ -10,11 +10,9 @@ import android.text.SpannableStringBuilder
import android.text.style.ForegroundColorSpan
import android.view.*
import android.view.animation.DecelerateInterpolator
import android.widget.Toast
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
@ -46,8 +44,6 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
view.setBackgroundColor(ThemeStore.primaryColor(requireContext()))
view.setOnTouchListener(FlingPlayBackController(requireContext()))
//view.setOnClickListener(v -> NavigationUtil.gotoNowPlayingActivity(getContext()));
setUpMiniPlayer()

16
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
View file

@ -30,8 +30,6 @@ import java.util.Objects;
import code.name.monkey.appthemehelper.ThemeStore;
import code.name.monkey.appthemehelper.common.ATHToolbarActivity;
import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.appthemehelper.util.TintHelper;
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog;
@ -54,7 +52,6 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
private Toolbar toolbar;
private AppBarLayout appBarLayout;
private View contentContainer;
private MaterialCardView toolbarContainer;
private MaterialCab cab;
@ -89,9 +86,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
@Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_library, container, false);
disposable = new CompositeDisposable();
contentContainer = view.findViewById(R.id.fragmentContainer);
toolbarContainer = view.findViewById(R.id.toolbarContainer);
appBarLayout = view.findViewById(R.id.appBarLayout);
toolbarContainer = view.findViewById(R.id.toolbarContainer);
toolbar = view.findViewById(R.id.toolbar);
PreferenceUtil.getInstance(requireActivity()).registerOnSharedPreferenceChangedListener(this);
return view;
@ -149,17 +145,15 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
@SuppressWarnings("ConstantConditions")
private void setupToolbar() {
int primaryColor = ThemeStore.Companion.primaryColor(getContext());
TintHelper.setTintAuto(contentContainer, primaryColor, true);
appBarLayout.setBackgroundColor(primaryColor);
toolbar.setBackgroundColor(RetroColorUtil.toolbarColor(getMainActivity()));
//int primaryColor = ThemeStore.Companion.primaryColor(getContext());
//TintHelper.setTintAuto(contentContainer, primaryColor, true);
//appBarLayout.setBackgroundColor(primaryColor);
//toolbar.setBackgroundColor(RetroColorUtil.toolbarColor(getMainActivity()));
toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
toolbar.setOnClickListener(v -> {
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())));
getMainActivity().setSupportActionBar(toolbar);
toolbar.setNavigationOnClickListener(v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY));
}

1
app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
View file

@ -64,6 +64,7 @@ class ArtistImageFetcher(
} catch (ignore: IOException) {
// can't do much about it
}
}
}

22
app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
View file

@ -20,15 +20,11 @@ import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.RECENT_ALBUMS
import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.RECENT_ARTISTS
import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.TOP_ALBUMS
import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.TOP_ARTISTS
import code.name.monkey.retromusic.model.Album
import code.name.monkey.retromusic.model.Artist
import code.name.monkey.retromusic.model.Home
import code.name.monkey.retromusic.model.Playlist
import code.name.monkey.retromusic.mvp.BaseView
import code.name.monkey.retromusic.mvp.Presenter
import code.name.monkey.retromusic.mvp.PresenterImpl
import code.name.monkey.retromusic.providers.interfaces.Repository
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import javax.inject.Inject
@ -44,16 +40,20 @@ interface HomeView : BaseView {
interface HomePresenter : Presenter<HomeView> {
fun loadSections()
class HomePresenterImpl @Inject constructor(
private val repository: Repository
) : PresenterImpl<HomeView>(), HomePresenter {
val hashSet: HashSet<Home> = HashSet()
override fun loadSections() {
/*loadRecentArtists()
loadRecentArtists()
loadRecentAlbums()
loadTopArtists()
loadATopAlbums()
loadFavorite()*/
loadHomeSection()
loadFavorite()
//loadHomeSection()
}
private var disposable: CompositeDisposable = CompositeDisposable()
@ -67,7 +67,7 @@ interface HomePresenter : Presenter<HomeView> {
}
}
/*private fun loadRecentArtists() {
private fun loadRecentArtists() {
disposable += repository.recentArtistsFlowable
.subscribe {
if (it.isNotEmpty()) hashSet.add(
@ -140,9 +140,9 @@ interface HomePresenter : Presenter<HomeView> {
))
showData(ArrayList(hashSet))
}
}*/
}
private fun loadHomeSection() {
/*private fun loadHomeSection() {
val ob = listOf(repository.recentArtistsFlowable,
repository.recentAlbumsFlowable,
repository.topArtistsFlowable,
@ -200,7 +200,7 @@ interface HomePresenter : Presenter<HomeView> {
}.subscribe {
view.sections(ArrayList(it))
}
}
}*/
}
}

23
app/src/main/java/code/name/monkey/retromusic/loaders/HomeLoader.kt → app/src/main/java/code/name/monkey/retromusic/util/AttrsUtil.kt
View file

@ -12,18 +12,19 @@
* See the GNU General Public License for more details.
*/
package code.name.monkey.retromusic.loaders
package code.name.monkey.retromusic.util
import android.content.Context
import code.name.monkey.retromusic.model.Playlist
import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist
import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
import code.name.monkey.retromusic.model.smartplaylist.MyTopTracksPlaylist
import io.reactivex.Observable
object HomeLoader {
import androidx.annotation.AttrRes
object AttrsUtil {
@JvmOverloads
fun resolveColor(context: Context, @AttrRes attr: Int, fallback: Int = 0): Int {
val a = context.theme.obtainStyledAttributes(intArrayOf(attr))
try {
return a.getColor(0, fallback)
} finally {
a.recycle()
}
}
}

18
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/BaselineGridTextView.java → app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
View file

@ -12,7 +12,7 @@
* See the GNU General Public License for more details.
*/
package code.name.monkey.appthemehelper.common.views;
package code.name.monkey.retromusic.views;
import android.content.Context;
import android.content.res.TypedArray;
@ -21,25 +21,11 @@ import android.util.AttributeSet;
import android.util.TypedValue;
import androidx.annotation.FontRes;
import androidx.appcompat.widget.AppCompatTextView;
import com.google.android.material.textview.MaterialTextView;
import code.name.monkey.appthemehelper.R;
import code.name.monkey.retromusic.R;
/**
* An extension to {@link AppCompatTextView} which aligns text to a 4dp baseline grid.
* <p>
* To achieve this we expose a {@code lineHeightHint} allowing you to specify the desired line
* height (alternatively a {@code lineHeightMultiplierHint} to use a multiplier of the text size).
* This line height will be adjusted to be a multiple of 4dp to ensure that baselines sit on
* the grid.
* <p>
* We also adjust spacing above and below the text to ensure that the first line's baseline sits on
* the grid (relative to the view's top) & that this view's height is a multiple of 4dp so that
* subsequent views start on the grid.
*/
public class BaselineGridTextView extends MaterialTextView {
private final float FOUR_DIP;

6
app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt
View file

@ -35,11 +35,11 @@ class WidthFitSquareCardView : MaterialCardView {
}
override fun onMeasure(i: Int, i2: Int) {
var i2 = i2
var width = i2
if (this.forceSquare) {
i2 = i
width = i
}
super.onMeasure(i, i2)
super.onMeasure(i, width)
}
private var forceSquare = true

11
app/src/main/res/layout-xlarge/abs_playlists.xml
View file

@ -28,20 +28,21 @@
android:paddingStart="16dp"
android:paddingEnd="0dp">
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.75"
android:ellipsize="end"
android:text="@string/welcome" />
android:text="@string/welcome"
android:textColor="?colorOnBackground" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/titleWelcome"
style="@style/TextAppearance.MaterialComponents.Headline5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="0dp"
android:textAppearance="@style/TextViewHeadline5"
android:textColor="?colorOnPrimary"
tools:text="@string/app_name" />
</LinearLayout>

39
app/src/main/res/layout-xlarge/fragment_mini_player.xml
View file

@ -15,7 +15,7 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/miniPlayerImage"
android:layout_width="24dp"
android:layout_height="24dp"
@ -23,9 +23,11 @@
android:layout_margin="16dp"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
tools:ignore="ContentDescription" />
app:tint="?colorOnSurface"
tools:ignore="ContentDescription"
tools:tint="?colorOnSurface" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/miniPlayerTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -39,18 +41,23 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewNormal" />
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnSurface"
tools:text="Song name and details" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionPrevious"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="8dp"
app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
app:srcCompat="@drawable/ic_skip_previous_white_24dp"
app:tint="?colorOnSurface"
tools:tint="@color/black_color" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/miniPlayerPlayPauseButton"
android:layout_width="40dp"
android:layout_height="40dp"
@ -58,9 +65,12 @@
android:background="?roundSelector"
android:scaleType="center"
app:srcCompat="@drawable/ic_pause_white_24dp"
tools:ignore="ContentDescription" />
app:tint="?colorOnSurface"
tools:ignore="ContentDescription"
tools:tint="?colorOnSurface" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionNext"
android:layout_width="40dp"
android:layout_height="40dp"
@ -68,16 +78,21 @@
android:layout_marginEnd="16dp"
android:background="?roundSelector"
android:padding="8dp"
app:srcCompat="@drawable/ic_skip_next_white_24dp" />
app:srcCompat="@drawable/ic_skip_next_white_24dp"
app:tint="?colorOnSurface"
tools:tint="?colorOnSurface" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionPlayingQueue"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_playlist_play_white_24dp" />
app:srcCompat="@drawable/ic_playlist_play_white_24dp"
app:tint="?colorOnSurface"
tools:tint="?colorOnSurface" />
</LinearLayout>

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

@ -33,20 +33,21 @@
android:paddingStart="16dp"
android:paddingEnd="0dp">
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.75"
android:ellipsize="end"
android:text="@string/welcome" />
android:text="@string/welcome"
android:textColor="?colorOnBackground" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/titleWelcome"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="0dp"
android:textAppearance="@style/TextViewHeadline5"
android:textColor="?colorOnPrimary"
tools:text="@string/app_name" />
</LinearLayout>
</LinearLayout>

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

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -9,26 +8,22 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="0dp"
app:elevation="0dp">
app:liftOnScroll="true">
<code.name.monkey.appthemehelper.common.views.ATEToolbar
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:layout_collapseMode="pin"
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
app:title="@string/action_about" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="@dimen/card_elevation"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<include layout="@layout/activity_about_content" />
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -14,7 +14,8 @@
<code.name.monkey.appthemehelper.common.views.ATEAccentTextView
style="@style/SubTitleTextAppearance"
android:text="@string/credit_title"
android:textAppearance="@style/TextViewOverline" />
android:textAppearance="@style/TextViewOverline"
android:textColor="?colorAccent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"

23
app/src/main/res/layout/card_other.xml
View file

@ -32,18 +32,17 @@
tools:ignore="PrivateResource">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/changelog"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/changelog_summary"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
<LinearLayout
@ -60,18 +59,17 @@
android:paddingBottom="8dp"
tools:ignore="PrivateResource">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/pref_title_open_source_licences"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/pref_summary_open_source_licences"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
<LinearLayout
@ -87,22 +85,21 @@
android:paddingBottom="8dp"
tools:ignore="PrivateResource">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/version"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:id="@+id/appVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="0.0.0"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/madeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

82
app/src/main/res/layout/card_retro_info.xml
View file

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="?colorSurface"
app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true">
@ -28,13 +29,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_github_circle_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -45,19 +46,18 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/circular"
android:text="@string/git_hub"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/git_hub_summary"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -72,13 +72,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_flag_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -89,18 +89,17 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/translate"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/translate_community"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -115,13 +114,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_star_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -132,19 +131,17 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/rate_app"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:textAppearance="@style/TextViewBody2"
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/rate_on_google_play_summary" />
android:text="@string/rate_on_google_play_summary"
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -159,13 +156,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_card_giftcard_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -177,18 +174,17 @@
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/donate"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:textAppearance="@style/TextViewBody2"
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/donate_summary" />
android:text="@string/donate_summary"
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -203,13 +199,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_bug_report_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -220,18 +216,17 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/report_bug"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:textAppearance="@style/TextViewBody2"
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/bug_report_summary" />
android:text="@string/bug_report_summary"
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -247,13 +242,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_share_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -265,13 +260,11 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_share"
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="@color/md_white_1000" />
android:textAppearance="@style/TextViewSubtitle1" />
</LinearLayout>
</LinearLayout>
@ -288,13 +281,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/social_buttons"
android:padding="16dp"
app:srcCompat="@drawable/ic_help_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -306,12 +299,11 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/faq"
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="@color/md_white_1000" />
android:textAppearance="@style/TextViewSubtitle1" />
</LinearLayout>
</LinearLayout>

46
app/src/main/res/layout/card_social.xml
View file

@ -28,12 +28,13 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
app:srcCompat="@drawable/ic_pinterest_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -44,19 +45,17 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/pinterest_page"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/pinterest_page_summary"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -71,12 +70,12 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
app:srcCompat="@drawable/ic_instagram_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -88,18 +87,17 @@
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/instagram_page"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/instagram_page_summary"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -114,12 +112,12 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
app:srcCompat="@drawable/ic_twitter_white_24dp"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -130,18 +128,17 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/twitter_page"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/twitter_page_summary"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>
@ -156,12 +153,12 @@
android:orientation="horizontal"
tools:ignore="PrivateResource">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
app:srcCompat="@drawable/ic_telegram_white"
app:tint="@color/md_white_1000" />
app:tint="?colorOnSurface" />
<LinearLayout
android:layout_width="match_parent"
@ -172,18 +169,17 @@
android:paddingEnd="12dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/telegram_group"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:text="@string/telegram_group_summary"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>

10
app/src/main/res/layout/fragment_library.xml
View file

@ -39,6 +39,7 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSurface"
app:liftOnScroll="true">
<com.google.android.material.card.MaterialCardView
@ -47,6 +48,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:cardBackgroundColor="?colorSurface"
app:cardCornerRadius="8dp"
app:cardElevation="0dp"
app:cardUseCompatPadding="true"
@ -60,7 +62,12 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="?colorSurface"
app:contentInsetStart="0dp"
app:popupTheme="?toolbarPopupTheme"
app:contentInsetStartWithNavigation="0dp"
app:title="@string/search_hint"
app:titleMarginStart="0dp"
app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
@ -79,7 +86,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/md_white_1000"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -60,7 +60,7 @@
android:textAppearance="@style/TextViewHeadline6"
android:textColor="@color/md_white_1000" />
<code.name.monkey.appthemehelper.common.views.BaselineGridTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

34
app/src/main/res/layout/fragment_mini_player.xml
View file

@ -5,7 +5,7 @@
android:id="@+id/mini_player_content"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@android:color/transparent"
android:background="?colorSurface"
android:clickable="true"
android:focusable="false"
tools:ignore="UnusedAttribute">
@ -17,7 +17,10 @@
android:paddingStart="0dp"
android:paddingEnd="8dp">
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
app:tint="?colorOnSurface"
tools:tint="?colorOnSurface"
android:id="@+id/miniPlayerImage"
android:layout_width="24dp"
android:layout_height="24dp"
@ -27,7 +30,7 @@
app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
tools:ignore="ContentDescription" />
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/miniPlayerTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -41,18 +44,21 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@style/TextViewNormal" />
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnSurface"
tools:text="Song name and details" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionPrevious"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
app:srcCompat="@drawable/ic_skip_previous_white_24dp"
app:tint="?colorOnSurface" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/miniPlayerPlayPauseButton"
android:layout_width="40dp"
android:layout_height="40dp"
@ -61,25 +67,31 @@
android:padding="6dp"
android:scaleType="center"
app:srcCompat="@drawable/ic_pause_white_24dp"
app:tint="?colorOnSurface"
tools:ignore="ContentDescription" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionNext"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_skip_next_white_24dp" />
app:srcCompat="@drawable/ic_skip_next_white_24dp"
app:tint="?colorOnSurface"
tools:tint="?colorOnSurface" />
<code.name.monkey.retromusic.views.IconImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/actionPlayingQueue"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="?roundSelector"
android:padding="6dp"
app:srcCompat="@drawable/ic_playlist_play_white_24dp" />
app:srcCompat="@drawable/ic_playlist_play_white_24dp"
app:tint="?colorOnSurface"
tools:tint="?colorOnSurface" />
</LinearLayout>

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

@ -42,17 +42,16 @@
android:paddingEnd="16dp"
android:paddingBottom="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"
android:textAppearance="@style/TextViewSubtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.85"
android:textAppearance="@style/TextViewBody2" />
app:lineHeightHint="24sp" />
</LinearLayout>
</LinearLayout>

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

@ -42,18 +42,17 @@
android:paddingEnd="16dp"
android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="@style/TextViewHeadline5" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<code.name.monkey.retromusic.views.BaselineGridTextView
app:lineHeightHint="24sp"
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:alpha="0.85"
android:textAppearance="@style/TextViewBody2" />
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

28
app/src/main/res/layout/item_list.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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:layout_width="match_parent"
@ -7,15 +7,10 @@
android:clickable="true"
android:focusable="true"
android:foreground="?rectSelector"
android:minHeight="64dp"
tools:ignore="MissingPrefix">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:orientation="horizontal">
android:minHeight="64dp"
android:orientation="horizontal"
tools:ignore="MissingPrefix">
<code.name.monkey.retromusic.views.IconImageView
android:id="@+id/drag_view"
@ -76,24 +71,26 @@
android:paddingStart="16dp"
android:paddingEnd="16dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextViewHeadline6"
android:textSize="16sp" />
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="?colorOnPrimary"
tools:text="Song name" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
<com.google.android.material.textview.MaterialTextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextViewNormal"
app:lineHeightHint="18sp" />
android:textAppearance="@style/TextViewBody2"
android:textColor="?colorOnBackground"
tools:text="Song artist name " />
</LinearLayout>
<code.name.monkey.retromusic.views.IconImageView
@ -103,4 +100,3 @@
android:layout_weight="0" />
</LinearLayout>
</FrameLayout>

9
app/src/main/res/values/attrs.xml
View file

@ -66,4 +66,13 @@
<attr name="playIcon" format="reference" />
</declare-styleable>
<attr name="lineHeightHint" format="dimension" />
<declare-styleable name="BaselineGridTextView">
<attr name="lineHeightMultiplierHint" format="float" />
<attr name="lineHeightHint" />
<attr name="maxLinesByHeight" format="boolean" />
<attr name="android:textAppearance" />
<attr name="android:fontFamily" />
</declare-styleable>
</resources>

5
app/src/main/res/values/styles.xml
View file

@ -37,9 +37,10 @@
</style>
<style name="ToolbarTextAppearanceSearch">
<style name="ToolbarTextAppearanceSearch" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">@font/circular_std_book</item>
<item name="android:textColor">?colorOnSurface</item>
</style>
<style name="ToolbarTextAppearanceNormal">
@ -66,7 +67,7 @@
</style>
<style name="SubTitleTextAppearance">
<item name="android:textAppearance">@style/TextViewSubtitle1</item>
<item name="android:textAppearance">@style/TextViewOverline</item>
<item name="android:layout_gravity">start|center_vertical</item>
<item name="android:padding">12dp</item>
<item name="android:layout_width">wrap_content</item>

60
app/src/main/res/values/styles_parents.xml
View file

@ -28,8 +28,6 @@
<!-- just in case-->
<item name="android:windowBackground">@color/dark_color</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorPrimary">@color/dark_color</item>
<!-- necessary to find the overflow button later in the layout-->
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@ -43,11 +41,27 @@
<item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
<item name="android:fontFamily">@font/circular</item>
<item name="android:textColorPrimary">@color/md_white_1000</item>
<item name="windowActionBar">false</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<item name="colorPrimary">@color/dark_color</item>
<item name="colorPrimaryVariant">@color/black_color</item>
<item name="colorOnPrimary">@color/mi_text_color_primary_dark</item>
<item name="colorAccent">@color/md_deep_purple_A200</item>
<item name="colorSecondary">@color/md_green_500</item>
<item name="colorOnSecondary">@color/mi_text_color_secondary_light</item>
<item name="colorSecondaryVariant">@color/md_green_A700</item>
<item name="android:colorBackground">@color/md_white_1000</item>
<item name="colorSurface">@color/dark_color</item>
<item name="colorOnSurface">@color/mi_text_color_primary_dark</item>
<item name="colorOnBackground">@color/mi_text_color_secondary_dark</item>
<item name="colorControlNormal">@color/mi_text_color_secondary_light</item>
</style>
<style name="Theme.RetroMusic.Base.Black" parent="@style/Theme.RetroMusic.Base">
@ -58,8 +72,6 @@
<item name="md_background_color">@color/black_color</item>
<item name="android:windowBackground">@color/black_color</item>
<item name="colorPrimary">@color/black_color</item>
<item name="android:colorPrimary">@color/black_color</item>
<item name="android:windowActivityTransitions">true</item>
<item name="android:windowExitTransition">@transition/grid_exit</item>
@ -71,6 +83,21 @@
<item name="windowActionBar">false</item>
<item name="colorPrimary">@color/black_color</item>
<item name="colorPrimaryVariant">@color/black_color</item>
<item name="colorOnPrimary">@color/mi_text_color_primary_dark</item>
<item name="colorAccent">@color/md_deep_purple_A200</item>
<item name="colorSecondary">@color/md_green_500</item>
<item name="colorOnSecondary">@color/mi_text_color_secondary_light</item>
<item name="colorSecondaryVariant">@color/md_green_A700</item>
<item name="android:colorBackground">@color/md_white_1000</item>
<item name="colorSurface">@android:color/black</item>
<item name="colorOnSurface">@color/mi_text_color_primary_dark</item>
<item name="colorOnBackground">@color/mi_text_color_secondary_dark</item>
<item name="colorControlNormal">@color/mi_text_color_secondary_light</item>
</style>
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
@ -83,7 +110,6 @@
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
<item name="roundSelector">@drawable/round_selector</item>
<item name="rectSelector">@drawable/rect_selector</item>
<item name="rectSelectorStrong">@drawable/rect_selector_strong</item>
@ -99,8 +125,6 @@
<!-- just in case-->
<item name="android:windowBackground">@color/md_white_1000</item>
<item name="colorAccent">@android:color/black</item>
<item name="colorPrimary">@color/md_white_1000</item>
<!-- necessary to find the overflow button later in the layout-->
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@ -115,11 +139,25 @@
<item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
<item name="android:fontFamily">@font/circular</item>
<item name="android:textColorPrimary">@color/md_grey_900</item>
<item name="windowActionBar">false</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<!--<item name="android:textColorPrimary">@color/md_grey_900</item>-->
<item name="colorPrimary">@color/md_white_1000</item>
<item name="colorOnPrimary">@color/mi_text_color_primary_light</item>
<item name="colorPrimaryVariant">@color/md_red_400</item>
<item name="colorSecondary">@color/md_green_500</item>
<item name="colorAccent">@color/md_deep_purple_A200</item>
<item name="colorOnSecondary">@color/mi_text_color_secondary_light</item>
<item name="colorSecondaryVariant">@color/md_green_A700</item>
<item name="android:colorBackground">@color/md_white_1000</item>
<item name="colorSurface">@color/md_white_1000</item>
<item name="colorOnSurface">@color/mi_text_color_secondary_light</item>
<item name="colorOnBackground">@color/mi_text_color_secondary_light</item>
<item name="colorControlNormal">@color/mi_text_color_secondary_light</item>
</style>

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt
View file

@ -23,7 +23,7 @@ class ATESecondaryTextView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : BaselineGridTextView(context, attrs, defStyleAttr) {
) : MaterialTextView(context, attrs, defStyleAttr) {
init {
setTextColor(ThemeStore.textColorSecondary(context))

3
appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
View file

@ -1,7 +1,6 @@
package code.name.monkey.appthemehelper.util
import android.content.Context
import android.content.res.TypedArray
import androidx.annotation.AttrRes
/**
@ -10,7 +9,7 @@ import androidx.annotation.AttrRes
object ATHUtil {
fun isWindowBackgroundDark(context: Context): Boolean {
return !ColorUtil.isColorLight(ATHUtil.resolveColor(context, android.R.attr.windowBackground))
return !ColorUtil.isColorLight(resolveColor(context, android.R.attr.windowBackground))
}
@JvmOverloads

8
appthemehelper/src/main/res/values/attrs.xml
View file

@ -36,14 +36,6 @@
<attr name="ateKey_prefCategory_textColor" format="string" />
</declare-styleable>
<attr name="lineHeightHint" format="dimension" />
<declare-styleable name="BaselineGridTextView">
<attr name="lineHeightMultiplierHint" format="float" />
<attr name="lineHeightHint" />
<attr name="maxLinesByHeight" format="boolean" />
<attr name="android:textAppearance" />
<attr name="android:fontFamily" />
</declare-styleable>
</resources>

2
build.gradle
View file

@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.0-alpha11'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:bundletool:0.9.0'
}