Skip to content

Commit 1dcf0a6

Browse files
dkhawkdkhawk
committed
feat: Updates to the FragmentDemoActivity.kt
Key changes include: - Renamed `activity_main.xml` to `activity_fragment_demo.xml` and added a `TextView` to indicate swipe functionality. - Renamed `MyFragmentPagerAdaptar.kt` to `MapFragmentPagerAdapter.kt` and modified it to dynamically determine the number of fragments based on `mapConfigs`.
1 parent 365748b commit 1dcf0a6

File tree

3 files changed

+56
-46
lines changed

3 files changed

+56
-46
lines changed

‎maps-app/src/main/java/com/google/maps/android/compose/FragmentDemoActivity.kt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package com.google.maps.android.compose
2-
3-
4-
import android.os.Bundle
5-
import androidx.fragment.app.FragmentActivity
6-
import androidx.viewpager2.widget.ViewPager2
7-
8-
class FragmentDemoActivity : FragmentActivity() {
9-
10-
private lateinit var viewPager: ViewPager2
11-
private lateinit var pagerAdapter: MapFragmentPagerAdapter
12-
13-
override fun onCreate(savedInstanceState: Bundle?) {
14-
super.onCreate(savedInstanceState)
15-
setContentView(R.layout.activity_main)
16-
17-
viewPager = findViewById(R.id.view_pager)
18-
19-
pagerAdapter = MapFragmentPagerAdapter(this)
20-
viewPager.adapter = pagerAdapter
21-
22-
}
23-
}
1+
package com.google.maps.android.compose
2+
3+
4+
import android.os.Bundle
5+
import androidx.fragment.app.FragmentActivity
6+
import androidx.viewpager2.widget.ViewPager2
7+
8+
class FragmentDemoActivity : FragmentActivity() {
9+
10+
private lateinit var viewPager: ViewPager2
11+
private lateinit var pagerAdapter: MapFragmentPagerAdapter
12+
13+
override fun onCreate(savedInstanceState: Bundle?) {
14+
super.onCreate(savedInstanceState)
15+
setContentView(R.layout.activity_fragment_demo)
16+
17+
viewPager = findViewById(R.id.view_pager)
18+
19+
pagerAdapter = MapFragmentPagerAdapter(this)
20+
viewPager.adapter = pagerAdapter
21+
22+
}
23+
}

maps-app/src/main/java/com/google/maps/android/compose/MyFragmentPagerAdaptar.kt renamed to maps-app/src/main/java/com/google/maps/android/compose/MapFragmentPagerAdapter.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import androidx.fragment.app.FragmentActivity
55
import androidx.viewpager2.adapter.FragmentStateAdapter
66
import com.google.android.gms.maps.model.LatLng
77

8-
private const val NUM_MAP_FRAGMENTS = 2
9-
108
class MapFragmentPagerAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) {
119

1210
private val mapConfigs = listOf(
@@ -27,9 +25,9 @@ class MapFragmentPagerAdapter(fragmentActivity: FragmentActivity) : FragmentStat
2725
)
2826
)
2927

30-
override fun getItemCount(): Int = NUM_MAP_FRAGMENTS
28+
override fun getItemCount(): Int = mapConfigs.size
3129

3230
override fun createFragment(position: Int): Fragment {
3331
return GoogleMapComposeFragment.newInstance(mapConfigs[position])
3432
}
35-
}
33+
}

maps-app/src/main/res/layout/activity_main.xml renamed to maps-app/src/main/res/layout/activity_fragment_demo.xml

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
xmlns:tools="http://schemas.android.com/tools"
5-
android:id="@+id/container"
6-
android:layout_width="match_parent"
7-
android:layout_height="match_parent"
8-
tools:context=".FragmentDemoActivity">
9-
10-
<androidx.viewpager2.widget.ViewPager2
11-
android:id="@+id/view_pager"
12-
android:layout_width="0dp"
13-
android:layout_height="0dp"
14-
app:layout_constraintBottom_toBottomOf="parent"
15-
app:layout_constraintEnd_toEndOf="parent"
16-
app:layout_constraintStart_toStartOf="parent"
17-
app:layout_constraintTop_toTopOf="parent" />
18-
19-
</androidx.constraintlayout.widget.ConstraintLayout>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
android:id="@+id/container"
6+
android:layout_width="match_parent"
7+
android:layout_height="match_parent"
8+
tools:context=".FragmentDemoActivity">
9+
10+
<androidx.viewpager2.widget.ViewPager2
11+
android:id="@+id/view_pager"
12+
android:layout_width="0dp"
13+
android:layout_height="0dp"
14+
app:layout_constraintBottom_toBottomOf="parent"
15+
app:layout_constraintEnd_toEndOf="parent"
16+
app:layout_constraintStart_toStartOf="parent"
17+
app:layout_constraintTop_toTopOf="parent" />
18+
19+
<TextView
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"
22+
android:layout_margin="16dp"
23+
android:background="#80000000"
24+
android:padding="16dp"
25+
android:text="Swipe to switch between views"
26+
android:textColor="@android:color/white"
27+
app:layout_constraintBottom_toBottomOf="parent"
28+
app:layout_constraintEnd_toEndOf="parent"
29+
app:layout_constraintStart_toStartOf="parent" />
30+
31+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)