Skip to content

Commit c80f074

Browse files
committed
refactor: use clean imports in MainActivity
1 parent a0a2ebb commit c80f074

File tree

3 files changed

+17
-98
lines changed

3 files changed

+17
-98
lines changed

app/src/main/java/com/google/maps/android/rx/demo/MainActivity.kt

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@
1414

1515
package com.google.maps.android.rx.demo
1616

17-
import androidx.activity.enableEdgeToEdge
17+
import android.os.Build
1818
import android.os.Bundle
1919
import android.util.Log
20+
import android.view.WindowManager
2021
import android.widget.Button
2122
import android.widget.Toast
23+
import androidx.activity.enableEdgeToEdge
2224
import androidx.activity.result.contract.ActivityResultContracts
2325
import androidx.appcompat.app.AppCompatActivity
24-
import androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener
26+
import androidx.core.view.ViewCompat
27+
import androidx.core.view.WindowCompat
28+
import androidx.core.view.WindowInsetsCompat
29+
import androidx.core.view.WindowInsetsControllerCompat
2530
import androidx.lifecycle.*
2631
import com.google.android.gms.maps.MapView
2732
import com.google.android.libraries.places.api.Places
@@ -57,27 +62,25 @@ class MainActivity : AppCompatActivity() {
5762
setContentView(R.layout.activity_main)
5863

5964
// 1. Inset Handling: Decor fits system windows = false
60-
androidx.core.view.WindowCompat.setDecorFitsSystemWindows(window, false)
65+
WindowCompat.setDecorFitsSystemWindows(window, false)
6166

6267
// 2 & 3. Visibility & Behavior: Hide bars, transient swipe behavior
63-
val controller = androidx.core.view.WindowCompat.getInsetsController(window, window.decorView)
64-
controller.systemBarsBehavior = androidx.core.view.WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
65-
controller.hide(androidx.core.view.WindowInsetsCompat.Type.systemBars())
68+
val controller = WindowCompat.getInsetsController(window, window.decorView)
69+
controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
70+
controller.hide(WindowInsetsCompat.Type.systemBars())
6671

6772
// 3. Cutout Support: Short edges
68-
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
69-
window.attributes.layoutInDisplayCutoutMode = android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
73+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
74+
window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
7075
}
7176

7277
// 4. Inset Handling: Apply insets to controls
73-
androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.controls_container)) { v, insets ->
74-
val bars = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
78+
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.controls_container)) { v, insets ->
79+
val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
7580
v.setPadding(v.paddingLeft, v.paddingTop, v.paddingRight, bars.bottom + v.paddingBottom)
7681
insets
7782
}
7883

79-
80-
8184
// Initialize Places (provide a valid API key in local.defaults.properties or secrets)
8285
// Note: SDK must be initialized. Usually done in Application class,
8386
// but here confirming if it's initialized or doing it here if simple.
@@ -109,8 +112,8 @@ class MainActivity : AppCompatActivity() {
109112

110113
// Set padding on Google Map to account for cutouts/bars
111114
// We can use the View's root insets to determine safe area
112-
androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(mapView) { _, insets ->
113-
val bars = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.displayCutout() or androidx.core.view.WindowInsetsCompat.Type.systemBars())
115+
ViewCompat.setOnApplyWindowInsetsListener(mapView) { _, insets ->
116+
val bars = insets.getInsets(WindowInsetsCompat.Type.displayCutout() or WindowInsetsCompat.Type.systemBars())
114117
googleMap.setPadding(bars.left, bars.top, bars.right, bars.bottom) // Ensure map controls aren't hidden
115118
insets
116119
}

maps-rx/src/test/java/com/google/maps/android/rx/maps/MapsRxTest.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.

places-rx/src/test/java/com/google/maps/android/rx/places/PlacesRxTest.kt

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)