Merge branch 'release/v2.3.4'

.circleci/config.yml

@@ -2,6 +2,11 @@ version: 2
 jobs:
   build:
     working_directory: ~/code
+    filters:
+      tags:
+        only: /^v.*/
+      branches:
+        ignore: /[^(^master$)]/
     docker:
       - image: circleci/android:api-29
     environment:

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.sduduzog.slimlauncher"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 38
-        versionName "2.3.3"
+        versionCode 39
+        versionName "2.3.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeFragment.kt

@@ -138,15 +138,11 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
                 ?.getBoolean(getString(R.string.prefs_settings_key_time_format), true)
         val date = Date()
         if (twenty4Hour as Boolean) {
-            val fWatchTime = SimpleDateFormat("h:mm", Locale.ROOT)
-            val fWatchTimeAP = SimpleDateFormat("aa", Locale.ROOT)
+            val fWatchTime = SimpleDateFormat("h:mm aa", Locale.ROOT)
             home_fragment_time.text = fWatchTime.format(date)
-            home_fragment_time_format.text = fWatchTimeAP.format(date)
-            home_fragment_time_format.visibility = View.VISIBLE
         } else {
             val fWatchTime = SimpleDateFormat("H:mm", Locale.ROOT)
             home_fragment_time.text = fWatchTime.format(date)
-            home_fragment_time_format.visibility = View.GONE
         }
         val fWatchDate = SimpleDateFormat("EEE, MMM dd", Locale.ROOT)
         home_fragment_date.text = fWatchDate.format(date)

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <font
+        app:font="@font/ubuntu_regular"
+        app:fontStyle="normal"
+        app:fontWeight="400" />
+
+    <font
+        app:font="@font/ubuntu_regular_italic"
+        app:fontStyle="italic"
+        app:fontWeight="400" />
+
+    <font
+        app:font="@font/ubuntu_medium"
+        app:fontStyle="normal"
+        app:fontWeight="500" />
+
+    <font
+        app:font="@font/ubuntu_medium_italic"
+        app:fontStyle="italic"
+        app:fontWeight="500" />
+
+</font-family>

app/src/main/res/layout/home_fragment.xml

@@ -16,13 +16,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat"
         android:textSize="@dimen/_40ssp" />
 
-    <TextView
-        android:id="@+id/home_fragment_time_format"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat"
-        android:textSize="@dimen/_13sdp" />
-
     <TextView
         android:id="@+id/home_fragment_date"
         android:layout_width="wrap_content"

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

@@ -7,6 +7,7 @@
         <item name="colorPrimary">@color/colorWhite</item>
         <item name="colorPrimaryDark">@color/colorWhiteDark</item>
         <item name="android:colorBackground">@color/colorWhite</item>
+        <item name="android:fontFamily">@font/ubuntu</item>
     </style>
 
     <style name="AppDarkTheme" parent="@style/Theme.AppCompat.NoActionBar">
@@ -15,6 +16,7 @@
         <item name="colorPrimaryDark">@color/primaryDarkColor</item>
         <item name="android:colorBackground">@color/primaryDarkColor</item>
         <item name="android:colorForeground">@color/darkAccentColor</item>
+        <item name="android:fontFamily">@font/ubuntu</item>
     </style>
 
     <style name="AppGreyTheme" parent="@style/AppDarkTheme">

app/src/main/res/xml/home_motion_scene.xml

@@ -124,15 +124,6 @@
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toStartOf="parent" />
 
-        <Constraint
-            android:id="@+id/home_fragment_time_format"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/_16sdp"
-            android:alpha="-1"
-            motion:layout_constraintStart_toEndOf="@+id/home_fragment_time"
-            motion:layout_constraintTop_toTopOf="@+id/home_fragment_time" />
-
         <Constraint
             android:id="@+id/home_fragment_date"
             android:layout_width="wrap_content"