diff --git a/.gitignore b/.gitignore
index a9135c63c..4d995e375 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 8ffffa021..bb8f98ffa 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 54e523eb4..cf5ed559d 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 aa4e64f2a..5e79c0967 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 5cfc04b63..dc12b49c9 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 0e607ac61..e613e8295 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 eb1f59fd5..c7493afb0 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 2ddf296e0..e135d40eb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -41,7 +41,7 @@
- 16sp
-
+
+