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

Fix search keyboard not poping, removed divider, removed card in about etc

Browse source
This commit is contained in:
h4h13 2019-02-24 01:40:15 +05:30
parent b9412c6ef6
commit c179d8772d
32 changed files with 658 additions and 709 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -32,7 +32,7 @@ android {
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic" applicationId "code.name.monkey.retromusic"
versionCode 291 versionCode 292
versionName '3.1.100' versionName '3.1.100'
multiDexEnabled true multiDexEnabled true

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

@ -1 +1 @@
<html> <head> <style type="text/css"> * { word-wrap: break-word; } {style-placeholder} a { color: #{link-color}; } a:active { color: #{link-color-active}; } ul { list-style-position: outside; padding-left: 0; padding-right: 0; margin-left: 1em; } li { padding-top: 8px; } </style> </head> <body> <h4>v3.1.100</h4> <ul> <li>Fix Crash in Album tag editor while selecting options</li> <li>Added Classic theme</li> <li>Added Filter song length</li> <li>Added Favourites playlist icon will be accent color</li> <li>Added Colorful settings icons</li> <li>Added Corners for dialog</li> </ul> <h4>v3.0.570</h4> <ul> <li>Fix Album/Artist square image</li> <li>Fix Delete dialog text format</li> <li>Fix Profile picture not showing after coming back from folders</li> <li>Fix Play button color i Simple and Plain themes</li> <li>Fix Sleep timer dialog crashing</li> <li>Fix Share song dialog title and text</li> </ul> <p>If you see entire app white or dark or black select same theme in settings to fix </p> <p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a> </p> <p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again. </p> </body> <html> <head> <style type="text/css"> * { word-wrap: break-word; } {style-placeholder} a { color: #{link-color}; } a:active { color: #{link-color-active}; } ul { list-style-position: outside; padding-left: 0; padding-right: 0; margin-left: 1em; } li { padding-top: 8px; } </style> </head> <body> <h3 style="text-align:center;"> Subscribe to <a href="https://www.youtube.com/user/PewDiePie/">PewDiePie</a> 👊 </h3> <h4>v3.1.100</h4> <ul> <li>Fix Crash in Album tag editor while selecting options</li> <li>Added Classic theme</li> <li>Added Filter song length</li> <li>Added Favourites playlist icon will be accent color</li> <li>Added Colorful settings icons</li> <li>Added Corners for dialog</li> </ul> <h4>v3.0.570</h4> <ul> <li>Fix Album/Artist square image</li> <li>Fix Delete dialog text format</li> <li>Fix Profile picture not showing after coming back from folders</li> <li>Fix Play button color i Simple and Plain themes</li> <li>Fix Sleep timer dialog crashing</li> <li>Fix Share song dialog title and text</li> </ul> <p>If you see entire app white or dark or black select same theme in settings to fix </p> <p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a> </p> <p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again. </p> </body>

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

@ -38,9 +38,8 @@ class ArtistImageFetcher(private val context: Context, private val lastFMRestCli
return InputStream::class.java return InputStream::class.java
} }
override fun getDataSource(): DataSource { override fun getDataSource(): DataSource {
return DataSource.REMOTE return DataSource.MEMORY_CACHE
} }
override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) { override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {

8
app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
View file

@ -41,8 +41,7 @@ class AlbumCoverStylePreference : DialogPreference {
class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener { class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener {
override fun onDialogClosed(positiveResult: Boolean) { override fun onDialogClosed(positiveResult: Boolean) {
val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition]
PreferenceUtil.getInstance().albumCoverStyle = nowPlayingScreen
} }
private var viewPagerPosition: Int = 0 private var viewPagerPosition: Int = 0
@ -57,7 +56,10 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPa
return MaterialDialog(activity!!).show { return MaterialDialog(activity!!).show {
title(R.string.pref_title_album_cover_style) title(R.string.pref_title_album_cover_style)
positiveButton(android.R.string.ok) positiveButton(R.string.set) {
val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition]
PreferenceUtil.getInstance().albumCoverStyle = nowPlayingScreen
}
negativeButton(android.R.string.cancel) negativeButton(android.R.string.cancel)
customView(view = view, scrollable = false, noVerticalPadding = false) customView(view = view, scrollable = false, noVerticalPadding = false)
} }

2
app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt
View file

@ -52,7 +52,7 @@ class MaterialListPreferenceDialog : PreferenceDialogFragmentCompat() {
return MaterialDialog(activity!!).show { return MaterialDialog(activity!!).show {
title(text = materialListPreference.title.toString()) title(text = materialListPreference.title.toString())
positiveButton(R.string.set) positiveButton(R.string.set)
listItemsSingleChoice(items = entries, initialSelection = position) { dialog, index, text -> listItemsSingleChoice(items = entries, initialSelection = position) { _, index, _ ->
materialListPreference.callChangeListener(entriesValues!![index]) materialListPreference.callChangeListener(entriesValues!![index])
materialListPreference.setCustomValue(entriesValues[index]) materialListPreference.setCustomValue(entriesValues[index])
materialListPreference.summary = entries!![index] materialListPreference.summary = entries!![index]

20
app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
View file

@ -56,14 +56,7 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP
} }
override fun onDialogClosed(positiveResult: Boolean) { override fun onDialogClosed(positiveResult: Boolean) {
val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition]
if (isNowPlayingThemes(nowPlayingScreen)) {
val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(activity!!)
} else {
PreferenceUtil.getInstance().nowPlayingScreen = nowPlayingScreen
}
} }
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@ -78,7 +71,16 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP
return MaterialDialog(activity!!).show { return MaterialDialog(activity!!).show {
title(R.string.pref_title_album_cover_style) title(R.string.pref_title_album_cover_style)
positiveButton(android.R.string.ok) positiveButton(R.string.set) {
val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition]
if (isNowPlayingThemes(nowPlayingScreen)) {
val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(activity!!)
} else {
PreferenceUtil.getInstance().nowPlayingScreen = nowPlayingScreen
}
}
negativeButton(android.R.string.cancel) negativeButton(android.R.string.cancel)
customView(view = view, scrollable = false, noVerticalPadding = false) customView(view = view, scrollable = false, noVerticalPadding = false)
} }

22
app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt
View file

@ -29,7 +29,7 @@ import java.util.*
class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchContract.SearchView, TextWatcher { class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchContract.SearchView, TextWatcher {
private var searchPresenter: SearchPresenter? = null private lateinit var searchPresenter: SearchPresenter
private var searchAdapter: SearchAdapter? = null private var searchAdapter: SearchAdapter? = null
private var query: String? = null private var query: String? = null
@ -49,11 +49,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
setUpToolBar() setUpToolBar()
setupSearchView() setupSearchView()
if (savedInstanceState != null) {
query = savedInstanceState.getString(QUERY)
searchPresenter!!.search(query!!)
}
if (intent.getBooleanExtra("mic_search", false)) { if (intent.getBooleanExtra("mic_search", false)) {
startMicSearch() startMicSearch()
} }
@ -76,7 +71,6 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
layoutManager = LinearLayoutManager(this@SearchActivity) layoutManager = LinearLayoutManager(this@SearchActivity)
adapter = searchAdapter adapter = searchAdapter
} }
} }
private fun setupSearchView() { private fun setupSearchView() {
@ -86,13 +80,13 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
searchPresenter!!.subscribe() searchPresenter.subscribe()
searchPresenter!!.search(query) searchPresenter.search(query)
} }
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
searchPresenter!!.unsubscribe() searchPresenter.unsubscribe()
} }
override fun onSaveInstanceState(outState: Bundle) { override fun onSaveInstanceState(outState: Bundle) {
@ -102,7 +96,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
override fun onRestoreInstanceState(savedInstanceState: Bundle) { override fun onRestoreInstanceState(savedInstanceState: Bundle) {
super.onRestoreInstanceState(savedInstanceState) super.onRestoreInstanceState(savedInstanceState)
searchPresenter!!.search(savedInstanceState.getString(QUERY, "")) searchPresenter.search(savedInstanceState.getString(QUERY, ""))
} }
private fun setUpToolBar() { private fun setUpToolBar() {
@ -113,12 +107,12 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
private fun search(query: String) { private fun search(query: String) {
this.query = query.trim { it <= ' ' } this.query = query.trim { it <= ' ' }
voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE
searchPresenter!!.search(query) searchPresenter.search(query)
} }
override fun onMediaStoreChanged() { override fun onMediaStoreChanged() {
super.onMediaStoreChanged() super.onMediaStoreChanged()
searchPresenter!!.search(query!!) searchPresenter.search(query!!)
} }
override fun onQueryTextSubmit(query: String): Boolean { override fun onQueryTextSubmit(query: String): Boolean {
@ -164,7 +158,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon
.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS) .getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
query = result[0] query = result[0]
searchView.setText(query, BufferType.EDITABLE) searchView.setText(query, BufferType.EDITABLE)
searchPresenter!!.search(query!!) searchPresenter.search(query!!)
} }
} }
} }

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

