From 08ca25d698f1e88613f3c6553f8ebc74a15df3bc Mon Sep 17 00:00:00 2001 From: Blake Dunn Date: Tue, 11 Jun 2024 21:25:45 -0500 Subject: [PATCH] small tweaks --- .gitignore | 1 + .idea/icon.png | Bin 0 -> 15277 bytes app/src/main/AndroidManifest.xml | 10 ++-- .../ui/components/BottomSheetHeader.kt | 4 +- .../ui/components/RootDestinationAppBar.kt | 10 +++- .../ui/components/SubDestinationAppBar.kt | 10 +++- .../amplify/ui/main/MainActivity.kt | 43 ++++++++++++------ .../amplify/ui/settings/SettingsActivity.kt | 2 +- 8 files changed, 53 insertions(+), 27 deletions(-) create mode 100644 .idea/icon.png diff --git a/.gitignore b/.gitignore index c2810ab..f9be852 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ local.properties # IDEA/Android Studio project files *.iml .idea/* +!.idea/icon.png # Gradle cache .gradle diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7432b615c1e848d2f3efc905c4cdab0487036956 GIT binary patch literal 15277 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 @@ -31,17 +30,14 @@ + android:parentActivityName="com.devdunnapps.amplify.ui.main.MainActivity" /> + android:parentActivityName="com.devdunnapps.amplify.ui.main.MainActivity" /> + android:name=".ui.onboarding.OnBoardingActivity" /> - val action = MobileNavigationDirections.actionGlobalNavigationSongBottomSheet(songId) + val action = + MobileNavigationDirections.actionGlobalNavigationSongBottomSheet(songId) findNavController(binding.navContentFrame).navigate(action) } ) @@ -119,9 +127,13 @@ class MainActivity : AppCompatActivity() { repeatOnLifecycle(Lifecycle.State.STARTED) { viewModel.playbackState.collect { if (it.state == PlaybackStateCompat.STATE_PLAYING) { - val marginInDp = - TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 64f, resources.displayMetrics).toInt() - (binding.navContentFrame.layoutParams as CoordinatorLayout.LayoutParams).setMargins(0, 0, 0, marginInDp) + val marginInDp = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_DIP, + 64f, + resources.displayMetrics + ).toInt() + (binding.navContentFrame.layoutParams as CoordinatorLayout.LayoutParams) + .setMargins(0, 0, 0, marginInDp) binding.bottomSheet.visibility = View.VISIBLE } @@ -138,9 +150,8 @@ class MainActivity : AppCompatActivity() { binding.nowPlayingBoxCollapsed.visibility = View.INVISIBLE } - BottomSheetBehavior.STATE_COLLAPSED -> { + BottomSheetBehavior.STATE_COLLAPSED -> binding.nowPlayingExpanded.visibility = View.INVISIBLE - } else -> Unit } @@ -162,11 +173,17 @@ class MainActivity : AppCompatActivity() { } } - /** - * Draws the main content under the system bars for Android versions 11+ - */ private fun drawUnderSystemBars() { - WindowCompat.setDecorFitsSystemWindows(window, false) + enableEdgeToEdge() + + if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { + ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, windowInsets -> + val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()) + view.setPadding(insets.left, 0, insets.right,0) + + windowInsets + } + } } private fun startOnBoardingIfFirstTime() { diff --git a/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt b/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt index e843626..c02a718 100644 --- a/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt +++ b/app/src/main/java/com/devdunnapps/amplify/ui/settings/SettingsActivity.kt @@ -46,7 +46,7 @@ class SettingsActivity : AppCompatActivity() { uiState = viewModel.uiState.collectAsState().value, onNavigateUpClick = { onBackPressed() }, onChooseThemeClick = viewModel::changeTheme, - onSignOutClick = { handleSignOut() } + onSignOutClick = { handleSignOut() } ) } }