Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,26 @@ on:
pull_request:
branches: [ main ]

permissions:
contents: read

jobs:
build:
name: Build & check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
# Actions are pinned to full commit SHAs, as required by the org's zizmor scan.
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0

- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@cf277c60eb25467037889841efdb72551f06f6c3 # v4.9.1
with:
distribution: 'zulu'
java-version: '17'
cache: gradle

- name: Set up Android SDK
uses: android-actions/setup-android@v3
uses: android-actions/setup-android@be39fa834029ff78f1a44aa3bb0819b8fc2bd8fd # v4.0.4

# The project compiles against API 37 (Android 17); install that platform.
- name: Install compileSdk 37 platform
Expand All @@ -49,7 +53,7 @@ jobs:
run: ./gradlew assembleDebug

- name: Upload debug APK
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: app-debug
path: app/build/outputs/apk/debug/app-debug.apk
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# built application files
*.apk
*.ap_
*.aar
aar/


# Mac files
.DS_Store
Expand Down
2 changes: 2 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ dependencies {
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.androidx.material.icons.extended)
implementation(libs.androidx.navigation.compose)

implementation(libs.kotlinx.serialization.json)
implementation(libs.androidx.navigation.runtime.ktx)
implementation(libs.hilt.android)
Expand Down
20 changes: 17 additions & 3 deletions app/src/main/java/com/android/camera/catalog/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,36 @@
*/
package com.android.camera.catalog

import android.graphics.Color
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import com.android.camera.catalog.ui.CatalogApp
import com.android.camera.coretheme.AISampleCatalogTheme
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge(
statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
)
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
AISampleCatalogTheme {
CatalogApp()
AISampleCatalogTheme(darkTheme = true) {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background,
) {
CatalogApp()
}
}
}
}
Expand Down
Loading
Loading