Merge remote-tracking branch 'origin/kotlin' into kotlin

# Conflicts:
#	app/app.iml
#	app/build.gradle
#	app/src/main/java/code/name/monkey/retromusic/ui/activities/base/AbsBaseActivity.java

app/src/main/res/font/font.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/circular_std_book"
+        android:fontStyle="normal"
+        android:fontWeight="400" />
+    <font
+        android:font="@font/circular_std_black"
+        android:fontStyle="normal"
+        android:fontWeight="700" />
+</font-family>

app/src/main/res/values/styles.xml

@@ -55,6 +55,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="fontPath">@string/circular_std_black</item>
+        <item name="android:textStyle">bold</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center</item>
     </style>

app/src/main/res/values/styles_parents.xml

@@ -26,6 +26,7 @@
         <item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
         <item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
 
+        <item name="android:fontFamily">@font/font</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
@@ -67,6 +68,7 @@
 
         <item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
         <item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
+        <item name="android:fontFamily">@font/font</item>
     </style>
 
     <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
@@ -109,12 +111,14 @@
 
         <item name="android:windowSharedElementEnterTransition">@transition/grid_exit</item>
         <item name="android:windowSharedElementExitTransition">@transition/grid_exit</item>
+        <item name="android:fontFamily">@font/font</item>
     </style>
 
     <style name="Theme.RetroMusic.Base.Color" parent="@style/Theme.RetroMusic.Base">
         <item name="colorPrimary">@color/md_deep_purple_A400</item>
         <item name="android:colorPrimary">?colorPrimary</item>
         <item name="android:windowBackground">?colorPrimary</item>
+        <item name="android:fontFamily">@font/font</item>
     </style>