Skip to content

Commit 9810c90

Browse files
[Crane] Migrate to new edge to edge API (#1220)
Simple migration
2 parents 8cf3301 + 7b1fa7a commit 9810c90

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Crane/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646

4747
<activity
4848
android:name=".home.MainActivity"
49-
android:exported="true">
49+
android:exported="true"
50+
android:windowSoftInputMode="adjustResize">
5051
<intent-filter>
5152
<action android:name="android.intent.action.MAIN" />
5253

@@ -55,7 +56,8 @@
5556
</activity>
5657
<activity
5758
android:name=".details.DetailsActivity"
58-
android:exported="false" />
59+
android:exported="false"
60+
android:windowSoftInputMode="adjustResize" />
5961
</application>
6062

6163
</manifest>

Crane/app/src/main/java/androidx/compose/samples/crane/details/DetailsActivity.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@ package androidx.compose.samples.crane.details
1818

1919
import android.content.Context
2020
import android.content.Intent
21+
import android.graphics.Color
2122
import android.os.Bundle
2223
import android.util.Log
2324
import androidx.activity.ComponentActivity
25+
import androidx.activity.SystemBarStyle
2426
import androidx.activity.compose.setContent
27+
import androidx.activity.enableEdgeToEdge
2528
import androidx.annotation.VisibleForTesting
2629
import androidx.compose.animation.Crossfade
2730
import androidx.compose.foundation.layout.Arrangement
@@ -54,7 +57,6 @@ import androidx.compose.ui.Alignment
5457
import androidx.compose.ui.Modifier
5558
import androidx.compose.ui.text.style.TextAlign
5659
import androidx.compose.ui.unit.dp
57-
import androidx.core.view.WindowCompat
5860
import androidx.lifecycle.viewmodel.compose.viewModel
5961
import com.google.android.gms.maps.CameraUpdateFactory
6062
import com.google.android.gms.maps.model.CameraPosition
@@ -85,10 +87,9 @@ fun createDetailsActivityIntent(context: Context, item: ExploreModel): Intent {
8587
@AndroidEntryPoint
8688
class DetailsActivity : ComponentActivity() {
8789
override fun onCreate(savedInstanceState: Bundle?) {
90+
enableEdgeToEdge(statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT))
8891
super.onCreate(savedInstanceState)
8992

90-
WindowCompat.setDecorFitsSystemWindows(window, false)
91-
9293
setContent {
9394
CraneTheme {
9495
Surface {

Crane/app/src/main/java/androidx/compose/samples/crane/home/MainActivity.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616

1717
package androidx.compose.samples.crane.home
1818

19+
import android.graphics.Color
1920
import android.os.Bundle
2021
import androidx.activity.ComponentActivity
22+
import androidx.activity.SystemBarStyle
2123
import androidx.activity.compose.setContent
24+
import androidx.activity.enableEdgeToEdge
2225
import androidx.annotation.VisibleForTesting
2326
import androidx.compose.animation.core.MutableTransitionState
2427
import androidx.compose.animation.core.Spring.StiffnessLow
@@ -51,7 +54,6 @@ import androidx.compose.ui.Modifier
5154
import androidx.compose.ui.draw.alpha
5255
import androidx.compose.ui.unit.Dp
5356
import androidx.compose.ui.unit.dp
54-
import androidx.core.view.WindowCompat
5557
import androidx.hilt.navigation.compose.hiltViewModel
5658
import androidx.navigation.compose.NavHost
5759
import androidx.navigation.compose.composable
@@ -63,10 +65,9 @@ import dagger.hilt.android.AndroidEntryPoint
6365
class MainActivity : ComponentActivity() {
6466

6567
override fun onCreate(savedInstanceState: Bundle?) {
68+
enableEdgeToEdge(statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT))
6669
super.onCreate(savedInstanceState)
6770

68-
WindowCompat.setDecorFitsSystemWindows(window, false)
69-
7071
setContent {
7172
CraneTheme {
7273
val widthSizeClass = calculateWindowSizeClass(this).widthSizeClass

0 commit comments

Comments
 (0)