Merge pull request #89 from itszechs/extend_support

Added support for Android 8 (Oreo)
itszechs · Feb 9, 2023 · b4c35f9 · b4c35f9
2 parents 63ad7a9 + 9dbfa48
commit b4c35f9
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,7 +20,7 @@ android {
 
     defaultConfig {
         applicationId "zechs.drive.stream"
-        minSdk 28
+        minSdk 21
         targetSdk 33
         versionCode 8
         versionName "1.2.3"

diff --git a/app/src/main/java/zechs/drive/stream/ui/main/MainActivity.kt b/app/src/main/java/zechs/drive/stream/ui/main/MainActivity.kt
@@ -7,6 +7,7 @@ import android.app.PendingIntent
 import android.content.Intent
 import android.media.RingtoneManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.viewModels
@@ -53,7 +54,9 @@ class MainActivity : AppCompatActivity() {
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        createUpdateNotificationChannel()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            createUpdateNotificationChannel()
+        }
 
         val navHostFragment = supportFragmentManager.findFragmentById(
             R.id.mainNavHostFragment

diff --git a/app/src/main/java/zechs/drive/stream/ui/player/PlayerActivity.kt b/app/src/main/java/zechs/drive/stream/ui/player/PlayerActivity.kt
@@ -5,12 +5,14 @@ import android.app.PictureInPictureParams
 import android.content.Intent
 import android.content.res.Configuration
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.widget.HorizontalScrollView
 import android.widget.LinearLayout
+import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -186,7 +188,17 @@ class PlayerActivity : AppCompatActivity() {
             }
         }
 
-        btnPip.setOnClickListener { enterPIPMode() }
+        btnPip.setOnClickListener {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                enterPIPMode()
+            } else {
+                Toast.makeText(
+                    this,
+                    getString(R.string.pip_not_supported),
+                    Toast.LENGTH_SHORT
+                ).show()
+            }
+        }
 
         btnSpeed.setOnClickListener {
             MaterialAlertDialogBuilder(this).apply {
@@ -469,7 +481,9 @@ class PlayerActivity : AppCompatActivity() {
             Configuration.ORIENTATION_PORTRAIT -> {
                 btnRotate.apply {
                     orientation = Orientation.PORTRAIT
-                    tooltipText = getString(R.string.landscape)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        tooltipText = getString(R.string.landscape)
+                    }
                     icon = ContextCompat.getDrawable(
                         /* context */ this@PlayerActivity,
                         /* drawableId */ R.drawable.ic_landscape_24
@@ -479,7 +493,9 @@ class PlayerActivity : AppCompatActivity() {
             else -> {
                 btnRotate.apply {
                     orientation = Orientation.LANDSCAPE
-                    tooltipText = getString(R.string.portrait)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        tooltipText = getString(R.string.portrait)
+                    }
                     icon = ContextCompat.getDrawable(
                         /* context */ this@PlayerActivity,
                         /* drawableId */ R.drawable.ic_portrait_24

diff --git a/app/src/main/java/zechs/drive/stream/ui/player2/MPVActivity.kt b/app/src/main/java/zechs/drive/stream/ui/player2/MPVActivity.kt
@@ -6,6 +6,7 @@ import android.content.res.Configuration
 import android.media.AudioManager
 import android.media.AudioManager.*
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -453,7 +454,9 @@ class MPVActivity : AppCompatActivity(), MPVLib.EventObserver {
             Configuration.ORIENTATION_PORTRAIT -> {
                 controller.btnRotate.apply {
                     orientation = Orientation.PORTRAIT
-                    tooltipText = getString(R.string.landscape)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        tooltipText = getString(R.string.landscape)
+                    }
                     icon = ContextCompat.getDrawable(
                         /* context */ this@MPVActivity,
                         /* drawableId */ R.drawable.ic_landscape_24
@@ -463,7 +466,9 @@ class MPVActivity : AppCompatActivity(), MPVLib.EventObserver {
             else -> {
                 controller.btnRotate.apply {
                     orientation = Orientation.LANDSCAPE
-                    tooltipText = getString(R.string.portrait)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        tooltipText = getString(R.string.portrait)
+                    }
                     icon = ContextCompat.getDrawable(
                         /* context */ this@MPVActivity,
                         /* drawableId */ R.drawable.ic_portrait_24

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -51,4 +51,5 @@
     <string name="theme_dark">Dark</string>
     <string name="theme_system">Follow system</string>
     <string name="no_files_found">No files found</string>
+    <string name="pip_not_supported">PiP mode is not supported on your device</string>
 </resources>
diff --git a/mpv/build.gradle b/mpv/build.gradle
@@ -7,7 +7,7 @@ android {
     compileSdk 32
 
     defaultConfig {
-        minSdk 28
+        minSdk 21
         targetSdk 32
     }