ソースを参照

tweak teal theme, turn on double tap to lock

sduduzog 7 年 前
コミット
1777427b7b

+ 11 - 9
app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt

@@ -1,6 +1,7 @@
 package com.sduduzog.slimlauncher.ui.main
 
 import android.annotation.SuppressLint
+import android.app.admin.DevicePolicyManager
 import android.content.*
 import android.net.Uri
 import android.os.Build
@@ -17,6 +18,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPS
 import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HALF_EXPANDED
 import com.sduduzog.slimlauncher.MainActivity
 import com.sduduzog.slimlauncher.R
+import com.sduduzog.slimlauncher.SlimAdminReceiver
 import kotlinx.android.synthetic.main.main_bottom_sheet.*
 import kotlinx.android.synthetic.main.main_content.*
 import kotlinx.android.synthetic.main.main_fragment.*
@@ -322,15 +324,15 @@ class MainFragment : StatusBarThemeFragment(), MainActivity.OnBackPressedListene
         }
 
         private fun performLock() {
-//            val mComponentName = ComponentName(context!!, SlimAdminReceiver::class.java)
-//            val mDevicePolicyManager = activity!!.getSystemService(
-//                    Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
-//            val isAdmin = mDevicePolicyManager.isAdminActive(mComponentName)
-//            if (isAdmin) {
-//                mDevicePolicyManager.lockNow()
-//            } else {
-//                MakeSlimAdminDialog().show(childFragmentManager, "Admin Dialog")
-//            }
+            val mComponentName = ComponentName(context!!, SlimAdminReceiver::class.java)
+            val mDevicePolicyManager = activity!!.getSystemService(
+                    Context.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+            val isAdmin = mDevicePolicyManager.isAdminActive(mComponentName)
+            if (isAdmin) {
+                mDevicePolicyManager.lockNow()
+            } else {
+                MakeSlimAdminDialog().show(childFragmentManager, "Admin Dialog")
+            }
         }
     }
 }

+ 7 - 7
app/src/main/res/layout/settings_fragment.xml

@@ -57,7 +57,7 @@
     <Switch
         android:id="@+id/statusBarSwitch"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
@@ -94,15 +94,15 @@
     <Switch
         android:id="@+id/clockSwitch"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         android:layout_marginBottom="8dp"
         android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="@+id/textView4"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView2"
-        android:layout_marginRight="24dp" />
+        app:layout_constraintTop_toTopOf="@+id/textView2" />
 
     <TextView
         android:id="@+id/textView9"
@@ -128,15 +128,15 @@
     <Switch
         android:id="@+id/dialerSwitch"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
         android:layout_marginBottom="8dp"
         android:padding="4dp"
         app:layout_constraintBottom_toBottomOf="@+id/textView10"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView9"
-        android:layout_marginRight="24dp" />
+        app:layout_constraintTop_toTopOf="@+id/textView9" />
 
     <TextView
         android:id="@+id/changeThemeText"

+ 6 - 0
app/src/main/res/layout/theme_setup_fragment.xml

@@ -33,6 +33,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView18"
+        android:contentDescription="@string/setup_text_default"
         android:layout_marginLeft="8dp" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -42,6 +43,7 @@
         android:clickable="true"
         android:focusable="true"
         app:srcCompat="@drawable/ic_text_fields"
+        android:contentDescription="@string/setup_text_dark"
         android:tint="@color/inverseTextColor"
         app:backgroundTint="@color/primaryDarkColor"
         app:fabSize="normal"
@@ -56,6 +58,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:clickable="true"
+        android:contentDescription="@string/setup_text_jupiter"
         android:focusable="true"
         app:srcCompat="@drawable/ic_text_fields"
         android:tint="@color/inverseTextColor"
@@ -74,6 +77,7 @@
         android:layout_marginTop="32dp"
         android:clickable="true"
         android:focusable="true"
+        android:contentDescription="@string/setup_text_teal"
         app:srcCompat="@drawable/ic_text_fields"
         app:backgroundTint="@color/colorTeal"
         app:fabSize="normal"
@@ -87,6 +91,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:contentDescription="@string/setup_text_candy"
         android:focusable="true"
         app:srcCompat="@drawable/ic_text_fields"
         android:tint="@color/inverseTextColor"
@@ -107,6 +112,7 @@
         app:backgroundTint="@color/colorPink"
         app:fabSize="normal"
         app:layout_constraintEnd_toEndOf="parent"
+        android:contentDescription="@string/setup_text_pastel"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/setup_fab_candy"
         app:layout_constraintTop_toTopOf="@+id/setup_fab_candy" />

+ 2 - 2
app/src/main/res/values/colors.xml

@@ -14,8 +14,8 @@
     <color name="colorPink">#fce4ec</color>
     <color name="colorPinkDark">#F8BBD0</color>
 
-    <color name="colorTeal">#e0f2f1</color>
-    <color name="colorTealDark">#B2DFDB</color>
+    <color name="colorTeal">#B2DFDB</color>
+    <color name="colorTealDark">#80CBC4</color>
 
     <color name="inverseTextColor">#e0e0e0</color>
     <color name="inverseAccentColor">#607d8b</color>