From 614d6878277d3a0f7b16312d40cdd76db3e3dc75 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Fri, 5 Apr 2019 16:15:09 +0530 Subject: [PATCH] Fix font, text appearance, keyboard --- app/src/main/assets/retro-changelog.html | 2 +- .../dialogs/OptionsSheetDialogFragment.kt | 4 +- .../retromusic/ui/activities/AboutActivity.kt | 1 + .../ui/activities/SearchActivity.kt | 24 +++++ .../ui/activities/UserInfoActivity.kt | 11 ++- .../settings/MainSettingsFragment.kt | 32 ++++++- .../drawable/ic_info_outline_black_24dp.xml | 23 +++++ .../res/drawable/ic_keyboard_white_24dp.xml | 23 +++++ .../main/res/drawable/ic_star_white_24dp.xml | 25 ++++-- .../res/drawable/ic_testing_white_24dp.xml | 24 +++++ app/src/main/res/font/circular.xml | 5 ++ app/src/main/res/font/circular_std_medium.otf | Bin 0 -> 79304 bytes .../main/res/layout-land/activity_album.xml | 1 - .../layout-land/activity_album_tag_editor.xml | 2 +- .../res/layout-land/activity_settings.xml | 4 +- .../res/layout-xlarge-land/activity_album.xml | 1 - .../main/res/layout-xlarge/activity_album.xml | 1 - .../res/layout-xlarge/activity_user_info.xml | 18 ++-- app/src/main/res/layout/activity_about.xml | 2 +- .../res/layout/activity_about_content.xml | 3 +- app/src/main/res/layout/activity_album.xml | 1 - .../res/layout/activity_album_tag_editor.xml | 2 +- app/src/main/res/layout/activity_donation.xml | 4 +- .../main/res/layout/activity_equalizer.xml | 5 +- .../res/layout/activity_error_handler.xml | 2 +- app/src/main/res/layout/activity_license.xml | 4 +- .../res/layout/activity_playing_queue.xml | 4 +- .../res/layout/activity_playlist_detail.xml | 4 +- .../main/res/layout/activity_pro_version.xml | 4 +- app/src/main/res/layout/activity_search.xml | 82 ++++++++++-------- app/src/main/res/layout/activity_settings.xml | 4 +- .../main/res/layout/activity_user_info.xml | 15 ++-- .../main/res/layout/activity_whats_new.xml | 4 +- app/src/main/res/layout/card_credit.xml | 12 +-- app/src/main/res/layout/card_other.xml | 14 +++ app/src/main/res/layout/card_retro_info.xml | 6 ++ app/src/main/res/layout/card_social.xml | 6 ++ .../main/res/layout/fragment_main_options.xml | 10 --- .../res/layout/fragment_main_settings.xml | 64 +++++++++++++- app/src/main/res/layout/item_contributor.xml | 1 + app/src/main/res/layout/item_list.xml | 6 +- app/src/main/res/layout/item_song.xml | 1 - app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/values/strings.xml | 2 + app/src/main/res/values/styles.xml | 4 +- .../res/values/colors_material_design.xml | 4 +- 46 files changed, 347 insertions(+), 126 deletions(-) create mode 100644 app/src/main/res/drawable/ic_info_outline_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_keyboard_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_testing_white_24dp.xml create mode 100755 app/src/main/res/font/circular_std_medium.otf diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 57271493..7d94643a 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 7a1ca934..6fc1f8f7 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 aba4d2df..d26cb4e7 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 6861748c..15c68b4a 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 359ca05c..1bfee840 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 9f04218e..12d2709e 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 00000000..8016ddf1 --- /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 00000000..40aa721d --- /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 f688ccaa..f8cbc6aa 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 00000000..f5fb6f64 --- /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 6f20e75b..a1f9df1a 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 0000000000000000000000000000000000000000..931f4159d4590f9bbbe9c62df20101efb71e7da8 GIT binary patch literal 79304 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 diff --git a/app/src/main/res/layout-land/activity_settings.xml b/app/src/main/res/layout-land/activity_settings.xml index ba0fb286..670753ed 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 7e9b8d2c..a286ec67 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 ded7bf56..28708b86 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 d0068684..632b5178 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 66768f0b..ca1d66c7 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 408b8b6c..66eb255e 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 4699a975..1be31e49 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 3861e18a..926cdc67 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 94950952..3997161b 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 07144a15..e3a7fadf 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 c14e029a..a0296aff 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 6fe308d5..16465294 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 4ccb56c9..0f5b8f55 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 83731e30..e0118f74 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 56d797ef..c2ad2386 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 9796243a..93c714db 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 3e84c2d4..29c9299d 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 597f32d8..27d7cb2c 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 a263b2dc..55b39a2e 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 9113dc9e..ab7725c2 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 db8a1d19..f710c6f7 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 2a4d34a5..beac2bed 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 fab0cf9b..9dbc21ea 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 9ab7a0e7..2634ade0 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 f4bdeacd..7c84c5ac 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 eec03aec..4084a5e2 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