@ -65,7 +65,7 @@ public class WhatsNewActivity extends AbsBaseActivity {
setTitle(null); setTitle(null);
toolbar.setNavigationOnClickListener(v -> onBackPressed()); toolbar.setNavigationOnClickListener(v -> onBackPressed());
title.setTextColor(ThemeStore.Companion.textColorPrimary(this)); title.setTextColor(ThemeStore.Companion.textColorPrimary(this));
ToolbarContentTintHelper.colorBackButton(toolbar,ThemeStore.Companion.textColorSecondary(this));
try { try {
// Load from phonograph-changelog.html in the assets folder // Load from phonograph-changelog.html in the assets folder

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/GenreAdapter.kt
View file

@ -42,7 +42,7 @@ class GenreAdapter(private val mActivity: Activity, dataSet: ArrayList<Genre>, p
} }
if (holder.separator != null) { if (holder.separator != null) {
holder.separator!!.visibility = View.VISIBLE holder.separator!!.visibility = View.GONE
} }
} }

6
app/src/main/java/code/name/monkey/retromusic/ui/adapter/SearchAdapter.kt
View file

@ -115,10 +115,8 @@ class SearchAdapter(private val activity: AppCompatActivity, private var dataSet
override fun onClick(v: View?) { override fun onClick(v: View?) {
val item = dataSet!![adapterPosition] val item = dataSet!![adapterPosition]
when (itemViewType) { when (itemViewType) {
ALBUM -> NavigationUtil.goToAlbum(activity, ALBUM -> NavigationUtil.goToAlbum(activity, (item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art)))
(item as Album).id, Pair.create(image, activity.resources.getString(R.string.transition_album_art))) ARTIST -> NavigationUtil.goToArtist(activity, (item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image)))
ARTIST -> NavigationUtil.goToArtist(activity,
(item as Artist).id, Pair.create(image, activity.resources.getString(R.string.transition_artist_image)))
SONG -> { SONG -> {
val playList = ArrayList<Song>() val playList = ArrayList<Song>()
playList.add(item as Song) playList.add(item as Song)

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/album/AlbumAdapter.kt
View file

@ -91,7 +91,7 @@ open class AlbumAdapter(protected val activity: AppCompatActivity,
} }
} else { } else {
if (holder.shortSeparator != null) { if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.VISIBLE holder.shortSeparator!!.visibility = View.GONE
} }
} }

4
app/src/main/java/code/name/monkey/retromusic/ui/adapter/artist/ArtistAdapter.kt
View file

@ -52,7 +52,7 @@ class ArtistAdapter(val activity: AppCompatActivity,
return createViewHolder(view) return createViewHolder(view)
} }
protected fun createViewHolder(view: View): ViewHolder { private fun createViewHolder(view: View): ViewHolder {
return ViewHolder(view) return ViewHolder(view)
} }
@ -69,7 +69,7 @@ class ArtistAdapter(val activity: AppCompatActivity,
holder.text!!.visibility = View.GONE holder.text!!.visibility = View.GONE
} }
if (holder.shortSeparator != null) { if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.VISIBLE holder.shortSeparator!!.visibility = View.GONE
} }
loadArtistImage(artist, holder) loadArtistImage(artist, holder)
} }

