From f7537e1ce4202693b9047832fb9f8912506c8cf2 Mon Sep 17 00:00:00 2001 From: Ashley Davies Date: Wed, 11 Dec 2024 23:07:23 +0100 Subject: [PATCH] Prepare alpha release --- .github/workflows/integration-test.yml | 1 - .github/workflows/publish-release.yml | 9 ++----- .github/workflows/pull-request.yml | 9 ------- conferences-app/build.gradle.kts | 2 +- .../io/ashdavies/party/events/EventsList.kt | 24 ++++--------------- fastlane/Fastfile | 1 - .../android/en-GB/full_description.txt | 0 .../android/en-GB/short_description.txt | 0 fastlane/metadata/android/en-GB/title.txt | 1 - fastlane/metadata/android/en-GB/video.txt | 0 10 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 fastlane/metadata/android/en-GB/full_description.txt delete mode 100644 fastlane/metadata/android/en-GB/short_description.txt delete mode 100644 fastlane/metadata/android/en-GB/title.txt delete mode 100644 fastlane/metadata/android/en-GB/video.txt diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 16dd7b5af..450553d30 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -44,7 +44,6 @@ jobs: id: gradle_build env: FIREBASE_ANDROID_APP_ID: ${{ secrets.firebase_android_app_id }} -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOOGLE_SERVICE_ACCOUNT_ID: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_ID }} INTEGRATION_API_KEY: ${{ secrets.integration_api_key }} run: ./gradlew cloud-run:integrationTest --console=plain diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 1e815668d..175ea4fae 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -70,20 +70,15 @@ jobs: :conferences-app:bundle \ --console=plain env: -# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }} -# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }} + ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }} + BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }} KEY_STORE_FILE: keystore.jks KEY_STORE_PASSWORD: ${{ steps.op-secrets.outputs.KEYSTORE_PASSWORD }} RELEASE_KEY_ALIAS: ${{ steps.op-secrets.outputs.KEY_ALIAS }} RELEASE_KEY_PASSWORD: ${{ steps.op-secrets.outputs.KEY_PASSWORD }} -# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }} VERSION_CODE: ${{ steps.version-code.outputs.VERSION_CODE }} - run: ./gradlew validateScreenshotTest --console=plain -# env: -# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }} -# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }} -# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }} - uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index b6e204872..bcf9d07b3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -58,18 +58,9 @@ jobs: - id: gradle run: ./gradlew build --console=plain -# env: -# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }} -# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }} -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }} - id: screenshot-validation run: ./gradlew validateScreenshotTest --console=plain -# env: -# ANDROID_API_KEY: ${{ secrets.ANDROID_API_KEY }} -# BROWSER_API_KEY: ${{ secrets.BROWSER_API_KEY }} -# SERVER_CLIENT_ID: ${{ secrets.SERVER_CLIENT_ID }} - uses: actions/upload-artifact@v4 if: failure() && steps.screenshot-validation.outcome == 'failure' diff --git a/conferences-app/build.gradle.kts b/conferences-app/build.gradle.kts index 7d432da0d..391cf194e 100644 --- a/conferences-app/build.gradle.kts +++ b/conferences-app/build.gradle.kts @@ -72,7 +72,7 @@ android { versionCode = value?.toInt() ?: 1 } - versionName = "1.0.0" + versionName = "1.0.0-$versionCode" } dependencies { diff --git a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/EventsList.kt b/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/EventsList.kt index 48ce5e124..ae1e0a682 100644 --- a/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/EventsList.kt +++ b/conferences-app/src/commonMain/kotlin/io/ashdavies/party/events/EventsList.kt @@ -22,8 +22,6 @@ import androidx.compose.material3.SuggestionChip import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.pulltorefresh.PullToRefreshBox -import androidx.compose.material3.windowsizeclass.WindowSizeClass -import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -137,7 +135,6 @@ private fun EventSection( private fun EventSectionContent( event: Event?, modifier: Modifier = Modifier, - windowClassSize: WindowSizeClass = LocalWindowSizeClass.current, ) { Box(modifier.height(IntrinsicSize.Min)) { if (event?.imageUrl != null) { @@ -162,15 +159,6 @@ private fun EventSectionContent( text = event?.name, style = MaterialTheme.typography.headlineSmall, ) - - if (windowClassSize.widthSizeClass == WindowWidthSizeClass.Expanded) { - EventStatusChips( - cfpSite = event?.cfpSite, - cfpEnd = event?.cfpEnd, - isOnlineOnly = event?.online == true, - modifier = Modifier.padding(start = 12.dp), - ) - } } PlaceholderText( @@ -179,13 +167,11 @@ private fun EventSectionContent( style = MaterialTheme.typography.titleSmall, ) - if (windowClassSize.widthSizeClass == WindowWidthSizeClass.Compact) { - EventStatusChips( - cfpSite = event?.cfpSite, - cfpEnd = event?.cfpEnd, - isOnlineOnly = event?.online == true, - ) - } + EventStatusChips( + cfpSite = event?.cfpSite, + cfpEnd = event?.cfpEnd, + isOnlineOnly = event?.online == true, + ) } if (event?.dateStart != null) { diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 136498d68..9f0c88e71 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -4,7 +4,6 @@ platform :android do lane :publish_to_play_store do upload_to_play_store( package_name: "io.ashdavies.playground", - release_status: "draft", track: "internal", json_key: "conferences-app/src/androidMain/play-store-key.json", aab: "conferences-app/build/outputs/bundle/release/conferences-app-release.aab", diff --git a/fastlane/metadata/android/en-GB/full_description.txt b/fastlane/metadata/android/en-GB/full_description.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/fastlane/metadata/android/en-GB/short_description.txt b/fastlane/metadata/android/en-GB/short_description.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/fastlane/metadata/android/en-GB/title.txt b/fastlane/metadata/android/en-GB/title.txt deleted file mode 100644 index accd5c2e5..000000000 --- a/fastlane/metadata/android/en-GB/title.txt +++ /dev/null @@ -1 +0,0 @@ -Playground \ No newline at end of file diff --git a/fastlane/metadata/android/en-GB/video.txt b/fastlane/metadata/android/en-GB/video.txt deleted file mode 100644 index e69de29bb..000000000