[feat/onboarding_view]: 온보딩 UI 작업, 뷰 연결

app/src/main/java/com/hmh/hamyeonham/SampleActivity.kt

@@ -10,6 +10,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.hmh.hamyeonham.common.view.viewBinding
 import com.hmh.hamyeonham.databinding.ActivitySampleBinding
 import com.hmh.hamyeonham.feature.main.MainActivity
+import com.hmh.hamyeonham.feature.onboarding.OnBoardingActivity
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -21,7 +22,7 @@ class SampleActivity : AppCompatActivity() {
         val splashScreen = installSplashScreen()
         initSplashAnimation(splashScreen)
         setContentView(binding.root)
-        startActivity(Intent(this, MainActivity::class.java))
+        startActivity(Intent(this, OnBoardingActivity::class.java))
         finish()
     }
 

core/common/src/main/java/com/hmh/hamyeonham/common/activity/ActivityExt.kt

@@ -9,3 +9,9 @@ fun AppCompatActivity.replaceFragment(containerViewId: Int, fragment: Fragment)
         replace(containerViewId, fragment)
     }
 }
+
+fun AppCompatActivity.addFragment(containerViewId: Int, fragment: Fragment) {
+    supportFragmentManager.commit {
+        add(containerViewId, fragment)
+    }
+}

core/common/src/main/java/com/hmh/hamyeonham/common/view/NumberPickerExt.kt

@@ -0,0 +1,8 @@
+package com.hmh.hamyeonham.common.view
+
+import android.widget.NumberPicker
+
+fun NumberPicker.setupScreentimeGoalRange(minValue: Int, maxValue: Int) {
+    this.minValue = minValue
+    this.maxValue = maxValue
+}

data/onboarding/.gitignore

@@ -0,0 +1 @@
+/build

data/onboarding/build.gradle.kts

@@ -0,0 +1,10 @@
+@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
+plugins {
+   hmh("feature")
+}
+
+android {
+    namespace = "com.hmh.hamyeonham.onboarding"
+}
+
+dependencies {}

data/onboarding/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

data/onboarding/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

feature/onboarding/src/main/AndroidManifest.xml

@@ -10,6 +10,12 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application>
+        <activity
+            android:name=".OnBoardingDoneSingUpActivity"
+            android:exported="false" />
+        <activity
+            android:name=".OnBoardingActivity"
+            android:exported="false" />
         <activity
             android:name=".OnBoardingActivity"
             android:exported="false" />
@@ -26,9 +32,9 @@
                 android:name="android.accessibilityservice"
                 android:resource="@xml/accessibility_service_config" />
         </service>
-
         <activity
             android:name=".LockActivity"
             android:exported="true" />
     </application>
+
 </manifest>

feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingAccessibilityService.kt

@@ -1,19 +1,15 @@
 package com.hmh.hamyeonham.feature.onboarding
 
 import android.accessibilityservice.AccessibilityService
-import android.content.Intent
 import android.util.Log
 import android.view.accessibility.AccessibilityEvent
+import com.hmh.hamyeonham.common.context.toast
 
 class OnBoardingAccessibilityService : AccessibilityService() {
     override fun onAccessibilityEvent(event: AccessibilityEvent) {
         if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
             val packageName = event.packageName ?: return
-            Log.d("OnBoardingAccessibilityService", "onAccessibilityEvent: $packageName")
-            if (packageName != "com.google.android.youtube") return
-            val intent = Intent(this, LockActivity::class.java)
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            startActivity(intent)
+            Log.d("AccessibilityService", "현재 실행 중인 앱 패키지: $packageName")
         }
     }
 

feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingActivity.kt

@@ -1,122 +1,57 @@
 package com.hmh.hamyeonham.feature.onboarding
 
