From 614c778ab60fc0c714196810b0861c1c9dfb92cd Mon Sep 17 00:00:00 2001 From: Spud <10385195+yeSpud@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:09:15 -0800 Subject: [PATCH 1/3] Fixed themeing from being applied to FABs --- app/src/main/AndroidManifest.xml | 4 +-- .../activities/mapsactivity/MapsActivity.kt | 33 +++++++++++++------ .../activities/mapsactivity/MapsViewModel.kt | 19 +++++++++++ app/src/main/res/drawable/routes_icon.xml | 2 +- app/src/main/res/layout/activity_maps.xml | 2 ++ app/src/main/res/values/styles.xml | 15 +++++---- 6 files changed, 55 insertions(+), 20 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0c136f1..ce4ee6f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,14 +38,14 @@ android:label="@string/settings" android:launchMode="standard" android:screenOrientation="portrait" - android:theme="@style/AppThemeNoActionBar" + android:theme="@style/AppTheme" tools:ignore="LockedOrientationActivity" /> diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt index afd22ab..64fc5f8 100644 --- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt +++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt @@ -1,16 +1,17 @@ package fnsb.macstransit.activities.mapsactivity +import android.graphics.Color +import androidx.core.graphics.Insets import android.os.Bundle import fnsb.macstransit.routematch.Route -import fnsb.macstransit.settings.V2 import fnsb.macstransit.R import android.util.Log import android.view.Gravity -import android.view.Menu import android.view.ViewGroup +import androidx.activity.SystemBarStyle +import androidx.activity.enableEdgeToEdge import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat -import androidx.core.view.updatePadding import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle import androidx.lifecycle.ViewModelProvider @@ -47,15 +48,25 @@ class MapsActivity: FragmentActivity() { lateinit var routeMenu: DialogPlus + lateinit var binding: ActivityMapsBinding + + var bars: Insets? = null + override fun onCreate(savedInstanceState: Bundle?) { Log.v("onCreate", "onCreate has been called!") + + // https://stackoverflow.com/questions/76960994/enableedgetoedge-navigation-system-bar-is-not-fully-transparent + enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT), + navigationBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT) // light causes internally enforce the navigation bar to be fully transparent + ) super.onCreate(savedInstanceState) // Setup view model. viewModel = ViewModelProvider(this)[MapsViewModel::class.java] // Setup binding. - val binding: ActivityMapsBinding = ActivityMapsBinding.inflate(layoutInflater) + binding = ActivityMapsBinding.inflate(layoutInflater) binding.viewmodel = viewModel binding.lifecycleOwner = this binding.activity = this @@ -90,18 +101,20 @@ class MapsActivity: FragmentActivity() { Log.v("onCreate", "Setting up fare window") farePopupWindow = FarePopupWindow(this) - ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets -> + + + ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, insets -> val bars = insets.getInsets( WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout() ) + binding.buttons.setPadding(bars.left,bars.top, bars.right, bars.bottom) + this.bars = bars + /* view.updatePadding( - left = bars.left, - top = bars.top, - right = bars.right, - bottom = bars.bottom - ) + + )*/ WindowInsetsCompat.CONSUMED } diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt index 4e2613d..ccd5d86 100644 --- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt +++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt @@ -2,6 +2,8 @@ package fnsb.macstransit.activities.mapsactivity import android.app.Application import android.util.Log +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat import androidx.lifecycle.viewModelScope import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.model.BitmapDescriptor @@ -149,6 +151,23 @@ class MapsViewModel(application: Application): androidx.lifecycle.AndroidViewMod Log.v("MapCoroutine", "Awaiting map...") val map = supportFragment.awaitMap() + val insets = activity.bars + if (insets != null) { + map.setPadding(insets.left,insets.top, insets.right, insets.bottom) + } + + /* + ViewCompat.setOnApplyWindowInsetsListener(activity.binding.root) { _, insets -> + val bars = insets.getInsets( + WindowInsetsCompat.Type.systemBars() + or WindowInsetsCompat.Type.displayCutout() + ) + + activity.binding.buttons.setPadding(bars.left,bars.top, bars.right, bars.bottom) + + WindowInsetsCompat.CONSUMED + }*/ + // Move the camera to the 'home' position. Log.v("MapCoroutine", "Moving camera to home position") map.moveCamera(com.google.android.gms.maps.CameraUpdateFactory.newLatLngZoom( diff --git a/app/src/main/res/drawable/routes_icon.xml b/app/src/main/res/drawable/routes_icon.xml index d1ad171..9265bff 100644 --- a/app/src/main/res/drawable/routes_icon.xml +++ b/app/src/main/res/drawable/routes_icon.xml @@ -8,7 +8,7 @@ android:fillColor="#FF0000"/> + android:fillColor="#FFFF00"/> diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml index b9b788a..29e2888 100644 --- a/app/src/main/res/layout/activity_maps.xml +++ b/app/src/main/res/layout/activity_maps.xml @@ -25,6 +25,7 @@ tools:context=".activities.mapsactivity.MapsActivity" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 80342a7..6fb255d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,18 +1,19 @@ - - + + + + + + + From 5ef097af225ccb0c6c4d9e7c6c6401e79b66d6a9 Mon Sep 17 00:00:00 2001 From: Spud <10385195+yeSpud@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:11:45 -0800 Subject: [PATCH 2/3] Cleaned up code --- .../activities/mapsactivity/MapsActivity.kt | 7 ------- .../activities/mapsactivity/MapsViewModel.kt | 14 -------------- app/src/main/res/values/styles.xml | 8 -------- 3 files changed, 29 deletions(-) diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt index 64fc5f8..76b3c75 100644 --- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt +++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsActivity.kt @@ -101,8 +101,6 @@ class MapsActivity: FragmentActivity() { Log.v("onCreate", "Setting up fare window") farePopupWindow = FarePopupWindow(this) - - ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, insets -> val bars = insets.getInsets( WindowInsetsCompat.Type.systemBars() @@ -111,10 +109,6 @@ class MapsActivity: FragmentActivity() { binding.buttons.setPadding(bars.left,bars.top, bars.right, bars.bottom) this.bars = bars - /* - view.updatePadding( - - )*/ WindowInsetsCompat.CONSUMED } @@ -225,6 +219,5 @@ class MapsActivity: FragmentActivity() { * This will be set to true coming out of SplashActivity */ var firstRun: Boolean = true - } } diff --git a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt index ccd5d86..6836676 100644 --- a/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt +++ b/app/src/main/java/fnsb/macstransit/activities/mapsactivity/MapsViewModel.kt @@ -2,8 +2,6 @@ package fnsb.macstransit.activities.mapsactivity import android.app.Application import android.util.Log -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.lifecycle.viewModelScope import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.model.BitmapDescriptor @@ -156,18 +154,6 @@ class MapsViewModel(application: Application): androidx.lifecycle.AndroidViewMod map.setPadding(insets.left,insets.top, insets.right, insets.bottom) } - /* - ViewCompat.setOnApplyWindowInsetsListener(activity.binding.root) { _, insets -> - val bars = insets.getInsets( - WindowInsetsCompat.Type.systemBars() - or WindowInsetsCompat.Type.displayCutout() - ) - - activity.binding.buttons.setPadding(bars.left,bars.top, bars.right, bars.bottom) - - WindowInsetsCompat.CONSUMED - }*/ - // Move the camera to the 'home' position. Log.v("MapCoroutine", "Moving camera to home position") map.moveCamera(com.google.android.gms.maps.CameraUpdateFactory.newLatLngZoom( diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6fb255d..c8d43b8 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,12 +8,4 @@ @color/colorAccent - - - - - - - - From 5caaabb8c5db7da4eb28cef63a7a5e4c5f6734c4 Mon Sep 17 00:00:00 2001 From: Spud <10385195+yeSpud@users.noreply.github.com> Date: Wed, 26 Nov 2025 13:13:04 -0800 Subject: [PATCH 3/3] Bump version numbers --- app/build.gradle | 4 ++-- whatsnew/whatsnew-en-US | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dcd072c..37bf1d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "fnsb.macstransit" minSdk 27 targetSdk 36 - versionCode 34 - versionName 'Release 1.5' + versionCode 35 + versionName 'Release 1.5.1' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US index 88d5b90..c2e2273 100644 --- a/whatsnew/whatsnew-en-US +++ b/whatsnew/whatsnew-en-US @@ -1 +1,2 @@ -+ Created a completely new menu for selecting routes \ No newline at end of file ++ Created a completely new menu for selecting routes +* Adjusted app styling \ No newline at end of file