Merge branch 'release/v2.2.6'

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.sduduzog.slimlauncher"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 27
-        versionName "2.2.5"
+        versionCode 28
+        versionName "2.2.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

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

@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import com.sduduzog.slimlauncher.BuildConfig
 import com.sduduzog.slimlauncher.R
 import kotlinx.android.synthetic.main.about_fragment.*
 
@@ -21,6 +22,7 @@ class AboutFragment : Fragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
+        aboutVersionText.text = getString(R.string.about_title, BuildConfig.VERSION_NAME)
         aboutDescriptionText.movementMethod = LinkMovementMethod.getInstance()
     }
 }

app/src/main/res/drawable/ic_slim.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="364.8"
+    android:viewportHeight="364.8">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m173.79,343.55c-8.988,-0.539 -17.782,-1.74 -26.08,-3.562 -65.858,-14.457 -115.83,-67.785 -126.05,-134.52 -2.362,-15.418 -2.362,-33.222 0,-48.64 10.811,-70.572 65.882,-125.64 136.45,-136.45 15.418,-2.362 33.222,-2.362 48.64,0 70.572,10.811 125.64,65.882 136.45,136.45 1.242,8.109 1.73,14.964 1.73,24.32 0,9.356 -0.488,16.211 -1.73,24.32 -11.347,74.07 -71.37,130.67 -145.89,137.58 -6.66,0.617 -17.689,0.853 -23.52,0.504zM177.96,215.51c-10.277,-1.497 -18.477,-9.697 -19.974,-19.974 -0.192,-1.322 -0.29,1.516 -0.317,9.21l-0.039,11.12 11.12,-0.039c7.694,-0.027 10.531,-0.125 9.21,-0.317zM266.11,161.626v-54.24h-108.48l0.039,41.68c0.023,25.033 0.15,40.917 0.317,39.77 1.266,-8.695 7.378,-16.078 15.632,-18.886 12.379,-4.21 25.761,2.293 29.928,14.544 1.73,5.085 1.73,10.298 0,15.383 -2.807,8.254 -10.191,14.366 -18.886,15.632 -1.147,0.167 14.737,0.294 39.77,0.317l41.68,0.039z"
+        android:strokeWidth=".32"
+        tools:ignore="VectorPath" />
+</vector>

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

@@ -1,45 +1,38 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/aboutLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.sduduzog.slimlauncher.ui.main.AboutFragment">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/aboutVersionText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:text="@string/about_title"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Slim launcher" />
 
-        <TextView
-            android:id="@+id/textView5"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
-            android:text="@string/about_title"
-            android:textSize="36sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Slim launcher" />
+    <TextView
+        android:id="@+id/aboutDescriptionText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/about_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/aboutVersionText" />
 
-        <TextView
-            android:id="@+id/aboutDescriptionText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp"
-            android:text="@string/about_text"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,16 +4,17 @@
     android:id="@+id/frameLayout2"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="false"
     tools:context="com.sduduzog.slimlauncher.ui.main.notes.NotesListFragment">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:elevation="10dp">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.Toolbar
+            android:layout_height="?attr/actionBarSize"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_marginTop="16dp"
             app:title="Notes" />
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -31,7 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_edit"
-        app:layout_anchorGravity="bottom|end" />
+        app:layout_anchorGravity="bottom|end"
+        app:srcCompat="@drawable/ic_edit" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -13,7 +13,7 @@
         android:layout_height="@dimen/_60sdp"
         android:layout_marginStart="8dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="@dimen/_50sdp"
+        android:layout_marginTop="@dimen/_100sdp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:contentDescription="@string/app_name"
@@ -21,7 +21,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@mipmap/ic_launcher" />
+        app:srcCompat="@drawable/ic_slim" />
 
     <Button
         android:id="@+id/setup_splash_button_start"

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Slim</string>
+    <string name="app_name">Slim Launcher</string>
     <string name="main_placeholder_clock">00:00</string>
     <string name="main_placeholder_date">Date</string>
 
@@ -49,9 +49,12 @@
     <string name="settings_list_item_button_set_app">Set app</string>
     <string name="settings_list_item_text">Slot empty</string>
     <string name="settings_button_change_theme">Change</string>
-    <string name="about_title">Slim launcher</string>
+    <string name="about_title">2019 \u00a9 Slim v%s</string>
     <string name="about_text">
-    Slim v2.2.4 \u00a9 2019\n\nSource : <a href="https://github.com/sduduzog/slim-launcher">https://github.com/sduduzog/slim-launcher</a>\n\n<a href="mailto:gumedesduduzo@gmail.com">gumedesduduzo@gmail.com</a>\n\nBecome a tester <a href="https://play.google.com/apps/testing/com.sduduzog.slimlauncher">Click here</a>
+    <a href="https://github.com/sduduzog/slim-launcher">https://github.com/sduduzog/slim-launcher</a>\n\n
+    <a href="mailto:gumedesduduzo@gmail.com">gumedesduduzo@gmail.com</a>\n\n
+    To become a beta tester <a href="https://play.google.com/apps/testing/com.sduduzog.slimlauncher">click here</a>\n\n
+    <a href="https://github.com/sduduzog/slim-launcher/issues/new">Report a bug</a>
     </string>
     <string name="theme_chooser_dialog_title">Change theme</string>
     <string name="main_call_icon">call icon</string>

app/src/main/res/xml/admin.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<device-admin>
-    <uses-policies>
-        <force-lock />
-    </uses-policies>
-</device-admin>