Skip to content

Move watchface related export files into .watchface folder. #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riggaroo merged 2 commits into from
Sep 22, 2025
Merged

Move watchface related export files into .watchface folder. #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
767f05f
Move watchface related export files into .watchface folder.
riggaroo Sep 17, 2025
16d416a
Merge branch 'main' into riggaroo/move-watchface
riggaroo Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...esults/src/main/java/com/android/developers/androidify/customize/CustomizeExportScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...lts/src/main/java/com/android/developers/androidify/customize/CustomizeExportViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions feature/results/src/main/java/com/android/developers/androidify/customize/CustomizeState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ...oidify/customize/AllDoneWatchFacePanel.kt → ...tomize/watchface/AllDoneWatchFacePanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...droidify/customize/ErrorWatchFacePanel.kt → ...ustomize/watchface/ErrorWatchFacePanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...idify/customize/GuidanceWatchFacePanel.kt → ...omize/watchface/GuidanceWatchFacePanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...idify/customize/InstallAndroidifyPanel.kt → ...omize/watchface/InstallAndroidifyPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...oidify/customize/InstallWatchFacePanel.kt → ...tomize/watchface/InstallWatchFacePanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
) {
Expand Down
2 changes: 1 addition & 1 deletion ...oidify/customize/SendingWatchFacePanel.kt → ...tomize/watchface/SendingWatchFacePanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...droidify/customize/WatchFaceModalSheet.kt → ...ustomize/watchface/WatchFaceModalSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...roidify/customize/WatchFacePanelButton.kt → ...stomize/watchface/WatchFacePanelButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.animateContentSize
import androidx.compose.foundation.BorderStroke
Expand Down
3 changes: 1 addition & 2 deletions ...roidify/customize/WatchFacePreviewItem.kt → ...stomize/watchface/WatchFacePreviewItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.border
import androidx.compose.foundation.clickable
Expand All @@ -31,7 +31,6 @@ import androidx.compose.ui.graphics.ColorMatrix
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.unit.dp
import coil3.compose.AsyncImage
import com.android.developers.androidify.watchface.R
import com.android.developers.androidify.watchface.WatchFaceAsset

@Composable
Expand Down
2 changes: 1 addition & 1 deletion ...dify/customize/WatchFaceSelectionState.kt → ...mize/watchface/WatchFaceSelectionState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 com.android.developers.androidify.watchface.WatchFaceAsset

Expand Down