From e8ba97d861743633d8859704d7759cff54f576f9 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 15 May 2022 16:13:46 -0400 Subject: [PATCH] Translucent navigation bar --- .../main/java/be/mygod/vpnhotspot/MainActivity.kt | 13 ++++++++++++- mobile/src/main/res/layout/activity_main.xml | 1 - mobile/src/main/res/values-notnight-v27/colors.xml | 4 ---- mobile/src/main/res/values-v29/colors.xml | 4 ++++ mobile/src/main/res/values/colors.xml | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 mobile/src/main/res/values-notnight-v27/colors.xml create mode 100644 mobile/src/main/res/values-v29/colors.xml diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt index 185381e7..f57f9c20 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt @@ -5,6 +5,10 @@ import android.view.MenuItem import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat +import androidx.core.graphics.Insets +import androidx.core.view.ViewCompat +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope @@ -22,7 +26,6 @@ import be.mygod.vpnhotspot.util.UpdateChecker import be.mygod.vpnhotspot.widget.SmartSnackbar import com.google.android.material.badge.BadgeDrawable import com.google.android.material.navigation.NavigationBarView -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.launch import timber.log.Timber import java.net.Inet4Address @@ -35,6 +38,14 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + WindowCompat.setDecorFitsSystemWindows(window, false) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(android.R.id.content)) { view, insets -> + val statusBarInsets = insets.getInsets(WindowInsetsCompat.Type.statusBars()) + view.setPadding(statusBarInsets.left, statusBarInsets.top, statusBarInsets.right, statusBarInsets.bottom) + WindowInsetsCompat.Builder(insets).apply { + setInsets(WindowInsetsCompat.Type.statusBars(), Insets.NONE) + }.build() + } binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) binding.navigation.setOnItemSelectedListener(this) diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml index e0afe413..aedb7a28 100644 --- a/mobile/src/main/res/layout/activity_main.xml +++ b/mobile/src/main/res/layout/activity_main.xml @@ -32,7 +32,6 @@ android:id="@+id/navigation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/windowBackground" app:menu="@menu/navigation"/> diff --git a/mobile/src/main/res/values-notnight-v27/colors.xml b/mobile/src/main/res/values-notnight-v27/colors.xml deleted file mode 100644 index da37fa17..00000000 --- a/mobile/src/main/res/values-notnight-v27/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - @android:color/white - diff --git a/mobile/src/main/res/values-v29/colors.xml b/mobile/src/main/res/values-v29/colors.xml new file mode 100644 index 00000000..e6a17f31 --- /dev/null +++ b/mobile/src/main/res/values-v29/colors.xml @@ -0,0 +1,4 @@ + + + @android:color/transparent + diff --git a/mobile/src/main/res/values/colors.xml b/mobile/src/main/res/values/colors.xml index 329530c6..9e294101 100644 --- a/mobile/src/main/res/values/colors.xml +++ b/mobile/src/main/res/values/colors.xml @@ -6,5 +6,5 @@ @color/light_colorPrimary #087f23 #AEEA00 - @android:color/black + #6000