Updated 8 files and added 3 files (automated)

11 files changed, 421 insertions, 362 deletions

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..639f9bc
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Wear_OS_Small_Round_API_30_2.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-04-13T09:39:17.290509Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 213a917..142d53f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,15 +11,26 @@ android {
         applicationId "dev.equestria.ponywatch"
         minSdk 30
         targetSdk 33
-        versionCode 3
-        versionName "2.0"
+        versionCode 4
+        versionName "2.1"
 
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    flavorDimensions "version"
+    productFlavors {
+        plural {
+            buildConfigField 'boolean', 'ENABLE_PLURALITY', 'true'
+            versionNameSuffix ".plural"
+        }
+        general {
+            buildConfigField 'boolean', 'ENABLE_PLURALITY', 'false'
+            versionNameSuffix ".general"
         }
     }
 }
diff --git a/app/general/release/app-general-release.apk b/app/general/release/app-general-release.apk
new file mode 100644
index 0000000..58e5872
--- /dev/null
+++ b/app/general/release/app-general-release.apk
diff --git a/app/general/release/output-metadata.json b/app/general/release/output-metadata.json
new file mode 100644
index 0000000..e360245
--- /dev/null
+++ b/app/general/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "dev.equestria.ponywatch",
+  "variantName": "generalRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 4,
+      "versionName": "2.1.general",
+      "outputFile": "app-general-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/app/src/main/java/dev/equestria/ponywatch/AlicornFace.kt b/app/src/main/java/dev/equestria/ponywatch/AlicornFace.kt
index da60633..6a46dfd 100644
--- a/app/src/main/java/dev/equestria/ponywatch/AlicornFace.kt
+++ b/app/src/main/java/dev/equestria/ponywatch/AlicornFace.kt
@@ -346,85 +346,87 @@ class AlicornFace : CanvasWatchFaceService() {
 
             canvas.drawText("$hs:$ms", (canvas.width / 2).toFloat(), 150f, paint)
 
-            if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
-                lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
-
-                val target = object : Target {
-                    override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                        try {
-                            if (bitmap != null) {
-                                bmp = bitmap
-                                bmp = Bitmap.createScaledBitmap(
-                                    bmp,
-                                    48,
-                                    48, true
-                                )
-
-                                canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+            if (BuildConfig.ENABLE_PLURALITY) {
+                if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
+                    lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
+
+                    val target = object : Target {
+                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                            try {
+                                if (bitmap != null) {
+                                    bmp = bitmap
+                                    bmp = Bitmap.createScaledBitmap(
+                                        bmp,
+                                        48,
+                                        48, true
+                                    )
+
+                                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                                }
+                            } catch (ex: IllegalArgumentException) {
+                                Log.e("Picasso", ex.toString())
                             }
-                        } catch (ex: IllegalArgumentException) {
-                            Log.e("Picasso", ex.toString())
-                        }
 
-                        val volleyQueue = Volley.newRequestQueue(baseContext)
-
-                        val jsonObjectRequest = JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
-
-                            { response ->
-                                Log.i("HTTPRequest", response.toString())
-                                twoFronters = response!!.get("multiple") as Boolean
-
-                                if (twoFronters) {
-                                    val target = object : Target {
-                                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                                            try {
-                                                if (bitmap != null) {
-                                                    bmp2 = bitmap
-                                                    bmp2 = Bitmap.createScaledBitmap(
-                                                        bmp2,
-                                                        48,
-                                                        48, true
-                                                    )
+                            val volleyQueue = Volley.newRequestQueue(baseContext)
+
+                            val jsonObjectRequest = JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
+
+                                { response ->
+                                    Log.i("HTTPRequest", response.toString())
+                                    twoFronters = response!!.get("multiple") as Boolean
+
+                                    if (twoFronters) {
+                                        val target = object : Target {
+                                            override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                                                try {
+                                                    if (bitmap != null) {
+                                                        bmp2 = bitmap
+                                                        bmp2 = Bitmap.createScaledBitmap(
+                                                            bmp2,
+                                                            48,
+                                                            48, true
+                                                        )
+                                                    }
+                                                } catch (ex: IllegalArgumentException) {
+                                                    Log.e("Picasso", ex.toString())
                                                 }
-                                            } catch (ex: IllegalArgumentException) {
-                                                Log.e("Picasso", ex.toString())
                                             }
-                                        }
 
-                                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                                            Log.e("Picasso", e.toString())
+                                            override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                                                Log.e("Picasso", e.toString())
+                                            }
+
+                                            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                                         }
 
-                                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
+                                        Picasso.get().load(
+                                            "https://ponies.equestria.horse/api/raindrops-img2-round"
+                                        ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                                     }
+                                },
 
-                                    Picasso.get().load(
-                                        "https://ponies.equestria.horse/api/raindrops-img2-round"
-                                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-                                }
-                            },
+                                { error -> Log.e("HTTPRequest", "Request error: ${error.localizedMessage}") })
 
-                            { error -> Log.e("HTTPRequest", "Request error: ${error.localizedMessage}") })
+                            volleyQueue.add(jsonObjectRequest)
+                        }
 
-                        volleyQueue.add(jsonObjectRequest)
-                    }
+                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                            Log.e("Picasso", e.toString())
+                        }
 
-                    override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                        Log.e("Picasso", e.toString())
+                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                     }
 
-                    override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
-                }
-
-                Picasso.get().load(
-                    "https://ponies.equestria.horse/api/raindrops-img-round"
-                ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-            } else {
-                if (twoFronters) {
-                    canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 20f, mBackgroundPaint)
-                    canvas.drawBitmap(bmp, mCenterX - 102f/2f, 20f, mBackgroundPaint)
+                    Picasso.get().load(
+                        "https://ponies.equestria.horse/api/raindrops-img-round"
+                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                 } else {
-                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 20f, mBackgroundPaint)
+                    if (twoFronters) {
+                        canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 20f, mBackgroundPaint)
+                        canvas.drawBitmap(bmp, mCenterX - 102f/2f, 20f, mBackgroundPaint)
+                    } else {
+                        canvas.drawBitmap(bmp, mCenterX - 48f/2f, 20f, mBackgroundPaint)
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/dev/equestria/ponywatch/CutiemarkFace.kt b/app/src/main/java/dev/equestria/ponywatch/CutiemarkFace.kt
index 204a884..da876a6 100644
--- a/app/src/main/java/dev/equestria/ponywatch/CutiemarkFace.kt
+++ b/app/src/main/java/dev/equestria/ponywatch/CutiemarkFace.kt
@@ -471,85 +471,87 @@ class CutiemarkFace : CanvasWatchFaceService() {
 
             canvas.drawText("$hs:$ms", (canvas.width / 2).toFloat(), 40f, paint)
 
-            if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
-                lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
-
-                val target = object : Target {
-                    override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                        try {
-                            if (bitmap != null) {
-                                bmp = bitmap
-                                bmp = Bitmap.createScaledBitmap(
-                                    bmp,
-                                    48,
-                                    48, true
-                                )
-
-                                canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+            if (BuildConfig.ENABLE_PLURALITY) {
+                if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
+                    lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
+
+                    val target = object : Target {
+                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                            try {
+                                if (bitmap != null) {
+                                    bmp = bitmap
+                                    bmp = Bitmap.createScaledBitmap(
+                                        bmp,
+                                        48,
+                                        48, true
+                                    )
+
+                                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                                }
+                            } catch (ex: IllegalArgumentException) {
+                                Log.e("Picasso", ex.toString())
                             }
-                        } catch (ex: IllegalArgumentException) {
-                            Log.e("Picasso", ex.toString())
-                        }
 
-                        val volleyQueue = Volley.newRequestQueue(baseContext)
-
-                        val jsonObjectRequest = JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
-
-                            { response ->
-                                Log.i("HTTPRequest", response.toString())
-                                twoFronters = response!!.get("multiple") as Boolean
-
-                                if (twoFronters) {
-                                    val target = object : Target {
-                                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                                            try {
-                                                if (bitmap != null) {
-                                                    bmp2 = bitmap
-                                                    bmp2 = Bitmap.createScaledBitmap(
-                                                        bmp2,
-                                                        48,
-                                                        48, true
-                                                    )
+                            val volleyQueue = Volley.newRequestQueue(baseContext)
+
+                            val jsonObjectRequest = JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
+
+                                { response ->
+                                    Log.i("HTTPRequest", response.toString())
+                                    twoFronters = response!!.get("multiple") as Boolean
+
+                                    if (twoFronters) {
+                                        val target = object : Target {
+                                            override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                                                try {
+                                                    if (bitmap != null) {
+                                                        bmp2 = bitmap
+                                                        bmp2 = Bitmap.createScaledBitmap(
+                                                            bmp2,
+                                                            48,
+                                                            48, true
+                                                        )
+                                                    }
+                                                } catch (ex: IllegalArgumentException) {
+                                                    Log.e("Picasso", ex.toString())
                                                 }
-                                            } catch (ex: IllegalArgumentException) {
-                                                Log.e("Picasso", ex.toString())
                                             }
-                                        }
 
-                                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                                            Log.e("Picasso", e.toString())
+                                            override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                                                Log.e("Picasso", e.toString())
+                                            }
+
+                                            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                                         }
 
-                                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
+                                        Picasso.get().load(
+                                            "https://ponies.equestria.horse/api/raindrops-img2-round"
+                                        ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                                     }
+                                },
 
-                                    Picasso.get().load(
-                                        "https://ponies.equestria.horse/api/raindrops-img2-round"
-                                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-                                }
-                            },
+                                { error -> Log.e("HTTPRequest", "Request error: ${error.localizedMessage}") })
 
-                            { error -> Log.e("HTTPRequest", "Request error: ${error.localizedMessage}") })
+                            volleyQueue.add(jsonObjectRequest)
+                        }
 
-                        volleyQueue.add(jsonObjectRequest)
-                    }
+                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                            Log.e("Picasso", e.toString())
+                        }
 
-                    override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                        Log.e("Picasso", e.toString())
+                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                     }
 
-                    override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
-                }
-
-                Picasso.get().load(
-                    "https://ponies.equestria.horse/api/raindrops-img-round"
-                ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-            } else {
-                if (twoFronters) {
-                    canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 49f, mBackgroundPaint)
-                    canvas.drawBitmap(bmp, mCenterX - 102f/2f, 49f, mBackgroundPaint)
+                    Picasso.get().load(
+                        "https://ponies.equestria.horse/api/raindrops-img-round"
+                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                 } else {
-                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                    if (twoFronters) {
+                        canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 49f, mBackgroundPaint)
+                        canvas.drawBitmap(bmp, mCenterX - 102f/2f, 49f, mBackgroundPaint)
+                    } else {
+                        canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/dev/equestria/ponywatch/FeathersFace.kt b/app/src/main/java/dev/equestria/ponywatch/FeathersFace.kt
index 31ab928..1d1ea55 100644
--- a/app/src/main/java/dev/equestria/ponywatch/FeathersFace.kt
+++ b/app/src/main/java/dev/equestria/ponywatch/FeathersFace.kt
@@ -351,97 +351,99 @@ class FeathersFace : CanvasWatchFaceService() {
 
             canvas.drawText("$hs:$ms", (canvas.width / 2).toFloat(), 150f, paint)
 
-            if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
-                lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
-
-                val target = object : Target {
-                    override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                        try {
-                            if (bitmap != null) {
-                                bmp = bitmap
-                                bmp = Bitmap.createScaledBitmap(
-                                    bmp,
-                                    48,
-                                    48, true
-                                )
-
-                                canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+            if (BuildConfig.ENABLE_PLURALITY) {
+                if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
+                    lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
+
+                    val target = object : Target {
+                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                            try {
+                                if (bitmap != null) {
+                                    bmp = bitmap
+                                    bmp = Bitmap.createScaledBitmap(
+                                        bmp,
+                                        48,
+                                        48, true
+                                    )
+
+                                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                                }
+                            } catch (ex: IllegalArgumentException) {
+                                Log.e("Picasso", ex.toString())
                             }
-                        } catch (ex: IllegalArgumentException) {
-                            Log.e("Picasso", ex.toString())
-                        }
 
-                        val volleyQueue = Volley.newRequestQueue(baseContext)
-
-                        val jsonObjectRequest =
-                            JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
-
-                                { response ->
-                                    Log.i("HTTPRequest", response.toString())
-                                    twoFronters = response!!.get("multiple") as Boolean
-
-                                    if (twoFronters) {
-                                        val target = object : Target {
-                                            override fun onBitmapLoaded(
-                                                bitmap: Bitmap?,
-                                                from: Picasso.LoadedFrom?
-                                            ) {
-                                                try {
-                                                    if (bitmap != null) {
-                                                        bmp2 = bitmap
-                                                        bmp2 = Bitmap.createScaledBitmap(
-                                                            bmp2,
-                                                            48,
-                                                            48, true
-                                                        )
+                            val volleyQueue = Volley.newRequestQueue(baseContext)
+
+                            val jsonObjectRequest =
+                                JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
+
+                                    { response ->
+                                        Log.i("HTTPRequest", response.toString())
+                                        twoFronters = response!!.get("multiple") as Boolean
+
+                                        if (twoFronters) {
+                                            val target = object : Target {
+                                                override fun onBitmapLoaded(
+                                                    bitmap: Bitmap?,
+                                                    from: Picasso.LoadedFrom?
+                                                ) {
+                                                    try {
+                                                        if (bitmap != null) {
+                                                            bmp2 = bitmap
+                                                            bmp2 = Bitmap.createScaledBitmap(
+                                                                bmp2,
+                                                                48,
+                                                                48, true
+                                                            )
+                                                        }
+                                                    } catch (ex: IllegalArgumentException) {
+                                                        Log.e("Picasso", ex.toString())
                                                     }
-                                                } catch (ex: IllegalArgumentException) {
-                                                    Log.e("Picasso", ex.toString())
                                                 }
-                                            }
 
-                                            override fun onBitmapFailed(
-                                                e: Exception?,
-                                                errorDrawable: Drawable?
-                                            ) {
-                                                Log.e("Picasso", e.toString())
+                                                override fun onBitmapFailed(
+                                                    e: Exception?,
+                                                    errorDrawable: Drawable?
+                                                ) {
+                                                    Log.e("Picasso", e.toString())
+                                                }
+
+                                                override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                                             }
 
-                                            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
+                                            Picasso.get().load(
+                                                "https://ponies.equestria.horse/api/raindrops-img2-round"
+                                            ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                                         }
+                                    },
 
-                                        Picasso.get().load(
-                                            "https://ponies.equestria.horse/api/raindrops-img2-round"
-                                        ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-                                    }
-                                },
+                                    { error ->
+                                        Log.e(
+                                            "HTTPRequest",
+                                            "Request error: ${error.localizedMessage}"
+                                        )
+                                    })
 
-                                { error ->
-                                    Log.e(
-                                        "HTTPRequest",
-                                        "Request error: ${error.localizedMessage}"
-                                    )
-                                })
+                            volleyQueue.add(jsonObjectRequest)
+                        }
 
-                        volleyQueue.add(jsonObjectRequest)
-                    }
+                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                            Log.e("Picasso", e.toString())
+                        }
 
-                    override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                        Log.e("Picasso", e.toString())
+                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                     }
 
-                    override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
-                }
-
-                Picasso.get().load(
-                    "https://ponies.equestria.horse/api/raindrops-img-round"
-                ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-            } else {
-                if (twoFronters) {
-                    canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 20f, mBackgroundPaint)
-                    canvas.drawBitmap(bmp, mCenterX - 102f/2f, 20f, mBackgroundPaint)
+                    Picasso.get().load(
+                        "https://ponies.equestria.horse/api/raindrops-img-round"
+                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                 } else {
-                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 20f, mBackgroundPaint)
+                    if (twoFronters) {
+                        canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 20f, mBackgroundPaint)
+                        canvas.drawBitmap(bmp, mCenterX - 102f/2f, 20f, mBackgroundPaint)
+                    } else {
+                        canvas.drawBitmap(bmp, mCenterX - 48f/2f, 20f, mBackgroundPaint)
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/dev/equestria/ponywatch/GlitterFace.kt b/app/src/main/java/dev/equestria/ponywatch/GlitterFace.kt
index db2fe53..bf2ed58 100644
--- a/app/src/main/java/dev/equestria/ponywatch/GlitterFace.kt
+++ b/app/src/main/java/dev/equestria/ponywatch/GlitterFace.kt
@@ -351,97 +351,99 @@ class GlitterFace : CanvasWatchFaceService() {
 
             canvas.drawText("$hs:$ms", (canvas.width / 2).toFloat(), 150f, paint)
 
-            if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
-                lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
-
-                val target = object : Target {
-                    override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                        try {
-                            if (bitmap != null) {
-                                bmp = bitmap
-                                bmp = Bitmap.createScaledBitmap(
-                                    bmp,
-                                    48,
-                                    48, true
-                                )
-
-                                canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+            if (BuildConfig.ENABLE_PLURALITY) {
+                if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
+                    lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
+
+                    val target = object : Target {
+                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                            try {
+                                if (bitmap != null) {
+                                    bmp = bitmap
+                                    bmp = Bitmap.createScaledBitmap(
+                                        bmp,
+                                        48,
+                                        48, true
+                                    )
+
+                                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                                }
+                            } catch (ex: IllegalArgumentException) {
+                                Log.e("Picasso", ex.toString())
                             }
-                        } catch (ex: IllegalArgumentException) {
-                            Log.e("Picasso", ex.toString())
-                        }
 
-                        val volleyQueue = Volley.newRequestQueue(baseContext)
-
-                        val jsonObjectRequest =
-                            JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
-
-                                { response ->
-                                    Log.i("HTTPRequest", response.toString())
-                                    twoFronters = response!!.get("multiple") as Boolean
-
-                                    if (twoFronters) {
-                                        val target = object : Target {
-                                            override fun onBitmapLoaded(
-                                                bitmap: Bitmap?,
-                                                from: Picasso.LoadedFrom?
-                                            ) {
-                                                try {
-                                                    if (bitmap != null) {
-                                                        bmp2 = bitmap
-                                                        bmp2 = Bitmap.createScaledBitmap(
-                                                            bmp2,
-                                                            48,
-                                                            48, true
-                                                        )
+                            val volleyQueue = Volley.newRequestQueue(baseContext)
+
+                            val jsonObjectRequest =
+                                JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
+
+                                    { response ->
+                                        Log.i("HTTPRequest", response.toString())
+                                        twoFronters = response!!.get("multiple") as Boolean
+
+                                        if (twoFronters) {
+                                            val target = object : Target {
+                                                override fun onBitmapLoaded(
+                                                    bitmap: Bitmap?,
+                                                    from: Picasso.LoadedFrom?
+                                                ) {
+                                                    try {
+                                                        if (bitmap != null) {
+                                                            bmp2 = bitmap
+                                                            bmp2 = Bitmap.createScaledBitmap(
+                                                                bmp2,
+                                                                48,
+                                                                48, true
+                                                            )
+                                                        }
+                                                    } catch (ex: IllegalArgumentException) {
+                                                        Log.e("Picasso", ex.toString())
                                                     }
-                                                } catch (ex: IllegalArgumentException) {
-                                                    Log.e("Picasso", ex.toString())
                                                 }
-                                            }
 
-                                            override fun onBitmapFailed(
-                                                e: Exception?,
-                                                errorDrawable: Drawable?
-                                            ) {
-                                                Log.e("Picasso", e.toString())
+                                                override fun onBitmapFailed(
+                                                    e: Exception?,
+                                                    errorDrawable: Drawable?
+                                                ) {
+                                                    Log.e("Picasso", e.toString())
+                                                }
+
+                                                override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                                             }
 
-                                            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
+                                            Picasso.get().load(
+                                                "https://ponies.equestria.horse/api/raindrops-img2-round"
+                                            ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                                         }
+                                    },
 
-                                        Picasso.get().load(
-                                            "https://ponies.equestria.horse/api/raindrops-img2-round"
-                                        ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-                                    }
-                                },
+                                    { error ->
+                                        Log.e(
+                                            "HTTPRequest",
+                                            "Request error: ${error.localizedMessage}"
+                                        )
+                                    })
 
-                                { error ->
-                                    Log.e(
-                                        "HTTPRequest",
-                                        "Request error: ${error.localizedMessage}"
-                                    )
-                                })
+                            volleyQueue.add(jsonObjectRequest)
+                        }
 
-                        volleyQueue.add(jsonObjectRequest)
-                    }
+                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                            Log.e("Picasso", e.toString())
+                        }
 
-                    override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                        Log.e("Picasso", e.toString())
+                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                     }
 
-                    override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
-                }
-
-                Picasso.get().load(
-                    "https://ponies.equestria.horse/api/raindrops-img-round"
-                ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-            } else {
-                if (twoFronters) {
-                    canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 20f, mBackgroundPaint)
-                    canvas.drawBitmap(bmp, mCenterX - 102f/2f, 20f, mBackgroundPaint)
+                    Picasso.get().load(
+                        "https://ponies.equestria.horse/api/raindrops-img-round"
+                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                 } else {
-                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 20f, mBackgroundPaint)
+                    if (twoFronters) {
+                        canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 20f, mBackgroundPaint)
+                        canvas.drawBitmap(bmp, mCenterX - 102f/2f, 20f, mBackgroundPaint)
+                    } else {
+                        canvas.drawBitmap(bmp, mCenterX - 48f/2f, 20f, mBackgroundPaint)
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/dev/equestria/ponywatch/UnityFace.kt b/app/src/main/java/dev/equestria/ponywatch/UnityFace.kt
index 475804d..0dc634f 100644
--- a/app/src/main/java/dev/equestria/ponywatch/UnityFace.kt
+++ b/app/src/main/java/dev/equestria/ponywatch/UnityFace.kt
@@ -514,97 +514,99 @@ class UnityFace : CanvasWatchFaceService() {
 
             canvas.drawText("$hs:$ms", (canvas.width / 2).toFloat(), 40f, paint)
 
-            if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
-                lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
-
-                val target = object : Target {
-                    override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
-                        try {
-                            if (bitmap != null) {
-                                bmp = bitmap
-                                bmp = Bitmap.createScaledBitmap(
-                                    bmp,
-                                    48,
-                                    48, true
-                                )
-
-                                canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+            if (BuildConfig.ENABLE_PLURALITY) {
+                if (mCalendar.get(Calendar.MINUTE) != lastRefreshMinute) {
+                    lastRefreshMinute = mCalendar.get(Calendar.MINUTE)
+
+                    val target = object : Target {
+                        override fun onBitmapLoaded(bitmap: Bitmap?, from: Picasso.LoadedFrom?) {
+                            try {
+                                if (bitmap != null) {
+                                    bmp = bitmap
+                                    bmp = Bitmap.createScaledBitmap(
+                                        bmp,
+                                        48,
+                                        48, true
+                                    )
+
+                                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                                }
+                            } catch (ex: IllegalArgumentException) {
+                                Log.e("Picasso", ex.toString())
                             }
-                        } catch (ex: IllegalArgumentException) {
-                            Log.e("Picasso", ex.toString())
-                        }
 
-                        val volleyQueue = Volley.newRequestQueue(baseContext)
-
-                        val jsonObjectRequest =
-                            JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
-
-                                { response ->
-                                    Log.i("HTTPRequest", response.toString())
-                                    twoFronters = response!!.get("multiple") as Boolean
-
-                                    if (twoFronters) {
-                                        val target = object : Target {
-                                            override fun onBitmapLoaded(
-                                                bitmap: Bitmap?,
-                                                from: Picasso.LoadedFrom?
-                                            ) {
-                                                try {
-                                                    if (bitmap != null) {
-                                                        bmp2 = bitmap
-                                                        bmp2 = Bitmap.createScaledBitmap(
-                                                            bmp2,
-                                                            48,
-                                                            48, true
-                                                        )
+                            val volleyQueue = Volley.newRequestQueue(baseContext)
+
+                            val jsonObjectRequest =
+                                JsonObjectRequest("https://ponies.equestria.horse/api/raindrops-two",
+
+                                    { response ->
+                                        Log.i("HTTPRequest", response.toString())
+                                        twoFronters = response!!.get("multiple") as Boolean
+
+                                        if (twoFronters) {
+                                            val target = object : Target {
+                                                override fun onBitmapLoaded(
+                                                    bitmap: Bitmap?,
+                                                    from: Picasso.LoadedFrom?
+                                                ) {
+                                                    try {
+                                                        if (bitmap != null) {
+                                                            bmp2 = bitmap
+                                                            bmp2 = Bitmap.createScaledBitmap(
+                                                                bmp2,
+                                                                48,
+                                                                48, true
+                                                            )
+                                                        }
+                                                    } catch (ex: IllegalArgumentException) {
+                                                        Log.e("Picasso", ex.toString())
                                                     }
-                                                } catch (ex: IllegalArgumentException) {
-                                                    Log.e("Picasso", ex.toString())
                                                 }
-                                            }
 
-                                            override fun onBitmapFailed(
-                                                e: Exception?,
-                                                errorDrawable: Drawable?
-                                            ) {
-                                                Log.e("Picasso", e.toString())
+                                                override fun onBitmapFailed(
+                                                    e: Exception?,
+                                                    errorDrawable: Drawable?
+                                                ) {
+                                                    Log.e("Picasso", e.toString())
+                                                }
+
+                                                override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                                             }
 
-                                            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
+                                            Picasso.get().load(
+                                                "https://ponies.equestria.horse/api/raindrops-img2-round"
+                                            ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                                         }
+                                    },
 
-                                        Picasso.get().load(
-                                            "https://ponies.equestria.horse/api/raindrops-img2-round"
-                                        ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-                                    }
-                                },
+                                    { error ->
+                                        Log.e(
+                                            "HTTPRequest",
+                                            "Request error: ${error.localizedMessage}"
+                                        )
+                                    })
 
-                                { error ->
-                                    Log.e(
-                                        "HTTPRequest",
-                                        "Request error: ${error.localizedMessage}"
-                                    )
-                                })
+                            volleyQueue.add(jsonObjectRequest)
+                        }
 
-                        volleyQueue.add(jsonObjectRequest)
-                    }
+                        override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
+                            Log.e("Picasso", e.toString())
+                        }
 
-                    override fun onBitmapFailed(e: Exception?, errorDrawable: Drawable?) {
-                        Log.e("Picasso", e.toString())
+                        override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
                     }
 
-                    override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
-                }
-
-                Picasso.get().load(
-                    "https://ponies.equestria.horse/api/raindrops-img-round"
-                ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
-            } else {
-                if (twoFronters) {
-                    canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 49f, mBackgroundPaint)
-                    canvas.drawBitmap(bmp, mCenterX - 102f/2f, 49f, mBackgroundPaint)
+                    Picasso.get().load(
+                        "https://ponies.equestria.horse/api/raindrops-img-round"
+                    ).memoryPolicy(MemoryPolicy.NO_CACHE).into(target)
                 } else {
-                    canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                    if (twoFronters) {
+                        canvas.drawBitmap(bmp2, mCenterX + 6f/2f, 49f, mBackgroundPaint)
+                        canvas.drawBitmap(bmp, mCenterX - 102f/2f, 49f, mBackgroundPaint)
+                    } else {
+                        canvas.drawBitmap(bmp, mCenterX - 48f/2f, 49f, mBackgroundPaint)
+                    }
                 }
             }
         }
diff --git a/build.gradle b/build.gradle
index b2ebb1e..55cb6da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.1' apply false
-    id 'com.android.library' version '7.4.1' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
 }
\ No newline at end of file