42
app/src/main/java/code/name/monkey/retromusic/ui/adapter/base/MediaEntryViewHolder.kt
View file

@ -1,5 +1,6 @@
package code.name.monkey.retromusic.ui.adapter.base package code.name.monkey.retromusic.ui.adapter.base
import android.graphics.Color
import android.os.Build import android.os.Build
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -10,8 +11,9 @@ import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.R import code.name.monkey.retromusic.R
import com.google.android.material.card.MaterialCardView
open class MediaEntryViewHolder(w: View) : RecyclerView.ViewHolder(w), View.OnClickListener, View.OnLongClickListener { open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), View.OnClickListener, View.OnLongClickListener {
override fun onLongClick(v: View?): Boolean { override fun onLongClick(v: View?): Boolean {
return false return false
} }
@ -38,31 +40,33 @@ open class MediaEntryViewHolder(w: View) : RecyclerView.ViewHolder(w), View.OnCl
var imageTextContainer: CardView? = null var imageTextContainer: CardView? = null
init { init {
title = w.findViewById(R.id.title)
text = w.findViewById(R.id.text)
image = w.findViewById(R.id.image)
imageContainer = w.findViewById(R.id.image_container)
imageTextContainer = w.findViewById(R.id.image_text_container)
imageContainerCard = w.findViewById(R.id.image_container_card)
imageText = w.findViewById(R.id.image_text) title = view.findViewById(R.id.title)
text = view.findViewById(R.id.text)
menu = w.findViewById(R.id.menu) image = view.findViewById(R.id.image)
dragView = w.findViewById(R.id.drag_view) imageContainer = view.findViewById(R.id.image_container)
imageTextContainer = view.findViewById(R.id.image_text_container)
imageContainerCard = view.findViewById(R.id.image_container_card)
separator = w.findViewById(R.id.separator) imageText = view.findViewById(R.id.image_text)
shortSeparator = w.findViewById(R.id.short_separator)
paletteColorContainer = w.findViewById(R.id.palette_color_container)
time = w.findViewById(R.id.time); menu = view.findViewById(R.id.menu)
recyclerView = w.findViewById(R.id.recycler_view) dragView = view.findViewById(R.id.drag_view)
mask = w.findViewById(R.id.mask) separator = view.findViewById(R.id.separator)
playSongs = w.findViewById(R.id.playSongs) shortSeparator = view.findViewById(R.id.short_separator)
paletteColorContainer = view.findViewById(R.id.palette_color_container)
w.setOnClickListener(this) time = view.findViewById(R.id.time);
w.setOnLongClickListener(this) recyclerView = view.findViewById(R.id.recycler_view)
mask = view.findViewById(R.id.mask)
playSongs = view.findViewById(R.id.playSongs)
view.setOnClickListener(this@MediaEntryViewHolder)
view.setOnLongClickListener(this)
if (imageTextContainer != null) { if (imageTextContainer != null) {
imageTextContainer!!.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context)) imageTextContainer!!.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context))

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/playlist/PlaylistAdapter.kt
View file

@ -92,7 +92,7 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL
} }
} else { } else {
if (holder.shortSeparator != null && dataSet[position] !is AbsSmartPlaylist) { if (holder.shortSeparator != null && dataSet[position] !is AbsSmartPlaylist) {
holder.shortSeparator!!.visibility = View.VISIBLE holder.shortSeparator!!.visibility = View.GONE
} }
} }
} }

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/PlaylistSongAdapter.kt
View file

