Merge pull request #654 from Mahmud0808/beta

Add new lockscreen clocks

Signed-off-by: DrDisagree <[email protected]>

app/src/main/java/com/drdisagree/iconify/config/PrefsHelper.kt

@@ -169,6 +169,8 @@ import com.drdisagree.iconify.utils.weather.WeatherConfig
 object PrefsHelper {
 
     fun isVisible(key: String?): Boolean {
+        val lockscreenClockStyle = getInt(LSCLOCK_STYLE, 0)
+
         return when (key) {
             UPDATE_OVER_WIFI -> getBoolean(AUTO_UPDATE, true)
 
@@ -199,9 +201,9 @@ object PrefsHelper {
             LSCLOCK_COLOR_CODE_TEXT1,
             LSCLOCK_COLOR_CODE_TEXT2 -> getBoolean(LSCLOCK_COLOR_SWITCH)
 
-            LSCLOCK_DEVICENAME -> getInt(LSCLOCK_STYLE, 0) == 19
+            LSCLOCK_DEVICENAME -> lockscreenClockStyle in setOf(19, 32, 47)
 
-            LSCLOCK_USERNAME -> getInt(LSCLOCK_STYLE, 0) == 7
+            LSCLOCK_USERNAME -> lockscreenClockStyle in setOf(7, 32, 35, 36, 42, 48, 50, 53)
 
             // Weather Common
             WEATHER_OWM_KEY -> getString(WEATHER_PROVIDER, "0") == "1"

app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClock.kt

@@ -618,7 +618,7 @@ class HeaderClock(context: Context?) : ModPack(context!!) {
 
         when (clockStyle) {
             6 -> {
-                val imageView = clockView.findViewContainsTag("user_profile_image") as ImageView?
+                val imageView = clockView.findViewContainsTag("profile_picture") as ImageView?
                 userImage?.let { imageView?.setImageDrawable(it) }
             }
         }

app/src/main/java/com/drdisagree/iconify/xposed/modules/HeaderClockA14.kt

@@ -893,7 +893,7 @@ class HeaderClockA14(context: Context?) : ModPack(context!!) {
         when (clockStyle) {
             6 -> {
                 val imageView =
-                    clockView.findViewContainsTag("user_profile_image") as ImageView?
+                    clockView.findViewContainsTag("profile_picture") as ImageView?
                 userImage?.let { imageView?.setImageDrawable(it) }
             }
         }

app/src/main/java/com/drdisagree/iconify/xposed/modules/LockscreenClock.kt

@@ -497,22 +497,13 @@ class LockscreenClock(context: Context?) : ModPack(context!!) {
                     clockView.findViewContainsTag("volume_progressbar") as ProgressBar?
             }
 
-            7 -> {
-                val usernameView = clockView.findViewContainsTag("summary") as TextView?
-                usernameView?.text = customUserName.ifEmpty { userName }
-                val imageView = clockView.findViewContainsTag("user_profile_image") as ImageView?
-                userImage?.let { imageView?.setImageDrawable(it) }
-            }
-
             19 -> {
                 mBatteryLevelView = clockView.findViewContainsTag("battery_percentage") as TextView?
                 mBatteryProgress =
                     clockView.findViewContainsTag("battery_progressbar") as ProgressBar?
                 mVolumeLevelArcProgress =
                     clockView.findViewContainsTag("volume_progress") as ImageView?
                 mRamUsageArcProgress = clockView.findViewContainsTag("ram_usage_info") as ImageView?
-                val devName = clockView.findViewContainsTag("device_name") as TextView?
-                devName!!.text = customDeviceName.ifEmpty { Build.MODEL }
             }
 
             22 -> {
@@ -532,6 +523,15 @@ class LockscreenClock(context: Context?) : ModPack(context!!) {
             }
         }
 
+        val deviceName = clockView.findViewContainsTag("device_name") as TextView?
+        deviceName?.text = customDeviceName.ifEmpty { Build.MODEL }
+
+        val usernameView = clockView.findViewContainsTag("username") as TextView?
+        usernameView?.text = customUserName.ifEmpty { userName }
+
+        val imageView = clockView.findViewContainsTag("profile_picture") as ImageView?
+        userImage?.let { imageView?.setImageDrawable(it) }
+
         if (textScaleFactor != 1f) {
             applyTextScalingRecursively(clockView, textScaleFactor)
 

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#33FFFFFF" />
+    <corners android:radius="24dp" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#CCFFFFFF" />
+    <corners android:radius="120dp" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#CCFFFFFF" />
+    <corners android:radius="18dp" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="15dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="3dp"
+        android:color="#C4FFFFFF" />
+    <corners android:radius="15dp" />
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="3dp"
+        android:color="?android:textColorPrimary" />
+    <corners android:radius="120dp" />
+    <solid android:color="@android:color/system_accent1_300" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="3dp"
+        android:color="#FFFFFF" />
+    <corners android:radius="20dp" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="@android:color/system_neutral2_900"
+        android:startColor="@android:color/system_neutral1_900" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <gradient
+        android:angle="0"
+        android:endColor="@android:color/system_accent3_600"
+        android:startColor="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="@android:color/system_accent3_600"
+        android:startColor="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="@android:color/system_accent3_600"
+        android:startColor="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="120dp" />
+    <solid android:color="@android:color/system_neutral1_800" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/system_neutral1_800" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="14dp" />
+    <solid android:color="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="14dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="100dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="8dp" />
+    <solid android:color="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+	<stroke android:width="2.5dip" android:color="#ffffff" />
+	<corners android:topLeftRadius="20.0dip" android:bottomRightRadius="20.0dip" />
+	<solid android:color="#00ffffff" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="360dp" />
+    <solid android:color="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="360dp" />
+    <solid android:color="@android:color/system_accent2_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="360dp" />
+    <solid android:color="@android:color/system_accent3_600" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#66FFFFFF" />
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="3dp"
+        android:color="@android:color/system_neutral1_1000" />
+    <corners android:radius="20.0dip" />
+    <solid android:color="@android:color/system_neutral1_900" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp" />
+    <solid android:color="@android:color/system_accent1_600" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+	<stroke android:width="0.0dip" android:color="#c5000000" />
+	<corners android:radius="100.0dip" />
+	<solid android:color="#ffffff" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+	<stroke android:width="0.0dip" android:color="#c5000000" />
+	<corners android:radius="20.0dip" />
+	<solid android:color="?android:colorAccent" />
+</shape>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="2dp"
+        android:color="@android:color/system_accent1_900" />
+    <corners android:radius="16.0dip" />
+    <solid android:color="@android:color/system_accent1_200" />
+</shape>
+

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp" />
+    <solid android:color="#99FFFFFF" />
+</shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@android:color/system_accent1_900" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="5dp" />
+    <solid android:color="#FFFFFF" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="100dp" />
+    <solid android:color="@android:color/system_accent1_400" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/system_accent1_600" />
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+</shape>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/system_accent3_600" />
+    <corners
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/system_accent1_600" />
+    <corners android:radius="10dp" />
+</shape>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/system_accent3_600" />
+    <corners android:radius="10dp" />
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#66000000" />
+    <stroke
+        android:width="3.0dip"
+        android:color="@android:color/system_accent1_600" />
+    <corners android:radius="12dp" />
+</shape>