Pull Request

README.md

@@ -12,3 +12,5 @@ It is not in the app store yet. See [this guide](https://www.reddit.com/r/WearOS
 <img src="https://github.com/agronick/Flattery/assets/2042303/c9ac9c51-7ba8-42c3-8e47-1c4e8c18b1ea" alt="Running on a Galaxy Watch 4" width="250"/>
 
 <img src="https://github.com/agronick/Flattery/assets/2042303/e4caf242-4fb3-4d02-a608-4b793ad48b8d" alt="Reordering" width="250"/>
+<img src="https://github.com/JesusC0der/Flattery/assets/57578170/a1ff84f8-ab70-4755-8eb1-f236eeeb9f8b" width="250"/>
+

app/build.gradle

@@ -18,6 +18,9 @@ android {
         targetSdkVersion 34
         versionCode versionMajor * 100 + versionMinor * 10 + versionPatch
         versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
 
     buildTypes {
@@ -35,6 +38,17 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_19
     }
+    buildFeatures {
+        compose true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.5.1'
+    }
+    packaging {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
 }
 
 dependencies {
@@ -50,5 +64,16 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
 
     implementation 'androidx.wear:wear:1.3.0'
+    implementation platform('androidx.compose:compose-bom:2023.08.00')
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.wear.compose:compose-material:1.2.1'
+    implementation 'androidx.wear.compose:compose-foundation:1.2.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    androidTestImplementation platform('androidx.compose:compose-bom:2023.08.00')
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     compileOnly 'com.google.android.wearable:wearable:2.9.0'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
 }

app/lint.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- Ignore the IconLocation for the Tile preview images -->
+    <issue id="IconLocation">
+        <ignore path="res/drawable/tile_preview.png" />
+        <ignore path="res/drawable-round/tile_preview.png" />
+    </issue>
+</lint>

app/src/main/AndroidManifest.xml

@@ -5,14 +5,15 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <uses-feature android:name="android.hardware.type.watch" />
+
     <uses-permission
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:ignore="QueryAllPackagesPermission" />
 
-
     <application
-        android:name="com.agronick.launcher.Launcher"
+        android:name=".Launcher"
         android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -29,18 +30,43 @@
             android:name="com.google.android.wearable.standalone"
             android:value="true" />
 
+        <activity
+            android:name=".presentation.BackToClock"
+            android:exported="true"
+            android:hardwareAccelerated="true"
+            android:icon="@mipmap/clock"
+            android:label="Clock"
+            android:taskAffinity="com.agronick.launchersettings.presentation.BackToClock"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".presentation.LauncherSettings"
+            android:exported="true"
+            android:hardwareAccelerated="true"
+            android:icon="@mipmap/ic_settings"
+            android:label="Launcher Settings"
+            android:taskAffinity="com.agronick.launchersettings.presentation.LauncherSettings"
+            android:theme="@style/AppTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleInstance"
             android:taskAffinity="com.agronick.launcher"
             android:theme="@style/Theme.Wearable.Modal">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
     </application>
 
 </manifest>

app/src/main/java/com/agronick/launcher/AppListProvider.kt

@@ -16,7 +16,7 @@ import java.io.FileWriter
 class AppListProvider(appList: List<PInfo>, context: Context) {
 
     val positions = HashMap<Int, HashMap<Int, PInfo?>>().withDefault { HashMap() }
-    val filePath = "${context.dataDir}/appPositions2.json"
+    val filePath = "${context.dataDir}/appPositions.json"
     val mapping = appList.map {
         it.asKey() to it
     }.toMap().toMutableMap()

app/src/main/java/com/agronick/launcher/Container.kt

@@ -9,9 +9,9 @@ import kotlin.math.roundToInt
 import kotlin.math.sqrt
 
 class Container(val appList: AppListProvider, density: Float) {
-    val appCircleSize = (StaticValues.normalAppSize * density).roundToInt()
-    val appCircleMargin = (StaticValues.margin * density).roundToInt()
-    private val flatAppList: List<App>
+    var appCircleSize = (StaticValues.normalAppSize * density).roundToInt()
+    var appCircleMargin = (StaticValues.margin * density).roundToInt()
+    val flatAppList: List<App>
     var lastCircle: Circle? = null
 
     var topLimit = 0f
@@ -102,17 +102,17 @@ class Container(val appList: AppListProvider, density: Float) {
         }
     }
 
-    private fun calcPositions(row: Int, col: Int): Pair<Float, Float> {
+    fun calcPositions(row: Int, col: Int): Pair<Float, Float> {
         var left = calcPosition(col) * equalizerOffset
         if (kotlin.math.abs(row) % 2 == 1) {
-            // Add offset for haxagon shape
+            // Add offset for hexagon shape
             left -= appCircleSize + appCircleMargin
         }
-        val top = (row * (appCircleSize * 2) + row * appCircleMargin).toFloat()
+        var top = (row * (appCircleSize * 2) + row * appCircleMargin).toFloat()
         return Pair(left, top)
     }
 
-    private fun calcPosition(num: Int): Float {
+     fun calcPosition(num: Int): Float {
         var pos = ceil(num * 0.5f)
         pos = pos * (appCircleSize * 2) + pos * appCircleMargin
         if (num % 2 == 0) {

app/src/main/java/com/agronick/launcher/MainActivity.kt

@@ -1,21 +1,53 @@
 package com.agronick.launcher
 
+import StaticValues
 import android.app.Activity
 import android.content.ComponentName
 import android.content.Intent
 import android.os.Bundle
 import android.transition.Fade
+import android.util.Log
 import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.Window
 import androidx.core.view.GestureDetectorCompat
+import com.google.android.wearable.input.RotaryEncoderHelper
 
 
 class MainActivity : Activity(), GestureDetector.OnGestureListener {
     private var wasScrolling = false
     private lateinit var mDetector: GestureDetectorCompat
     private lateinit var mainView: MainView
 
+    //Bezel scroll listener and conditional parameters for launcher zoom.
+    override fun onGenericMotionEvent(event: MotionEvent): Boolean {
+
+        if (event.action == MotionEvent.ACTION_SCROLL && RotaryEncoderHelper.isFromRotaryEncoder(event)) {
+
+            val delta = -RotaryEncoderHelper.getRotaryAxisValue(event)
+            Log.d("MainActivity", "Before modification: ${StaticValues.normalAppSize} ${StaticValues.margin}")
+
+            //If bezel is turned clockwise, increase size of icons up to a size of 24.
+            if (delta > 0 && StaticValues.normalAppSize <= 24) {
+               StaticValues.normalAppSize++
+            } else {
+            //If bezel is turned counter-clockwise, decrease size of icons down to a size of 12.
+                if (StaticValues.normalAppSize >= 12) {
+                    StaticValues.normalAppSize--
+                }
+            }
+
+            mainView.updateIconSize(StaticValues.normalAppSize)
+            mainView.updateMarginSize(StaticValues.margin)
+
+            Log.d("MainActivity", "After modification: ${StaticValues.normalAppSize} ${StaticValues.margin}")
+            return true
+
+        }
+        return super.onGenericMotionEvent(event)
+
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         with(window) {
@@ -70,17 +102,38 @@ class MainActivity : Activity(), GestureDetector.OnGestureListener {
     private fun getInstalledApps(): List<PInfo> {
         val mainIntent = Intent(Intent.ACTION_MAIN, null)
         mainIntent.addCategory(Intent.CATEGORY_LAUNCHER)
-        return packageManager.queryIntentActivities(mainIntent, 0).mapNotNull {
-            if (it.activityInfo.packageName.startsWith("com.agronick.launcher")) {
+
+        val appName = applicationContext.packageName
+        val packages = packageManager.queryIntentActivities(mainIntent, 0).mapNotNull {
+            if (it.activityInfo.packageName == appName) {
                 return@mapNotNull null
             }
+
             PInfo(
                 appname = it.activityInfo.packageName,
                 pname = it.activityInfo.packageName,
                 icon = it.activityInfo.loadIcon(packageManager),
                 activityName = it.activityInfo.name,
             )
-        }
+        }.toMutableList()
+
+        packages.add(
+            PInfo(
+                appname = appName,
+                pname = appName,
+                icon = getDrawable(R.mipmap.clock),
+                activityName = "${appName}.presentation.BackToClock",
+            )
+        )
+        packages.add(
+            PInfo(
+                appname = appName,
+                pname = appName,
+                icon = getDrawable(R.mipmap.ic_settings),
+                activityName = "${appName}.presentation.LauncherSettings",
+            )
+        )
+        return packages
     }
 
     override fun onSaveInstanceState(outState: Bundle) {