Skip to content
Snippets Groups Projects
Commit abc8a404 authored by Khaleeq's avatar Khaleeq
Browse files

Code Refactor

parent 98419d7a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.idea/deploymentTargetDropDown.xml
+ 1
− 17
View file @ abc8a404
......@@ -3,25 +3,9 @@
<component name="deploymentTargetDropDown">
<value>
<entry key="MainActivity">
<State>
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\Khaleeq\.android\avd\Copy_of_Pixel_8_API_32.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-09-03T12:10:14.750266800Z" />
</State>
</entry>
<entry key="PermissionRequestScreen">
<State />
</entry>
<entry key="TimerScreenPreview">
<entry key="PermissionRequestScreen">
<State />
</entry>
<entry key="app">
......
.idea/misc.xml
+ 0
− 1
View file @ abc8a404
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<list size="1">
......
app/src/main/AndroidManifest.xml
+ 3
− 10
View file @ abc8a404
......@@ -3,11 +3,10 @@
<!-- Permissions -->
<uses-permission android:name="android.permission.VIBRATE" android:required="false"/>
<uses-permission android:name="android.permission.WAKE_LOCK" android:required="false"/>
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" android:required="false"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" android:required="false"/>
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" android:required="false"/>
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" android:required="false"/>
<uses-permission android:name="android.permission.USE_EXACT_ALARM" android:required="false"/>
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" android:required="false"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" android:required="false"/>
......@@ -21,8 +20,7 @@
android:label="@string/app_name"
android:roundIcon="@drawable/ic_launcher_foreground"
android:supportsRtl="true"
android:theme="@style/Theme.MyApplication"
>
android:theme="@style/Theme.MyApplication">
<!-- Main Activity -->
<activity
......@@ -35,11 +33,6 @@
</intent-filter>
</activity>
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/pomo/myapplication/MainActivity.kt
+ 11
− 61
View file @ abc8a404
package com.pomo.myapplication
import android.Manifest
import android.content.pm.PackageManager
import android.os.Bundle
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.core.content.ContextCompat
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
......@@ -22,29 +17,22 @@ import com.pomo.myapplication.ui.theme.MyApplicationTheme
class MainActivity : ComponentActivity() {
private lateinit var notificationHelper: NotificationHelper
private lateinit var permissionLaunchers: Map<String, ActivityResultLauncher<String>>
private lateinit var pendingPermissions: MutableList<String>
var timeLeftForNotification: String = ""
lateinit var notificationHelper: NotificationHelper
lateinit var permissionsHelper: PermissionsHelper
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
notificationHelper = NotificationHelper(this)
permissionsHelper = PermissionsHelper(this)
pendingPermissions = mutableListOf()
permissionLaunchers = mapOf(
Manifest.permission.POST_NOTIFICATIONS to createPermissionLauncher(Manifest.permission.POST_NOTIFICATIONS),
Manifest.permission.VIBRATE to createPermissionLauncher(Manifest.permission.VIBRATE),
Manifest.permission.WAKE_LOCK to createPermissionLauncher(Manifest.permission.WAKE_LOCK),
Manifest.permission.FOREGROUND_SERVICE to createPermissionLauncher(Manifest.permission.FOREGROUND_SERVICE),
Manifest.permission.ACCESS_NOTIFICATION_POLICY to createPermissionLauncher(Manifest.permission.ACCESS_NOTIFICATION_POLICY),
Manifest.permission.USE_FULL_SCREEN_INTENT to createPermissionLauncher(Manifest.permission.USE_FULL_SCREEN_INTENT),
Manifest.permission.USE_EXACT_ALARM to createPermissionLauncher(Manifest.permission.USE_EXACT_ALARM)
)
permissionsHelper.initializePermissionLaunchers { permission ->
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
permissionsHelper.handlePermissionResult(permission, isGranted)
}
}
checkAndRequestPermissions()
permissionsHelper.checkAndRequestPermissions()
setContent {
MyApplicationTheme {
......@@ -59,43 +47,6 @@ class MainActivity : ComponentActivity() {
}
}
private fun createPermissionLauncher(permission: String): ActivityResultLauncher<String> {
return registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
if (isGranted) {
Toast.makeText(this, "$permission Permission Granted", Toast.LENGTH_SHORT).show()
pendingPermissions.remove(permission) // Remove the granted permission from pending list
} else {
Toast.makeText(this, "$permission Permission Denied", Toast.LENGTH_SHORT).show()
pendingPermissions.add(permission) // Add the denied permission back to pending list
}
}
}
private fun checkAndRequestPermissions() {
val permissionsToRequest = listOf(
Manifest.permission.POST_NOTIFICATIONS,
Manifest.permission.VIBRATE,
Manifest.permission.WAKE_LOCK,
Manifest.permission.FOREGROUND_SERVICE,
Manifest.permission.ACCESS_NOTIFICATION_POLICY,
Manifest.permission.USE_FULL_SCREEN_INTENT,
Manifest.permission.USE_EXACT_ALARM
)
permissionsToRequest.forEach { permission ->
if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED) {
pendingPermissions.add(permission) // Add to pending list if not granted
permissionLaunchers[permission]?.launch(permission)
}
}
}
private fun requestPendingPermissions() {
pendingPermissions.forEach { permission ->
permissionLaunchers[permission]?.launch(permission)
}
}
@Composable
private fun SetupNavGraph(navController: NavHostController) {
NavHost(
......@@ -106,7 +57,7 @@ class MainActivity : ComponentActivity() {
TimerScreen(
onToDoListClick = {
navController.navigate("todo_screen")
requestPendingPermissions() // Request pending permissions on start button press
permissionsHelper.requestPendingPermissions()
},
notificationHelper = notificationHelper,
activity = this@MainActivity
......@@ -121,5 +72,4 @@ class MainActivity : ComponentActivity() {
companion object {
const val PERMISSION_REQUEST_CODE = 1001
}
}
\ No newline at end of file
app/src/main/java/com/pomo/myapplication/NotificationUtils.kt
+ 8
− 8
View file @ abc8a404
......@@ -20,10 +20,10 @@ import androidx.core.app.NotificationManagerCompat
class NotificationHelper(private val context: Context) {
companion object {
private const val PERMISSION_REQUEST_CODE = 1001
private const val CHANNEL_ID = "timer_channel"
private const val NOTIFICATION_ID = 1
private const val ACTION_STOP_TIMER = "com.pomo.myapplication.ACTION_STOP_TIMER"
const val PERMISSION_REQUEST_CODE = 1001
const val CHANNEL_ID = "timer_channel"
const val NOTIFICATION_ID = 1
const val ACTION_STOP_TIMER = "com.pomo.myapplication.ACTION_STOP_TIMER"
}
val handler = Handler(Looper.getMainLooper())
......@@ -131,7 +131,7 @@ class NotificationHelper(private val context: Context) {
}
}
private fun buildNotification(title: String, contentText: String, priority: Int, playSound: Boolean): Notification {
fun buildNotification(title: String, contentText: String, priority: Int, playSound: Boolean): Notification {
val intent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
}
......@@ -161,7 +161,7 @@ class NotificationHelper(private val context: Context) {
.build()
}
private fun showNotification(notification: Notification) {
fun showNotification(notification: Notification) {
try {
with(NotificationManagerCompat.from(context)) {
notify(NOTIFICATION_ID, notification)
......@@ -171,9 +171,9 @@ class NotificationHelper(private val context: Context) {
}
}
private fun registerStopReceiver() {
fun registerStopReceiver() {
val filter = IntentFilter(ACTION_STOP_TIMER)
context.registerReceiver(TimerStopReceiver(), filter)
context.registerReceiver(TimerStopReceiver(), filter, Context.RECEIVER_EXPORTED)
}
class TimerStopReceiver : BroadcastReceiver() {
......
app/src/main/java/com/pomo/myapplication/Permissions.kt
+ 41
− 78
View file @ abc8a404
package com.pomo.myapplication
import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.os.Bundle
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.compose.setContent
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.Column
import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.core.app.ActivityCompat
import androidx.activity.result.ActivityResultLauncher
import androidx.core.content.ContextCompat
class PermissionRequestScreen : ComponentActivity() {
class PermissionsHelper(private val context: Context) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
PermissionScreen()
}
}
lateinit var permissionLaunchers: Map<String, ActivityResultLauncher<String>>
var pendingPermissions: MutableList<String> = mutableListOf()
@Composable
fun PermissionScreen() {
Column {
PermissionButton(
permission = Manifest.permission.VIBRATE,
text = "Request VIBRATE Permission"
)
PermissionButton(
permission = Manifest.permission.WAKE_LOCK,
text = "Request WAKE_LOCK Permission"
)
PermissionButton(
permission = Manifest.permission.FOREGROUND_SERVICE,
text = "Request FOREGROUND_SERVICE Permission"
)
PermissionButton(
permission = Manifest.permission.POST_NOTIFICATIONS,
text = "Request POST_NOTIFICATIONS Permission"
)
PermissionButton(
permission = Manifest.permission.ACCESS_NOTIFICATION_POLICY,
text = "Request ACCESS_NOTIFICATION_POLICY Permission"
)
PermissionButton(
permission = Manifest.permission.USE_FULL_SCREEN_INTENT,
text = "Request USE_FULLSCREEN_INTENT Permission"
fun initializePermissionLaunchers(
launcherFactory: (String) -> ActivityResultLauncher<String>
) {
permissionLaunchers = mapOf(
Manifest.permission.POST_NOTIFICATIONS to launcherFactory(Manifest.permission.POST_NOTIFICATIONS),
Manifest.permission.ACCESS_NOTIFICATION_POLICY to launcherFactory(Manifest.permission.ACCESS_NOTIFICATION_POLICY),
Manifest.permission.USE_EXACT_ALARM to launcherFactory(Manifest.permission.USE_EXACT_ALARM)
)
PermissionButton(
permission = Manifest.permission.USE_EXACT_ALARM,
text = "Request USE_EXACT_ALARM Permission"
}
fun checkAndRequestPermissions() {
val permissionsToRequest = listOf(
Manifest.permission.POST_NOTIFICATIONS,
Manifest.permission.ACCESS_NOTIFICATION_POLICY,
Manifest.permission.USE_EXACT_ALARM
)
permissionsToRequest.forEach { permission ->
if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
pendingPermissions.add(permission)
permissionLaunchers[permission]?.launch(permission)
}
}
}
@Composable
fun PermissionButton(permission: String, text: String) {
val context = LocalContext.current
val permissionLauncher =
rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
if (isGranted) {
// Berechtigung gewährt
Toast.makeText(context, "$text: Permission Granted", Toast.LENGTH_SHORT).show()
} else {
// Berechtigung verweigert
Toast.makeText(context, "$text: Permission Denied", Toast.LENGTH_SHORT).show()
fun requestPendingPermissions() {
pendingPermissions.forEach { permission ->
permissionLaunchers[permission]?.launch(permission)
}
}
Button(onClick = {
if (ActivityCompat.checkSelfPermission(
context,
permission
) == PackageManager.PERMISSION_GRANTED
) {
Toast.makeText(context, "$text: Permission already granted", Toast.LENGTH_SHORT)
.show()
fun handlePermissionResult(permission: String, isGranted: Boolean) {
if (isGranted) {
Toast.makeText(context, "$permission Permission Granted", Toast.LENGTH_SHORT).show()
pendingPermissions.remove(permission)
} else {
permissionLauncher.launch(permission)
Toast.makeText(context, "$permission Permission Denied", Toast.LENGTH_SHORT).show()
pendingPermissions.add(permission)
}
}) {
Text(text)
}
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment