diff --git a/.github/actions/inflate-secrets/action.yml b/.github/actions/inflate-secrets/action.yml index eed33041b..817823169 100644 --- a/.github/actions/inflate-secrets/action.yml +++ b/.github/actions/inflate-secrets/action.yml @@ -28,7 +28,7 @@ runs: KEYSTORE: ${{ inputs.keystore }} run: | echo $KEYSTORE | base64 --decode > app/release_keystore.keystore - echo $KEYSTORE | base64 --decode > wearos_app/release_keystore.keystore + echo $KEYSTORE | base64 --decode > wear/release_keystore.keystore - name: Inflate google-services.json shell: bash @@ -36,7 +36,7 @@ runs: GOOGLE_SERVICES: ${{ inputs.google-services }} run: | echo $GOOGLE_SERVICES > app/google-services.json - echo $GOOGLE_SERVICES > wearos_app/google-services.json + echo $GOOGLE_SERVICES > wear/google-services.json - name: Inflate firebaseAppDistributionServiceCredentialsFile.json shell: bash @@ -51,4 +51,4 @@ runs: CREDS: ${{ inputs.playstore-creds }} run: | echo $CREDS > app/playStorePublishServiceCredentialsFile.json - echo $CREDS > wearos_app/playStorePublishServiceCredentialsFile.json + echo $CREDS > wear/playStorePublishServiceCredentialsFile.json diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 0404b6048..d045e5014 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -85,6 +85,16 @@ jobs: asset_name: home-assistant-minimal-${{steps.rel_number.outputs.version}}.apk asset_content_type: application/zip + - name: Upload Wear APK + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./wear/build/outputs/apk/release/wear-release.apk + asset_name: home-assistant-wear-${{steps.rel_number.outputs.version}}.apk + asset_content_type: application/zip + - name: Deploy to Firebase env: KEYSTORE_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e3a3266ae..041f858a9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,7 +24,9 @@ jobs: ${{ runner.os }}-gradle- - name: Mock google-services.json - run: mv .github/mock-google-services.json app/google-services.json + run: | + cp .github/mock-google-services.json app/google-services.json + cp .github/mock-google-services.json wear/google-services.json - name: Validate ktlint run: ./gradlew ktlintCheck @@ -48,7 +50,9 @@ jobs: ${{ runner.os }}-gradle- - name: Mock google-services.json - run: mv .github/mock-google-services.json app/google-services.json + run: | + cp .github/mock-google-services.json app/google-services.json + cp .github/mock-google-services.json wear/google-services.json - name: Validate Lint run: ./gradlew lint @@ -72,7 +76,9 @@ jobs: ${{ runner.os }}-gradle- - name: Mock google-services.json - run: mv .github/mock-google-services.json app/google-services.json + run: | + cp .github/mock-google-services.json app/google-services.json + cp .github/mock-google-services.json wear/google-services.json - name: Validate Tests run: ./gradlew test @@ -96,7 +102,9 @@ jobs: ${{ runner.os }}-gradle- - name: Mock google-services.json - run: mv .github/mock-google-services.json app/google-services.json + run: | + cp .github/mock-google-services.json app/google-services.json + cp .github/mock-google-services.json wear/google-services.json - name: Build Debug APK run: ./gradlew assembleDebug @@ -104,5 +112,4 @@ jobs: - name: Archive Debug Build uses: kittaakos/upload-artifact-as-is@v0 with: - path: ./app/build/outputs/apk/*/debug/*-debug.apk - + path: ./**/*.apk diff --git a/.gitignore b/.gitignore index 7406a1d56..c10405aac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ .DS_Store local.properties +google-services.json *.iml .idea/ .gradle/ -build/ \ No newline at end of file +build/ diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 3bdaf4eae..000000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -google-services.json diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore deleted file mode 100644 index 4a8da3bce..000000000 --- a/buildSrc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.gradle \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 653e33295..68f9a3d43 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,6 @@ import org.gradle.kotlin.dsl.support.serviceOf -include(":common", ":app", ":wearos_app") +include(":common", ":app", ":wear") rootProject.name = "home-assistant-android" diff --git a/wearos_app/build.gradle.kts b/wear/build.gradle.kts similarity index 100% rename from wearos_app/build.gradle.kts rename to wear/build.gradle.kts diff --git a/wearos_app/proguard-rules.pro b/wear/proguard-rules.pro similarity index 100% rename from wearos_app/proguard-rules.pro rename to wear/proguard-rules.pro diff --git a/wearos_app/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml similarity index 100% rename from wearos_app/src/main/AndroidManifest.xml rename to wear/src/main/AndroidManifest.xml diff --git a/wearos_app/src/main/java/io/homeassistant/companion/android/Home.kt b/wear/src/main/java/io/homeassistant/companion/android/Home.kt similarity index 100% rename from wearos_app/src/main/java/io/homeassistant/companion/android/Home.kt rename to wear/src/main/java/io/homeassistant/companion/android/Home.kt diff --git a/wearos_app/src/main/res/drawable/app_icon.jpg b/wear/src/main/res/drawable/app_icon.jpg similarity index 100% rename from wearos_app/src/main/res/drawable/app_icon.jpg rename to wear/src/main/res/drawable/app_icon.jpg diff --git a/wearos_app/src/main/res/drawable/ic_launcher_background.xml b/wear/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from wearos_app/src/main/res/drawable/ic_launcher_background.xml rename to wear/src/main/res/drawable/ic_launcher_background.xml diff --git a/wearos_app/src/main/res/drawable/ic_launcher_foreground.xml b/wear/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from wearos_app/src/main/res/drawable/ic_launcher_foreground.xml rename to wear/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/wearos_app/src/main/res/layout/activity_home.xml b/wear/src/main/res/layout/activity_home.xml similarity index 100% rename from wearos_app/src/main/res/layout/activity_home.xml rename to wear/src/main/res/layout/activity_home.xml diff --git a/wearos_app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from wearos_app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to wear/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/wearos_app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from wearos_app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to wear/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/wearos_app/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from wearos_app/src/main/res/mipmap-hdpi/ic_launcher.png rename to wear/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/wearos_app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from wearos_app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to wear/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/wearos_app/src/main/res/mipmap-xhdpi/ic_banner.png b/wear/src/main/res/mipmap-xhdpi/ic_banner.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xhdpi/ic_banner.png rename to wear/src/main/res/mipmap-xhdpi/ic_banner.png diff --git a/wearos_app/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to wear/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/wearos_app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/wearos_app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to wear/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/wearos_app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/wearos_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/wearos_app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from wearos_app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/wearos_app/src/main/res/values-night/colors.xml b/wear/src/main/res/values-night/colors.xml similarity index 100% rename from wearos_app/src/main/res/values-night/colors.xml rename to wear/src/main/res/values-night/colors.xml diff --git a/wearos_app/src/main/res/values/colors.xml b/wear/src/main/res/values/colors.xml similarity index 100% rename from wearos_app/src/main/res/values/colors.xml rename to wear/src/main/res/values/colors.xml diff --git a/wearos_app/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml similarity index 100% rename from wearos_app/src/main/res/values/dimens.xml rename to wear/src/main/res/values/dimens.xml diff --git a/wearos_app/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml similarity index 100% rename from wearos_app/src/main/res/values/strings.xml rename to wear/src/main/res/values/strings.xml diff --git a/wearos_app/src/main/res/values/styles.xml b/wear/src/main/res/values/styles.xml similarity index 100% rename from wearos_app/src/main/res/values/styles.xml rename to wear/src/main/res/values/styles.xml