@ -49,7 +49,7 @@ open class PlaylistSongAdapter(activity: AppCompatActivity, dataSet: ArrayList<S
holder.dragView!!.visibility = View.GONE holder.dragView!!.visibility = View.GONE
} }
if (holder.separator != null) { if (holder.separator != null) {
holder.separator!!.visibility = View.VISIBLE holder.separator!!.visibility = View.GONE
} }
if (holder.shortSeparator != null) { if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.GONE holder.shortSeparator!!.visibility = View.GONE

2
app/src/main/java/code/name/monkey/retromusic/ui/adapter/song/ShuffleButtonSongAdapter.kt
View file

@ -41,7 +41,7 @@ class ShuffleButtonSongAdapter(activity: AppCompatActivity,
holder.image!!.setImageResource(R.drawable.ic_shuffle_white_24dp) holder.image!!.setImageResource(R.drawable.ic_shuffle_white_24dp)
} }
if (holder.separator != null) { if (holder.separator != null) {
holder.separator!!.visibility = View.VISIBLE holder.separator!!.visibility = View.GONE
} }
if (holder.shortSeparator != null) { if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.GONE holder.shortSeparator!!.visibility = View.GONE

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

@ -84,7 +84,7 @@ open class SongAdapter @JvmOverloads constructor(protected val activity: AppComp
} }
} else { } else {
if (holder.shortSeparator != null) { if (holder.shortSeparator != null) {
holder.shortSeparator!!.visibility = View.VISIBLE holder.shortSeparator!!.visibility = View.GONE
} }
} }

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

