From 8f637ef7737857591f4ab56848b3218b3656edc6 Mon Sep 17 00:00:00 2001 From: Darren VanBuren Date: Sat, 29 Feb 2020 02:25:24 -0800 Subject: [PATCH] Make sure Lollipop+ devices use black navigation bars Upgrade Gradle again --- .../java/net/theoks/customstreams/android/MainActivity.kt | 4 ++++ .../java/net/theoks/customstreams/android/PlayerActivity.kt | 5 +++++ build.gradle | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/theoks/customstreams/android/MainActivity.kt b/app/src/main/java/net/theoks/customstreams/android/MainActivity.kt index adca119..7c85a06 100644 --- a/app/src/main/java/net/theoks/customstreams/android/MainActivity.kt +++ b/app/src/main/java/net/theoks/customstreams/android/MainActivity.kt @@ -1,5 +1,7 @@ package net.theoks.customstreams.android +import android.graphics.Color +import android.os.Build import android.os.Bundle import com.google.android.material.bottomnavigation.BottomNavigationView import androidx.appcompat.app.AppCompatActivity @@ -12,6 +14,8 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + if (Build.VERSION.SDK_INT >= 21) + window.navigationBarColor = Color.BLACK setContentView(R.layout.activity_main) val navView: BottomNavigationView = findViewById(R.id.nav_view) diff --git a/app/src/main/java/net/theoks/customstreams/android/PlayerActivity.kt b/app/src/main/java/net/theoks/customstreams/android/PlayerActivity.kt index 0716092..9ca9d64 100644 --- a/app/src/main/java/net/theoks/customstreams/android/PlayerActivity.kt +++ b/app/src/main/java/net/theoks/customstreams/android/PlayerActivity.kt @@ -1,6 +1,7 @@ package net.theoks.customstreams.android import android.app.PictureInPictureParams +import android.graphics.Color import android.net.Uri import android.os.Build import android.os.Bundle @@ -20,6 +21,10 @@ class PlayerActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + + if (Build.VERSION.SDK_INT >= 21) + window.navigationBarColor = Color.BLACK + val streamKey = intent.getStringExtra("net.theoks.customstreams.streamkey") if(streamKey == null || streamKey == "") { val duration = Toast.LENGTH_LONG diff --git a/build.gradle b/build.gradle index bb118a0..a706027 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0' + classpath 'com.android.tools.build:gradle:3.6.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files