From e5cab894ca45a09187fe32794c31de0657cb3ab6 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Thu, 3 Oct 2019 22:43:04 +0530 Subject: [PATCH] Fix tiny theme and other --- .gitignore | 4 ++++ app/build.gradle | 6 +++--- .../fragments/player/tiny/TinyPlayerFragment.kt | 2 +- .../retromusic/views/VerticalTextView.java | 13 ++++++------- .../fragment_player_playback_controls.xml | 1 + .../fragment_blur_player_playback_controls.xml | 1 + .../fragment_card_player_playback_controls.xml | 1 + .../fragment_color_player_playback_controls.xml | 1 + .../layout/fragment_fit_playback_controls.xml | 1 + .../layout/fragment_full_player_controls.xml | 3 ++- .../fragment_lock_screen_playback_controls.xml | 3 ++- .../fragment_material_playback_controls.xml | 1 + .../fragment_player_playback_controls.xml | 1 + .../fragment_simple_controls_fragment.xml | 1 + .../main/res/layout/fragment_tiny_player.xml | 17 +++++++++++------ app/src/main/res/values/styles.xml | 6 +++++- 16 files changed, 42 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index a9135c63..4d995e37 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ obj/ captures app/normal/release/ /models/ + +app/font/ +app/src/debug/ +app/src/font/ diff --git a/app/build.gradle b/app/build.gradle index 8ffffa02..bb8f98ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 28 - renderscriptTargetApi 29 //must match target sdk and build tools + renderscriptTargetApi 28 //must match target sdk and build tools vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt index 54e523eb..cf5ed559 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt @@ -126,7 +126,7 @@ class TinyPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Ca private fun updateSong() { val song = MusicPlayerRemote.currentSong songTitle.text = song.title - songText.text = String.format("%s \nby -%s", song.albumName, song.artistName) + songText.text = String.format("%s \nby - %s", song.albumName, song.artistName) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java index aa4e64f2..5e79c096 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java @@ -20,15 +20,13 @@ import android.text.TextPaint; import android.util.AttributeSet; import android.view.Gravity; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; -import com.google.android.material.textview.MaterialTextView; -public class VerticalTextView extends MaterialTextView { +public class VerticalTextView extends AppCompatTextView { final boolean topDown; - public VerticalTextView(@NonNull Context context, @Nullable AttributeSet attrs) { + public VerticalTextView(Context context, AttributeSet attrs) { super(context, attrs); final int gravity = getGravity(); if (Gravity.isVertical(gravity) && (gravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.BOTTOM) { @@ -36,16 +34,17 @@ public class VerticalTextView extends MaterialTextView { topDown = false; } else topDown = true; + } @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); + super.onMeasure(heightMeasureSpec, widthMeasureSpec); setMeasuredDimension(getMeasuredHeight(), getMeasuredWidth()); } @Override - protected void onDraw(@NonNull Canvas canvas) { + protected void onDraw(Canvas canvas) { TextPaint textPaint = getPaint(); textPaint.setColor(getCurrentTextColor()); textPaint.drawableState = getDrawableState(); diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml index 5cfc04b6..dc12b49c 100755 --- a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml @@ -26,6 +26,7 @@ android:singleLine="true" android:textAppearance="@style/TextViewHeadline3" android:textColor="?android:attr/textColorPrimary" + android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index 0e607ac6..e613e829 100644 --- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml @@ -89,6 +89,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:scrollHorizontally="true" + android:textStyle="bold" android:singleLine="true" android:textAppearance="@style/TextViewSubtitle1" app:layout_constraintBottom_toTopOf="@+id/text" diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index eb1f59fd..c7493afb 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -96,6 +96,7 @@ android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextViewSubtitle1" + android:textStyle="bold" tools:text="@tools:sample/lorem/random" /> + android:layout_height="match_parent" + android:elevation="10dp"> + android:rotation="0" + android:textAppearance="@style/TextViewHeadline6" + tools:text=" Album name \nby - Artist name" /> @@ -117,7 +122,7 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:padding="16dp" - android:textAppearance="@style/TextAppearance.AppCompat.Display3" + android:textAppearance="@style/TextViewHeadline3" android:textStyle="bold" tools:ignore="MissingPrefix" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2ddf296e..e135d40e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,7 +41,7 @@ 16sp - + +