@ -30,11 +30,6 @@
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.CollapsingToolbarLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<LinearLayout <LinearLayout

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

@ -25,11 +25,6 @@
android:text="@string/action_about" /> android:text="@string/action_about" />
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView

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

@ -46,10 +46,6 @@
android:text="@string/up_next" android:text="@string/up_next"
android:textAppearance="@style/TextAppearance.AppCompat.Body2" /> android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

5
app/src/main/res/layout/activity_playlist_detail.xml
View file

@ -55,11 +55,6 @@
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
</FrameLayout> </FrameLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.CollapsingToolbarLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

5
app/src/main/res/layout/activity_pro_version.xml
View file

@ -48,11 +48,6 @@
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.CollapsingToolbarLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

8
app/src/main/res/layout/activity_search.xml
View file

@ -36,8 +36,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
app:cardCornerRadius="25dp" app:cardCornerRadius="25dp"
app:cardElevation="0dp" app:cardElevation="0dp">
app:cardUseCompatPadding="true">
<code.name.monkey.appthemehelper.common.views.ATEEditText <code.name.monkey.appthemehelper.common.views.ATEEditText
android:id="@+id/searchView" android:id="@+id/searchView"
@ -46,7 +45,10 @@
android:background="@null" android:background="@null"
android:hint="@string/action_search" android:hint="@string/action_search"
android:inputType="text|textAutoComplete" android:inputType="text|textAutoComplete"
android:padding="12dp" /> android:padding="12dp">
<requestFocus />
</code.name.monkey.appthemehelper.common.views.ATEEditText>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>

5
app/src/main/res/layout/activity_settings.xml
View file

@ -31,11 +31,6 @@
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout> </com.google.android.material.appbar.CollapsingToolbarLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?dividerColor" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
@ -9,22 +8,12 @@
style="@style/SubTitleTextAppearance" style="@style/SubTitleTextAppearance"
android:text="@string/credit_title" /> android:text="@string/credit_title" />
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="8dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</com.google.android.material.card.MaterialCardView>
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/madeText" android:id="@+id/madeText"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -10,13 +9,6 @@
style="@style/SubTitleTextAppearance" style="@style/SubTitleTextAppearance"
android:text="@string/others" /> android:text="@string/others" />
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="8dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -41,18 +33,17 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/changelog" android:text="@string/changelog" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
android:text="@string/changelog_summary" android:text="@string/changelog_summary" />
android:textColor="@color/md_white_1000" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -71,18 +62,17 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pref_title_open_source_licences" android:text="@string/pref_title_open_source_licences" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
android:text="@string/pref_summary_open_source_licences" android:text="@string/pref_summary_open_source_licences" />
android:textColor="@color/md_white_1000" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -100,21 +90,18 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/version" android:text="@string/version" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/appVersion" android:id="@+id/appVersion"
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
android:text="0.0.0" android:text="0.0.0" />
android:textColor="@color/md_white_1000" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>

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

