diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 572714937..7d94643a9 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt index 7a1ca9340..6fc1f8f7b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt @@ -79,7 +79,7 @@ class OptionsSheetDialogFragment : RoundedBottomSheetDialogFragment(), View.OnCl loadImageFromStorage() actionSettings.setOnClickListener(this) - actionAbout.setOnClickListener(this) + actionSleepTimer.setOnClickListener(this) userInfoContainer.setOnClickListener(this) actionEqualizer.setOnClickListener(this) @@ -102,7 +102,7 @@ class OptionsSheetDialogFragment : RoundedBottomSheetDialogFragment(), View.OnCl when (view.id) { R.id.actionFolders -> mainActivity.setCurrentFragment(FoldersFragment.newInstance(context), true) R.id.actionSettings -> NavigationUtil.goToSettings(mainActivity) - R.id.actionAbout -> NavigationUtil.goToAbout(mainActivity) + R.id.actionSleepTimer -> if (fragmentManager != null) { SleepTimerDialog().show(fragmentManager!!, TAG) } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt index aba4d2dff..d26cb4e73 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/AboutActivity.kt @@ -73,6 +73,7 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener { appVersion.text = getAppVersion() setUpView() + } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt index 6861748c9..15c68b4a2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/SearchActivity.kt @@ -2,6 +2,7 @@ package code.name.monkey.retromusic.ui.activities import android.app.Activity import android.app.SearchManager +import android.app.Service import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent @@ -11,6 +12,7 @@ import android.speech.RecognizerIntent import android.text.Editable import android.text.TextWatcher import android.view.View +import android.view.inputmethod.InputMethodManager import android.widget.TextView.BufferType import android.widget.Toast import androidx.appcompat.widget.SearchView.OnQueryTextListener @@ -18,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ColorUtil +import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.mvp.contract.SearchContract import code.name.monkey.retromusic.mvp.presenter.SearchPresenter @@ -57,6 +60,16 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon searchContainer.setCardBackgroundColor(ColorStateList.valueOf(ColorUtil.darkenColor(ThemeStore.primaryColor(this)))) + keyboardPopup.setOnClickListener { + val inputManager = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager + inputManager.showSoftInput(searchView,0) + } + + keyboardPopup.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this)) + ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))).apply { + keyboardPopup.setTextColor(this) + keyboardPopup.iconTint = this + } } private fun setupRecyclerView() { @@ -71,6 +84,16 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon layoutManager = LinearLayoutManager(this@SearchActivity) adapter = searchAdapter } + recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + super.onScrolled(recyclerView, dx, dy) + if (dy > 0) { + keyboardPopup.shrink(true) + } else if (dy < 0) { + keyboardPopup.extend(true) + } + } + }) } private fun setupSearchView() { @@ -101,6 +124,7 @@ class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, SearchCon private fun setUpToolBar() { title = null + appBarLayout.setBackgroundColor(ThemeStore.primaryColor(this)) } diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt index 359ca05c7..1bfee8409 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/UserInfoActivity.kt @@ -2,6 +2,7 @@ package code.name.monkey.retromusic.ui.activities import android.app.Activity import android.content.* +import android.content.res.ColorStateList import android.graphics.Bitmap import android.net.Uri import android.os.Bundle @@ -13,9 +14,7 @@ import android.view.MenuItem import android.widget.Toast import androidx.core.content.FileProvider import code.name.monkey.appthemehelper.ThemeStore -import code.name.monkey.appthemehelper.util.MaterialUtil -import code.name.monkey.appthemehelper.util.TintHelper -import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper +import code.name.monkey.appthemehelper.util.* import code.name.monkey.retromusic.App import code.name.monkey.retromusic.Constants.USER_BANNER import code.name.monkey.retromusic.Constants.USER_PROFILE @@ -92,7 +91,11 @@ class UserInfoActivity : AbsBaseActivity() { setResult(Activity.RESULT_OK) finish() } - TintHelper.setTintAuto(next, ThemeStore.accentColor(this), true) + next.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this)) + ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))).apply { + next.setTextColor(this) + next.iconTint = this + } } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt index 9f04218ef..12d2709e5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/ui/fragments/settings/MainSettingsFragment.kt @@ -5,7 +5,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView import androidx.annotation.StringRes import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment @@ -34,6 +33,7 @@ class MainSettingsFragment : Fragment(), View.OnClickListener { R.id.imageSettings -> inflateFragment(ImageSettingFragment(), R.string.pref_header_images) R.id.notificationSettings -> inflateFragment(NotificationSettingsFragment(), R.string.notification) R.id.otherSettings -> inflateFragment(OtherSettingsFragment(), R.string.others) + R.id.aboutSettings -> NavigationUtil.goToAbout(activity!!) } } @@ -54,6 +54,36 @@ class MainSettingsFragment : Fragment(), View.OnClickListener { imageSettings.setOnClickListener(this) notificationSettings.setOnClickListener(this) otherSettings.setOnClickListener(this) + aboutSettings.setOnClickListener(this) + + text.setTextColor(ThemeStore.textColorSecondary(context!!)) + text.text = PreferenceUtil.getInstance().userBio + titleWelcome.setTextColor(ThemeStore.textColorPrimary(context!!)) + titleWelcome.text = String.format("%s %s!", getTimeOfTheDay(), PreferenceUtil.getInstance().userName) + loadImageFromStorage() + userInfoContainer.setOnClickListener { NavigationUtil.goToUserInfo(activity!!) } + } + + override fun onDestroyView() { + super.onDestroyView() + disposable.clear() + } + + private val disposable = CompositeDisposable() + private fun loadImageFromStorage() { + + disposable.add(Compressor(context!!) + .setMaxHeight(300) + .setMaxWidth(300) + .setQuality(75) + .setCompressFormat(Bitmap.CompressFormat.WEBP) + .compressToBitmapAsFlowable( + File(PreferenceUtil.getInstance().profileImage, USER_PROFILE)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ userImage.setImageBitmap(it) }, { + userImage.setImageDrawable(ContextCompat.getDrawable(context!!, R.drawable.ic_person_flat)) + })) } private fun inflateFragment(fragment: Fragment, @StringRes title: Int) { diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml new file mode 100644 index 000000000..8016ddf1d --- /dev/null +++ b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_keyboard_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_white_24dp.xml new file mode 100644 index 000000000..40aa721dd --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_white_24dp.xml @@ -0,0 +1,23 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml index f688ccaa3..f8cbc6aa6 100644 --- a/app/src/main/res/drawable/ic_star_white_24dp.xml +++ b/app/src/main/res/drawable/ic_star_white_24dp.xml @@ -1,12 +1,23 @@ - + + - - + android:viewportWidth="24.0" + android:viewportHeight="24.0"> - \ No newline at end of file + android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" /> + diff --git a/app/src/main/res/drawable/ic_testing_white_24dp.xml b/app/src/main/res/drawable/ic_testing_white_24dp.xml new file mode 100644 index 000000000..f5fb6f647 --- /dev/null +++ b/app/src/main/res/drawable/ic_testing_white_24dp.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/font/circular.xml b/app/src/main/res/font/circular.xml index 6f20e75b3..a1f9df1a7 100644 --- a/app/src/main/res/font/circular.xml +++ b/app/src/main/res/font/circular.xml @@ -4,6 +4,11 @@ android:font="@font/circular_std_book" android:fontStyle="normal" android:fontWeight="400" /> + + diff --git a/app/src/main/res/font/circular_std_medium.otf b/app/src/main/res/font/circular_std_medium.otf new file mode 100755 index 000000000..931f4159d Binary files /dev/null and b/app/src/main/res/font/circular_std_medium.otf differ diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml index 2c5219c33..ee3969557 100644 --- a/app/src/main/res/layout-land/activity_album.xml +++ b/app/src/main/res/layout-land/activity_album.xml @@ -83,7 +83,6 @@ android:focusableInTouchMode="true" android:freezesText="true" android:marqueeRepeatLimit="marquee_forever" - android:paddingTop="4dp" android:scrollHorizontally="true" android:singleLine="true" tools:ignore="MissingPrefix" diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml index a96e211f8..7459c3ec1 100644 --- a/app/src/main/res/layout-land/activity_album_tag_editor.xml +++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml @@ -25,7 +25,7 @@ diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml index ba0fb2868..670753ed6 100644 --- a/app/src/main/res/layout-land/activity_settings.xml +++ b/app/src/main/res/layout-land/activity_settings.xml @@ -38,9 +38,9 @@ app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" app:title=""> - diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml index 7e9b8d2c3..a286ec674 100644 --- a/app/src/main/res/layout-xlarge-land/activity_album.xml +++ b/app/src/main/res/layout-xlarge-land/activity_album.xml @@ -109,7 +109,6 @@ android:focusableInTouchMode="true" android:freezesText="true" android:marqueeRepeatLimit="marquee_forever" - android:paddingTop="4dp" android:scrollHorizontally="true" android:singleLine="true" tools:ignore="MissingPrefix" diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml index ded7bf562..28708b86e 100644 --- a/app/src/main/res/layout-xlarge/activity_album.xml +++ b/app/src/main/res/layout-xlarge/activity_album.xml @@ -111,7 +111,6 @@ android:focusableInTouchMode="true" android:freezesText="true" android:marqueeRepeatLimit="marquee_forever" - android:paddingTop="4dp" android:scrollHorizontally="true" android:singleLine="true" tools:ignore="MissingPrefix" diff --git a/app/src/main/res/layout-xlarge/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml index d0068684f..632b51784 100644 --- a/app/src/main/res/layout-xlarge/activity_user_info.xml +++ b/app/src/main/res/layout-xlarge/activity_user_info.xml @@ -19,7 +19,7 @@ @@ -108,7 +108,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - app:boxBackgroundMode="filled" + style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" app:hintEnabled="true"> @@ -129,7 +129,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - app:boxBackgroundMode="filled" + style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" app:hintEnabled="true"> @@ -145,13 +145,15 @@ - + android:text="@string/save" + app:icon="@drawable/ic_save_white_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 66768f0bb..ca1d66c74 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/res/layout/activity_about_content.xml b/app/src/main/res/layout/activity_about_content.xml index 408b8b6ca..66eb255e4 100644 --- a/app/src/main/res/layout/activity_about_content.xml +++ b/app/src/main/res/layout/activity_about_content.xml @@ -5,11 +5,12 @@ android:padding="8dp" android:orientation="vertical"> + + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml index 4699a975f..1be31e493 100755 --- a/app/src/main/res/layout/activity_album.xml +++ b/app/src/main/res/layout/activity_album.xml @@ -99,7 +99,6 @@ android:focusableInTouchMode="true" android:freezesText="true" android:marqueeRepeatLimit="marquee_forever" - android:paddingTop="4dp" android:scrollHorizontally="true" android:singleLine="true" tools:ignore="MissingPrefix" diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml index 3861e18ae..926cdc674 100755 --- a/app/src/main/res/layout/activity_album_tag_editor.xml +++ b/app/src/main/res/layout/activity_album_tag_editor.xml @@ -70,7 +70,7 @@ diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index 949509525..3997161b2 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -25,9 +25,9 @@ app:title="" tools:ignore="UnusedAttribute"> - diff --git a/app/src/main/res/layout/activity_equalizer.xml b/app/src/main/res/layout/activity_equalizer.xml index 07144a151..e3a7fadf2 100644 --- a/app/src/main/res/layout/activity_equalizer.xml +++ b/app/src/main/res/layout/activity_equalizer.xml @@ -35,7 +35,7 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/equalizer" - android:textAppearance="@style/TextAppearance.AppCompat.Large" + style="@style/BigTitleTextAppearanceToolbar" tools:ignore="MissingPrefix" /> + android:layout_marginEnd="16dp" /> diff --git a/app/src/main/res/layout/activity_error_handler.xml b/app/src/main/res/layout/activity_error_handler.xml index c14e029ab..a0296aff7 100644 --- a/app/src/main/res/layout/activity_error_handler.xml +++ b/app/src/main/res/layout/activity_error_handler.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 6fe308d5c..164652943 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -28,9 +28,9 @@ app:title="" tools:ignore="UnusedAttribute"> - diff --git a/app/src/main/res/layout/activity_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml index 4ccb56c93..0f5b8f55c 100755 --- a/app/src/main/res/layout/activity_playing_queue.xml +++ b/app/src/main/res/layout/activity_playing_queue.xml @@ -28,9 +28,9 @@ app:title="" tools:ignore="UnusedAttribute"> - diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml index 83731e30b..e0118f74e 100644 --- a/app/src/main/res/layout/activity_playlist_detail.xml +++ b/app/src/main/res/layout/activity_playlist_detail.xml @@ -48,9 +48,9 @@ app:title="" tools:ignore="UnusedAttribute"> - + style="@style/BigTitleTextAppearanceToolbar" /> diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml index 56d797efa..c2ad23867 100644 --- a/app/src/main/res/layout/activity_pro_version.xml +++ b/app/src/main/res/layout/activity_pro_version.xml @@ -41,9 +41,9 @@ app:layout_collapseMode="pin" tools:ignore="UnusedAttribute"> - diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 9796243a7..93c714db0 100755 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -1,23 +1,19 @@ - - - - - - - - @@ -45,7 +42,7 @@ android:background="@null" android:hint="@string/action_search" android:inputType="text|textAutoComplete" - android:padding="12dp"> + android:padding="14dp"> @@ -61,32 +58,41 @@ android:padding="14dp" app:srcCompat="@drawable/ic_mic_white_24dp" /> + - + + + android:layout_height="wrap_content" + android:gravity="center" + android:paddingTop="48dp" + android:paddingBottom="48dp" + android:text="@string/no_results" + android:textColor="?android:attr/textColorPrimary" + android:textSize="16sp" + android:visibility="gone" + tools:visibility="visible" /> - - - - - - + + + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3e84c2d49..29c9299d4 100755 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -27,9 +27,9 @@ app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" app:title=""> - diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 597f32d8f..27d7cb2c3 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -20,7 +20,7 @@ @@ -142,13 +142,16 @@ - + android:text="@string/save" + app:icon="@drawable/ic_save_white_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml index a263b2dca..55b39a2eb 100644 --- a/app/src/main/res/layout/activity_whats_new.xml +++ b/app/src/main/res/layout/activity_whats_new.xml @@ -20,9 +20,9 @@ app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" app:title=""> - diff --git a/app/src/main/res/layout/card_credit.xml b/app/src/main/res/layout/card_credit.xml index 9113dc9e6..ab7725c21 100644 --- a/app/src/main/res/layout/card_credit.xml +++ b/app/src/main/res/layout/card_credit.xml @@ -22,16 +22,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml index db8a1d19e..f710c6f7e 100644 --- a/app/src/main/res/layout/card_other.xml +++ b/app/src/main/res/layout/card_other.xml @@ -36,6 +36,7 @@ @@ -65,6 +66,7 @@ @@ -93,6 +95,7 @@ @@ -104,5 +107,16 @@ android:alpha="0.85" android:text="0.0.0" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml index 2a4d34a5e..beac2bed6 100644 --- a/app/src/main/res/layout/card_retro_info.xml +++ b/app/src/main/res/layout/card_retro_info.xml @@ -49,6 +49,7 @@ @@ -94,6 +95,7 @@ @@ -138,6 +140,7 @@ @@ -182,6 +185,7 @@ @@ -228,6 +232,7 @@ @@ -268,6 +273,7 @@ diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml index fab0cf9be..9dbc21eaf 100644 --- a/app/src/main/res/layout/card_social.xml +++ b/app/src/main/res/layout/card_social.xml @@ -48,6 +48,7 @@ @@ -92,6 +93,7 @@ style="@style/TextAppearance.MaterialComponents.Subtitle1" android:layout_width="match_parent" android:layout_height="wrap_content" + app:fontFamily="@font/circular_std_medium" android:text="@string/instagram_page" /> @@ -175,6 +178,7 @@ @@ -218,6 +222,7 @@ style="@style/TextAppearance.MaterialComponents.Subtitle1" android:layout_width="match_parent" android:layout_height="wrap_content" + app:fontFamily="@font/circular_std_medium" android:text="@string/telegram_group" /> - - @@ -136,6 +138,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:singleLine="true" + app:fontFamily="@font/circular_std_medium" android:text="@string/now_playing" android:textSize="@dimen/ate_default_textsize_subheading" /> @@ -181,6 +184,7 @@ android:fadingEdge="horizontal" android:singleLine="true" android:text="@string/pref_header_audio" + app:fontFamily="@font/circular_std_medium" android:textSize="@dimen/ate_default_textsize_subheading" /> @@ -252,7 +257,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:padding="10dp" - app:iconBackgroundColor="@color/md_orange_A400" + app:iconBackgroundColor="@color/md_deep_orange_A400" app:srcCompat="@drawable/ic_image_white_24dp" /> @@ -339,7 +346,7 @@ android:layout_marginStart="16dp" android:padding="10dp" app:iconBackgroundColor="@color/md_indigo_A400" - app:srcCompat="@drawable/ic_settings_white_24dp" /> + app:srcCompat="@drawable/ic_testing_white_24dp" /> + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml index 9ab7a0e7b..2634ade0e 100644 --- a/app/src/main/res/layout/item_contributor.xml +++ b/app/src/main/res/layout/item_contributor.xml @@ -33,6 +33,7 @@ android:id="@+id/title" style="@style/TextAppearance.MaterialComponents.Subtitle1" android:layout_width="match_parent" + app:fontFamily="@font/circular_std_medium" android:layout_height="wrap_content" /> + android:maxLines="1" /> + app:showAsAction="ifRoom|withText"> Synced lyrics Set ringtone Allow Retro Music to modify audio settings + Team, social links + Advanced testing features diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f4bdeacd2..7c84c5ac3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -60,11 +60,11 @@ diff --git a/appthemehelper/src/main/res/values/colors_material_design.xml b/appthemehelper/src/main/res/values/colors_material_design.xml index eec03aecd..4084a5e25 100755 --- a/appthemehelper/src/main/res/values/colors_material_design.xml +++ b/appthemehelper/src/main/res/values/colors_material_design.xml @@ -55,5 +55,7 @@ #1DE9B6 - #FF3D00 + #FF3D00 + #FF9100 + #76FF03