Merge pull request #138 from android/riggaroo/move-watchface

Move watchface related export files into .watchface folder.

Author: riggaroo

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt

@@ -69,6 +69,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
+import com.android.developers.androidify.customize.watchface.WatchFaceModalSheet
 import com.android.developers.androidify.results.PermissionRationaleDialog
 import com.android.developers.androidify.results.R
 import com.android.developers.androidify.results.shareImage

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.Modifier
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import com.android.developers.androidify.RemoteConfigDataSource
+import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
 import com.android.developers.androidify.data.ImageGenerationRepository
 import com.android.developers.androidify.util.LocalFileProvider
 import com.android.developers.androidify.watchface.WatchFaceAsset

feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt

@@ -21,6 +21,7 @@ import androidx.annotation.DrawableRes
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
+import com.android.developers.androidify.customize.watchface.WatchFaceSelectionState
 import com.android.developers.androidify.wear.common.ConnectedWatch
 import com.android.developers.androidify.wear.common.WatchFaceInstallationStatus
 

feature/results/src/main/java/com/android/developers/androidify/customize/AllDoneWatchFacePanel.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/AllDoneWatchFacePanel.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

feature/results/src/main/java/com/android/developers/androidify/customize/ErrorWatchFacePanel.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/ErrorWatchFacePanel.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

feature/results/src/main/java/com/android/developers/androidify/customize/GuidanceWatchFacePanel.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/GuidanceWatchFacePanel.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

feature/results/src/main/java/com/android/developers/androidify/customize/InstallAndroidifyPanel.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallAndroidifyPanel.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import android.content.Intent
 import androidx.compose.foundation.layout.Arrangement

feature/results/src/main/java/com/android/developers/androidify/customize/InstallWatchFacePanel.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/InstallWatchFacePanel.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -115,12 +115,12 @@ private fun InstallWatchFacePanelPreview() {
 @Composable
 fun WatchFacesRow(
     watchFaces: List<WatchFaceAsset>,
+    modifier: Modifier = Modifier,
     selectedWatchFace: WatchFaceAsset? = null,
     onWatchFaceSelect: (WatchFaceAsset) -> Unit = {},
-    modifier: Modifier = Modifier,
 ) {
     LazyRow(
-        modifier = Modifier,
+        modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         contentPadding = PaddingValues(horizontal = 8.dp),
     ) {

feature/results/src/main/java/com/android/developers/androidify/customize/SendingWatchFacePanel.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/SendingWatchFacePanel.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

feature/results/src/main/java/com/android/developers/androidify/customize/WatchFaceModalSheet.kt renamed to feature/results/src/main/java/com/android/developers/androidify/customize/watchface/WatchFaceModalSheet.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.developers.androidify.customize
+package com.android.developers.androidify.customize.watchface
 
 import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.ContentTransform