@ -10,13 +10,6 @@
style="@style/SubTitleTextAppearance" style="@style/SubTitleTextAppearance"
android:text="@string/support_development" /> android:text="@string/support_development" />
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="8dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -53,12 +46,14 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/git_hub" android:fontFamily="@font/circular"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> android:text="@string/git_hub" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
@ -96,12 +91,13 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/translate" android:text="@string/translate" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
@ -139,12 +135,13 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/rate_app" android:text="@string/rate_app" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
@ -182,12 +179,13 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/donate" android:text="@string/donate" />
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
style="@style/TextAppearance.MaterialComponents.Body2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
@ -227,10 +225,10 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_share" android:text="@string/action_share"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" /> android:textColor="@color/md_white_1000" />
</LinearLayout> </LinearLayout>
@ -267,14 +265,14 @@
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/faq" android:text="@string/faq"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textColor="@color/md_white_1000" /> android:textColor="@color/md_white_1000" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>

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

@ -10,13 +10,6 @@
style="@style/SubTitleTextAppearance" style="@style/SubTitleTextAppearance"
android:text="@string/social" /> android:text="@string/social" />
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="8dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -55,12 +48,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pinterest_page" android:text="@string/pinterest_page"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> style="@style/TextAppearance.MaterialComponents.Subtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
style="@style/TextAppearance.MaterialComponents.Body2"
android:text="@string/pinterest_page_summary" /> android:text="@string/pinterest_page_summary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -97,12 +91,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/instagram_page" android:text="@string/instagram_page"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> style="@style/TextAppearance.MaterialComponents.Subtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
style="@style/TextAppearance.MaterialComponents.Body2"
android:text="@string/instagram_page_summary" /> android:text="@string/instagram_page_summary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -138,12 +133,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/twitter_page" android:text="@string/twitter_page"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> style="@style/TextAppearance.MaterialComponents.Subtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.85" android:alpha="0.85"
style="@style/TextAppearance.MaterialComponents.Body2"
android:text="@string/twitter_page_summary" /> android:text="@string/twitter_page_summary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@ -179,11 +175,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/discord_page" android:text="@string/discord_page"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> style="@style/TextAppearance.MaterialComponents.Subtitle1"/>
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextAppearance.MaterialComponents.Body2"
android:alpha="0.85" android:alpha="0.85"
android:text="@string/discord_summary" /> android:text="@string/discord_summary" />
</LinearLayout> </LinearLayout>
@ -220,11 +217,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/telegram_group" android:text="@string/telegram_group"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> style="@style/TextAppearance.MaterialComponents.Subtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextAppearance.MaterialComponents.Body2"
android:alpha="0.85" android:alpha="0.85"
android:text="@string/telegram_group_summary" /> android:text="@string/telegram_group_summary" />
</LinearLayout> </LinearLayout>
@ -263,15 +261,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/google_plus" android:text="@string/google_plus"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> style="@style/TextAppearance.MaterialComponents.Subtitle1" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextAppearance.MaterialComponents.Body2"
android:alpha="0.85" android:alpha="0.85"
android:text="@string/google_plus_community" /> android:text="@string/google_plus_community" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>

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