-import android.app.usage.UsageStatsManager
-import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
-import android.provider.Settings
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import com.hmh.hamyeonham.common.context.toast
-import com.hmh.hamyeonham.common.navigation.NavigationProvider
+import com.hmh.hamyeonham.common.view.viewBinding
 import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingBinding
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class OnBoardingActivity : AppCompatActivity() {
 
-    private lateinit var binding: ActivityOnBoardingBinding
-
-    @Inject
-    lateinit var navigationProvider: NavigationProvider
-
-    private val accessibilitySettingsLauncher: ActivityResultLauncher<Intent> =
-        registerForActivityResult(
-            ActivityResultContracts.StartActivityForResult(),
-        ) {
-            if (isAccessibilityServiceEnabled()) {
-                toast("접근성 서비스가 활성화되었습니다.")
-            } else {
-                toast("접근성 서비스가 활성화되지 않았습니다.")
-            }
-        }
+    private val binding by viewBinding(ActivityOnBoardingBinding::inflate)
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        binding = ActivityOnBoardingBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        clickRequireAccessibilityBtn()
+        initViewPager()
     }
 
-    private fun clickRequireAccessibilityBtn() {
-        binding.btnAccessibility.setOnClickListener {
-            openAccessibilitySettingsIfNeeded()
-        }
-        binding.btnUsage.setOnClickListener {
-            requestUsageAccessPermission()
-        }
-        binding.btnDrawOnOthers.setOnClickListener {
-            if (!hasOverlayPermission()) {
-                requestOverlayPermission()
-            } else {
-                toast("다른 앱 위에 그리기 권한이 이미 허용되어 있습니다.")
-            }
-        }
-        binding.btnLogin.setOnClickListener {
-            if (isAccessibilityServiceEnabled() && hasUsageStatsPermission() && hasOverlayPermission()) {
-                toast("모든 권한이 허용되었습니다.")
-                startActivity(navigationProvider.toLogin())
-                finish()
-            } else {
-                toast("모든 권한을 허용해주세요.")
-            }
+    private fun initViewPager() {
+        val pagerAdapter = setOnboardingPageAdapter()
+        binding.btnOnboardingNext.setOnClickListener {
+            navigateToNextOnboardingStep(pagerAdapter)
         }
     }
 
-    private fun requestUsageAccessPermission() {
-        if (!hasUsageStatsPermission()) {
-            try {
-                val packageUri = Uri.parse("package:$packageName")
-                val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS, packageUri)
-                startActivity(intent)
-            } catch (e: Exception) {
-                val intent = Intent(Settings.ACTION_USAGE_ACCESS_SETTINGS)
-                startActivity(intent)
+    private fun navigateToNextOnboardingStep(pagerAdapter: OnBoardingFragmentStateAdapter) {
+        binding.vpOnboardingContainer.let { viewPager ->
+            val currentItem = viewPager.currentItem
+            val lastItem = pagerAdapter.itemCount - 1
+            when {
+                currentItem < lastItem -> viewPager.currentItem = currentItem + 1
+                currentItem == lastItem -> startOnBoardingDoneSignUpActivity()
             }
-        } else {
-            toast("사용 정보 접근 권한이 이미 허용되어 있습니다.")
         }
     }
 
-    private fun requestOverlayPermission() {
-        val packageUri = Uri.parse("package:$packageName")
-        val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, packageUri)
+    private fun startOnBoardingDoneSignUpActivity() {
+        val intent = Intent(this, OnBoardingDoneSingUpActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
         startActivity(intent)
+        finish()
     }
 
-    private fun hasOverlayPermission(): Boolean {
-        return Settings.canDrawOverlays(this)
-    }
-
-    private fun isAccessibilityServiceEnabled(): Boolean {
-        val service = packageName + "/" + OnBoardingAccessibilityService::class.java.canonicalName
-        val enabledServicesSetting = Settings.Secure.getString(
-            contentResolver,
-            Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-        )
-        return enabledServicesSetting?.contains(service) == true
-    }
-
-    private fun openAccessibilitySettingsIfNeeded() {
-        if (!isAccessibilityServiceEnabled()) {
-            val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-            accessibilitySettingsLauncher.launch(intent)
-        } else {
-            toast("접근성 권한이 이미 허용되어 있습니다.")
+    private fun setOnboardingPageAdapter(): OnBoardingFragmentStateAdapter {
+        val pagerAdapter = OnBoardingFragmentStateAdapter(this)
+        binding.vpOnboardingContainer.run {
+            adapter = pagerAdapter
+            isUserInputEnabled = false
         }
-    }
-
-    private fun hasUsageStatsPermission(): Boolean {
-        val usageStatsManager = getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
-        val time = System.currentTimeMillis()
-        val stats = usageStatsManager.queryUsageStats(
-            UsageStatsManager.INTERVAL_DAILY,
-            time - 1000 * 60,
-            time,
-        )
-        return stats != null && stats.isNotEmpty()
+        return pagerAdapter
     }
 }

feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingDoneSingUpActivity.kt

@@ -0,0 +1,14 @@
+package com.hmh.hamyeonham.feature.onboarding
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.hmh.hamyeonham.common.view.viewBinding
+import com.hmh.hamyeonham.feature.onboarding.databinding.ActivityOnBoardingDoneSingUpBinding
+
+class OnBoardingDoneSingUpActivity : AppCompatActivity() {
+    private val binding by viewBinding(ActivityOnBoardingDoneSingUpBinding::inflate)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(binding.root)
+    }
+}

feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/OnBoardingFragmentStateAdapter.kt

@@ -0,0 +1,43 @@
+package com.hmh.hamyeonham.feature.onboarding
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingRequestPermissionFragment
+import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectAppFragment
+import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectDataFragment
+import com.hmh.hamyeonham.feature.onboarding.fragment.OnBoardingSelectScreenTimeFragment
+
+enum class OnBoardingFragmentType {
+    REQUEST_PERMISSION,
+    SELECT_APP,
+    SELECT_SCREEN_TIME_GOAL,
+    SELECT_DATA_TIME,
+    SELECT_DATA_PROBLEM,
+    SELECT_DATA_PERIOD,
+    SELECT_USE_TIME_GOAL,
+}
+
+class OnBoardingFragmentStateAdapter(fragmentActivity: FragmentActivity) :
+    FragmentStateAdapter(fragmentActivity) {
+    override fun getItemCount(): Int {
+        return OnBoardingFragmentType.entries.size
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return when (val fragmentType = position.toOnBoardingFragmentType()) {
+            OnBoardingFragmentType.SELECT_DATA_TIME -> OnBoardingSelectDataFragment.newInstance(fragmentType)
+            OnBoardingFragmentType.SELECT_DATA_PROBLEM -> OnBoardingSelectDataFragment.newInstance(fragmentType)
+            OnBoardingFragmentType.SELECT_DATA_PERIOD -> OnBoardingSelectDataFragment.newInstance(fragmentType)
+            OnBoardingFragmentType.SELECT_SCREEN_TIME_GOAL -> OnBoardingSelectScreenTimeFragment()
+            OnBoardingFragmentType.REQUEST_PERMISSION -> OnBoardingRequestPermissionFragment()
+            OnBoardingFragmentType.SELECT_APP -> OnBoardingSelectAppFragment()
+            OnBoardingFragmentType.SELECT_USE_TIME_GOAL -> OnBoardingSelectScreenTimeFragment()
+        }
+    }
+
+    private fun Int.toOnBoardingFragmentType(): OnBoardingFragmentType {
+        return OnBoardingFragmentType.entries.getOrNull(this)
+            ?: OnBoardingFragmentType.SELECT_DATA_TIME
+    }
+}

feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingRequestPermissionFragment.kt

@@ -0,0 +1,21 @@
+package com.hmh.hamyeonham.feature.onboarding.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.hmh.hamyeonham.common.view.viewBinding
+import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingRequestPermissionBinding
+
+class OnBoardingRequestPermissionFragment : Fragment() {
+    private val binding by viewBinding(FragmentOnBoardingRequestPermissionBinding::bind)
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        return FragmentOnBoardingRequestPermissionBinding.inflate(inflater, container, false).root
+    }
+}

feature/onboarding/src/main/java/com/hmh/hamyeonham/feature/onboarding/fragment/OnBoardingSelectAppFragment.kt

@@ -0,0 +1,21 @@
+package com.hmh.hamyeonham.feature.onboarding.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.hmh.hamyeonham.common.view.viewBinding
+import com.hmh.hamyeonham.feature.onboarding.databinding.FragmentOnBoardingSelectAppBinding
+
+class OnBoardingSelectAppFragment : Fragment() {
+    private val binding by viewBinding(FragmentOnBoardingSelectAppBinding::bind)
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View? {
+        return FragmentOnBoardingSelectAppBinding.inflate(inflater, container, false).root
+    }
+}