Update example

akshaaatt · Feb 8, 2023 · b1d5cbc · b1d5cbc
1 parent db1c434
commit b1d5cbc
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 16 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/app/src/main/java/com/limurse/onboarding/IntroActivity.kt b/app/src/main/java/com/limurse/onboarding/IntroActivity.kt
@@ -1,5 +1,6 @@
 package com.limurse.onboarding
 
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.fragment.app.Fragment
@@ -13,6 +14,25 @@ class IntroActivity : OnboardAdvanced() {
         super.onCreate(savedInstanceState)
 
         setSignInButton(false)
+        isWizardMode = true
+        val permissions = when {
+            Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU -> {
+                listOf(
+                    android.Manifest.permission.ACCESS_COARSE_LOCATION,
+                    android.Manifest.permission.POST_NOTIFICATIONS
+                )
+            }
+            else -> {
+                listOf(android.Manifest.permission.ACCESS_COARSE_LOCATION)
+            }
+        }
+
+        askForPermissions(
+            permissions = permissions.toTypedArray(),
+            slideNumber = 2,
+            required = true
+        )
+
         addSlide(OnboardFragment.newInstance(
             "Welcome!",
             "Ever wondered what was missing in your life?",

diff --git a/onboard/src/main/java/com/limurse/onboard/OnboardAdvanced.kt b/onboard/src/main/java/com/limurse/onboard/OnboardAdvanced.kt
@@ -12,7 +12,7 @@ import androidx.annotation.IdRes
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.google.android.gms.common.SignInButton
 
-abstract class OnboardAdvanced : com.limurse.onboard.OnboardBase() {
+abstract class OnboardAdvanced : OnboardBase() {
 
     override val layoutId = R.layout.onboard_intro_layout2
 
@@ -29,9 +29,7 @@ abstract class OnboardAdvanced : com.limurse.onboard.OnboardBase() {
         set(value) {
             field = value
             if (field != null) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                    backgroundFrame.background = field
-                }
+                backgroundFrame.background = field
             }
         }
 

diff --git a/onboard/src/main/java/com/limurse/onboard/OnboardBase.kt b/onboard/src/main/java/com/limurse/onboard/OnboardBase.kt
@@ -551,18 +551,21 @@ abstract class OnboardBase : AppCompatActivity(), OnboardViewPagerListener {
      =================================== */
 
     private fun updateButtonsVisibility() {
-        if (isButtonsEnabled) {
-            val isLastSlide = pager.isLastSlide(fragments.size)
-            val isFirstSlide = pager.isFirstSlide(fragments.size)
-            nextButton.isVisible = !isLastSlide
-            doneButton.isVisible = isLastSlide
-            skipButton.isVisible = isSkipButtonEnabled && !isLastSlide
-            backButton.isVisible = isWizardMode && !isFirstSlide
-        } else {
-            nextButton.isVisible = false
-            doneButton.isVisible = false
-            backButton.isVisible = false
-            skipButton.isVisible = false
+        when {
+            isButtonsEnabled -> {
+                val isLastSlide = pager.isLastSlide(fragments.size)
+                val isFirstSlide = pager.isFirstSlide(fragments.size)
+                nextButton.isVisible = !isLastSlide
+                doneButton.isVisible = isLastSlide
+                skipButton.isVisible = isSkipButtonEnabled && !isLastSlide
+                backButton.isVisible = isWizardMode && !isFirstSlide
+            }
+            else -> {
+                nextButton.isVisible = false
+                doneButton.isVisible = false
+                backButton.isVisible = false
+                skipButton.isVisible = false
+            }
         }
     }