@ -48,8 +48,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingTop="12dp" android:paddingTop="14dp"
android:paddingBottom="12dp" android:paddingBottom="14dp"
android:text="@string/create_action" android:text="@string/create_action"
app:backgroundTint="@color/md_pink_A400" /> app:backgroundTint="@color/md_pink_A400" />
@ -59,11 +59,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingTop="12dp" android:paddingTop="14dp"
android:paddingBottom="12dp" android:paddingBottom="14dp"
android:text="@android:string/cancel" android:text="@android:string/cancel"
app:strokeWidth="2dp" /> app:strokeWidth="2dp" />

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

@ -7,12 +7,14 @@
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?rectSelector" android:foreground="?rectSelector"
android:minHeight="72dp" android:minHeight="64dp"
tools:ignore="MissingPrefix"> tools:ignore="MissingPrefix">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<code.name.monkey.retromusic.views.IconImageView <code.name.monkey.retromusic.views.IconImageView
@ -50,12 +52,12 @@
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/image_text" android:id="@+id/image_text"
style="@style/TextAppearance.MaterialComponents.Subtitle2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:minHeight="40dp" android:minHeight="40dp"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:visibility="gone" android:visibility="gone"
tools:text="1" tools:text="1"
tools:visibility="visible" /> tools:visibility="visible" />
@ -65,11 +67,10 @@
<LinearLayout <LinearLayout
android:id="@+id/title_container" android:id="@+id/title_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_weight="1.0" android:layout_weight="1.0"
android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingEnd="16dp">
@ -78,7 +79,6 @@
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"

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

@ -2,8 +2,8 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:id="@+id/mainContent" android:id="@+id/mainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto" <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
@ -56,4 +56,5 @@
app:itemTextColor="@drawable/bottom_navigation_item_colors" app:itemTextColor="@drawable/bottom_navigation_item_colors"
app:labelVisibilityMode="labeled" app:labelVisibilityMode="labeled"
app:menu="@menu/bottom_navigation_main" /> app:menu="@menu/bottom_navigation_main" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -14,7 +14,6 @@
<style name="OverFlowButton"> <style name="OverFlowButton">
<item name="srcCompat">@drawable/ic_more_vert_white_24dp</item> <item name="srcCompat">@drawable/ic_more_vert_white_24dp</item>
<item name="android:layout_margin">8dp</item>
<item name="android:layout_width">48dp</item> <item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item> <item name="android:layout_height">48dp</item>
<item name="android:scaleType">center</item> <item name="android:scaleType">center</item>
@ -33,7 +32,7 @@
<item name="popupTheme">?toolbarPopupTheme</item> <item name="popupTheme">?toolbarPopupTheme</item>
<item name="android:transitionName" tools:ignore="NewApi">toolbar</item> <item name="android:transitionName" tools:ignore="NewApi">toolbar</item>
<item name="android:titleTextAppearance">@style/ToolbarTextAppearance</item> <item name="android:titleTextAppearance">@style/ToolbarTextAppearance</item>
<item name="android:subtitleTextAppearance">@style/ToolbarTextAppearance</item> <item name="android:subtitleTextAppearance">@style/ToolbarSubTitleTextAppearance</item>
<item name="layout_collapseMode">pin</item> <item name="layout_collapseMode">pin</item>
<item name="contentInsetStartWithNavigation">0dp</item> <item name="contentInsetStartWithNavigation">0dp</item>
<item name="contentInsetStart">0dp</item> <item name="contentInsetStart">0dp</item>
@ -46,6 +45,10 @@
<item name="android:fontFamily">@font/circular</item> <item name="android:fontFamily">@font/circular</item>
</style> </style>
<style name="ToolbarSubTitleTextAppearance">
<item name="android:fontFamily">@font/circular</item>
</style>
<style name="BigTitleTextAppearance"> <style name="BigTitleTextAppearance">
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6 <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
</item> </item>
@ -67,7 +70,8 @@
</style> </style>
<style name="SubTitleTextAppearance"> <style name="SubTitleTextAppearance">
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1</item> <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
</item>
<item name="android:layout_gravity">start|center_vertical</item> <item name="android:layout_gravity">start|center_vertical</item>
<item name="android:padding">12dp</item> <item name="android:padding">12dp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>