sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 12:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check if notifications are disabled (Android 13+)

Browse source 
Check if notifications are disabled (Android 13+), and if so show layout w/button that requests access via dialog
This commit is contained in:
Hafiz 2023-01-08 20:36:16 -05:00
parent 9db4ee5d07
commit 5d505fb59a
2 changed files with 79 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Habitica/res/layout/activity_task_form.xml
View file

@ -209,6 +209,37 @@
android:layout_height="wrap_content"
android:text="@string/reminders"
style="@style/TaskFormSectionheader"/>
<RelativeLayout
android:id="@+id/notifications_disabled_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_medium">
<TextView
android:id="@+id/notifications_enabled_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/spacing_medium"
android:text="@string/push_notification_system_settings_description"
android:textColor="@color/text_quad"
android:textSize="12sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/enable_notifs_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/notifications_enabled_text"
android:background="@color/transparent"
android:insetBottom="0dp"
android:insetTop="0dp"
android:padding="0dp"
android:text="@string/enable_notifications"
android:textColor="@color/brand_300"
android:textSize="12sp" />
</RelativeLayout>
<com.habitrpg.android.habitica.ui.views.tasks.form.ReminderContainer
android:id="@+id/reminders_container"
android:layout_width="match_parent"

52
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
View file

@ -8,11 +8,8 @@ import android.graphics.drawable.ColorDrawable
import android.os.Build
import android.os.Bundle
import android.os.Handler
import android.text.Spannable
import android.text.SpannableString
import android.text.TextUtils
import android.provider.Settings
import android.text.method.LinkMovementMethod
import android.text.util.Linkify
import android.view.Menu
import android.view.MenuItem
import android.view.MotionEvent
@ -20,6 +17,7 @@ import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import android.widget.CheckBox
import androidx.activity.result.contract.ActivityResultContracts
import androidx.activity.viewModels
import androidx.appcompat.widget.AppCompatCheckBox
import androidx.compose.runtime.mutableStateListOf
@ -47,6 +45,7 @@ import com.habitrpg.android.habitica.extensions.removeZeroWidthSpace
import com.habitrpg.android.habitica.helpers.ExceptionHandler
import com.habitrpg.android.habitica.helpers.TaskAlarmManager
import com.habitrpg.android.habitica.helpers.launchCatching
import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager
import com.habitrpg.android.habitica.models.Tag
import com.habitrpg.android.habitica.models.members.Member
import com.habitrpg.android.habitica.models.social.Challenge
@ -95,6 +94,9 @@ class TaskFormActivity : BaseActivity() {
@Inject
lateinit var taskAlarmManager: TaskAlarmManager
@Inject
lateinit var pushNotificationManager: PushNotificationManager
@Inject
lateinit var challengeRepository: ChallengeRepository
@ -109,6 +111,29 @@ class TaskFormActivity : BaseActivity() {
private var challenge: Challenge? = null
private val notificationPermissionLauncher = registerForActivityResult(
ActivityResultContracts.RequestPermission()
) { granted ->
if (granted) {
pushNotificationManager.addPushDeviceUsingStoredToken()
} else {
//If user denies notification settings originally - they must manually enable it through notification settings.
val alert = HabiticaAlertDialog(this)
alert.setTitle(R.string.push_notification_system_settings_title)
alert.setMessage(R.string.push_notification_system_settings_description)
alert.addButton(R.string.settings, true, false) { _, _ ->
val notifSettingIntent: Intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.putExtra(Settings.EXTRA_APP_PACKAGE, applicationContext?.packageName)
startActivity(notifSettingIntent)
}
alert.addButton(R.string.cancel, false) { _, _ ->
alert.dismiss()
}
alert.show()
}
}
private var isCreating = true
private var isChallengeTask = false
private var usesTaskAttributeStats = false
@ -350,6 +375,11 @@ class TaskFormActivity : BaseActivity() {
configureForm()
}
override fun onResume() {
checkIfShowNotifLayout()
super.onResume()
}
override fun loadTheme(sharedPreferences: SharedPreferences, forced: Boolean) {
super.loadTheme(sharedPreferences, forced)
val upperTintColor =
@ -548,6 +578,7 @@ class TaskFormActivity : BaseActivity() {
task.checklist?.let { binding.checklistContainer.checklistItems = it }
binding.remindersContainer.taskType = taskType
task.reminders?.let { binding.remindersContainer.reminders = it }
checkIfShowNotifLayout()
}
task.attribute?.let { viewModel.selectedAttribute.value = it }
@ -612,8 +643,10 @@ class TaskFormActivity : BaseActivity() {
thisTask.setWeeksOfMonth(binding.taskSchedulingControls.weeksOfMonth)
if (binding.habitAdjustPositiveStreakView.text?.isNotEmpty() == true) thisTask.streak =
binding.habitAdjustPositiveStreakView.text.toString().toIntCatchOverflow()
checkIfShowNotifLayout()
} else if (taskType == TaskType.TODO) {
thisTask.dueDate = binding.taskSchedulingControls.dueDate
checkIfShowNotifLayout()
} else if (taskType == TaskType.REWARD) {
thisTask.value = binding.rewardValue.value
}
@ -729,6 +762,17 @@ class TaskFormActivity : BaseActivity() {
alert.show()
}
private fun checkIfShowNotifLayout() {
if (!pushNotificationManager.notificationPermissionEnabled() && Build.VERSION.SDK_INT >= 33) {
binding.notificationsDisabledLayout.visibility = View.VISIBLE
binding.enableNotifsButton.setOnClickListener {
notificationPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS)
}
} else {
binding.notificationsDisabledLayout.visibility = View.GONE
}
}
private fun showChallengeDeleteTask() {
lifecycleScope.launchCatching {
val tasks = taskRepository.getTasksForChallenge(task?.challengeID).firstOrNull()