Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.
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
1 change: 1 addition & 0 deletions app-catalog/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ dependencies {
def composeBom = platform(libs.compose.bom)
implementation composeBom
androidTestImplementation composeBom
implementation libs.mdc

// CASA UI dependency for the app-module
implementation(project(":framework:ui"))
Expand Down
2 changes: 1 addition & 1 deletion app-catalog/app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
~ limitations under the License.
-->
<resources>
<style name="Theme.Casa" parent="android:Theme.Material.Light.NoActionBar" />
<style name="Theme.Casa" parent="Theme.Material3.DayNight.NoActionBar" />
</resources>
2 changes: 1 addition & 1 deletion framework/ui/api/current.api
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Signature format: 4.0
package com.google.android.catalog.framework.ui {

public class CatalogActivity extends androidx.fragment.app.FragmentActivity {
public class CatalogActivity extends androidx.appcompat.app.AppCompatActivity {
ctor public CatalogActivity();
method public final java.util.Set<com.google.android.catalog.framework.base.CatalogSample> getCatalogSamples();
method public com.google.android.catalog.framework.ui.CatalogSettings getSettings();
Expand Down
1 change: 1 addition & 0 deletions framework/ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ dependencies {

implementation libs.androidx.core
implementation libs.androidx.fragment
implementation libs.mdc
implementation libs.androidx.navigation.compose
implementation libs.compose.ui.ui
implementation libs.compose.material.material3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ package com.google.android.catalog.framework.ui

import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.fragment.app.FragmentActivity
import com.google.android.catalog.framework.base.CatalogSample
import com.google.android.catalog.framework.ui.components.LocalWindowSize
import com.google.android.catalog.framework.ui.theme.CatalogTheme
Expand All @@ -44,7 +44,7 @@ import javax.inject.Inject
* class MainActivity : CatalogActivity()
* ```
*/
open class CatalogActivity : FragmentActivity() {
open class CatalogActivity : AppCompatActivity() {

companion object {
/**
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ androidx-navigation-compose = "androidx.navigation:navigation-compose:2.5.3"

androidx-test-runner = "androidx.test:runner:1.5.2"

mdc = "com.google.android.material:material:1.8.0"

compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
compose-ui-ui = { module = "androidx.compose.ui:ui" }
compose-ui-util = { module = "androidx.compose.ui:ui-util" }
Expand Down