Merge branch 'bugfix'

app/build.gradle

@@ -21,12 +21,12 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
             minifyEnabled false
             applicationIdSuffix ".debug"
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }

app/src/main/java/com/sduduzog/slimlauncher/data/DataRepository.kt

@@ -5,9 +5,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.os.AsyncTask
-import android.util.Log
 import androidx.lifecycle.LiveData
-import com.sduduzog.slimlauncher.BuildConfig
 import java.util.*
 
 class DataRepository(application: Application) {

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

@@ -35,7 +35,9 @@
                 android:id="@+id/textView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="24dp"
                 android:text="@string/main_slim_options"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

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

@@ -12,6 +12,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingTop="20dp"
         android:orientation="vertical">
 
         <EditText

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

@@ -12,14 +12,14 @@
     <style name="AppDarkTheme" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimary">@color/primaryDarkColor</item>
-        <item name="colorPrimaryDark">@color/primaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
         <item name="android:colorBackground">@color/primaryDarkColor</item>
         <item name="android:colorForeground">@color/inverseTextColor</item>
     </style>
 
     <style name="AppGreyTheme" parent="@style/AppDarkTheme">
         <item name="colorPrimary">@color/colorBlueGrey</item>
-        <item name="colorPrimaryDark">@color/colorBlueGreyDark</item>
+        <item name="colorPrimaryDark">@color/colorBlueGrey</item>
         <item name="android:colorBackground">@color/colorBlueGrey</item>
         <item name="cardBackgroundColor">@color/colorBlueGreyDark</item>
         <item name="colorAccent">@color/inverseAccentColor</item>
@@ -27,20 +27,20 @@
 
     <style name="AppCandyTheme" parent="AppDarkTheme">
         <item name="colorPrimary">@color/colorCandy</item>
-        <item name="colorPrimaryDark">@color/colorCandyDark</item>
+        <item name="colorPrimaryDark">@color/colorCandy</item>
         <item name="android:colorBackground">@color/colorCandy</item>
     </style>
 
     <style name="AppPinkTheme" parent="AppTheme">
         <item name="colorPrimary">@color/colorPink</item>
-        <item name="colorPrimaryDark">@color/colorPinkDark</item>
+        <item name="colorPrimaryDark">@color/colorPink</item>
         <item name="android:colorBackground">@color/colorPink</item>
         <!--<item name="android:statusBarColor">@color/colorPinkDark</item>-->
     </style>
 
     <style name="AppTealTheme" parent="AppTheme">
         <item name="colorPrimary">@color/colorTeal</item>
-        <item name="colorPrimaryDark">@color/colorTealDark</item>
+        <item name="colorPrimaryDark">@color/colorTeal</item>
         <item name="android:colorBackground">@color/colorTeal</item>
         <!--<item name="android:statusBarColor">@color/colorTealDark</item>-->
     </style>