sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

String tweaks

Browse source
This commit is contained in:
Phillip Thelen 2025-01-13 16:38:58 +01:00
parent 087c0b06ed
commit 1fc471cb7a
6 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -242,11 +242,13 @@
android:background="@drawable/layout_rounded_bg_yellow_10">
<TextView
android:id="@+id/exact_alarm_disabled_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/spacing_medium"
android:padding="12dp"
android:gravity="center"
android:fontFamily="@string/font_family_medium"
android:text="@string/exact_alarm_system_settings_reminders"
android:textColor="@color/yellow_0"
android:textSize="12sp" />
</FrameLayout>

2
Habitica/res/values/strings.xml
View file

@ -30,7 +30,7 @@
<string name="enable_notifications">Enable Notifications</string>
<string name="push_notification_system_settings_description">Allow Habitica notifications in the Settings app to receive push notifications</string>
<string name="push_notification_system_settings_reminders">Allow Habitica notifications in the Settings app to receive reminders</string>
<string name="exact_alarm_system_settings_reminders">Habitica does not have the `Alarms &amp; Reminders` permission in the Settings app. Reminders might not appear at the exact time.</string>
<string name="exact_alarm_system_settings_reminders">Reminders may be delayed because permissions aren\'t enabled. Tap to view and update permissions.</string>
<string name="push_notification_system_settings_title">Notifications Disabled</string>
<string name="push_notifications_sum">Set your push notifications settings</string>
<string name="exact_alarm_system_settings_title">`Alarm &amp; Reminders` disabled`</string>

17
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PushNotificationsPreference.kt
View file

@ -21,4 +21,21 @@ open class PushNotificationsPreference : RealmObject(), BaseObject {
var mentionJoinedGuild: Boolean = false
var mentionUnjoinedGuild: Boolean = false
var contentRelease: Boolean = false
fun listOfEnabledKeys(): List<String> {
var enabled = mutableListOf<String>()
if (invitedParty) enabled.add("invitedParty")
if (invitedQuest) enabled.add("invitedQuest")
if (majorUpdates) enabled.add("majorUpdates")
if (wonChallenge) enabled.add("wonChallenge")
if (invitedGuild) enabled.add("invitedGuild")
if (newPM) enabled.add("newPM")
if (questStarted) enabled.add("questStarted")
if (giftedGems) enabled.add("giftedGems")
if (partyActivity) enabled.add("partyActivity")
if (mentionParty) enabled.add("mentionParty")
if (mentionJoinedGuild) enabled.add("mentionJoinedGuild")
if (contentRelease) enabled.add("contentRelease")
return enabled
}
}

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

@ -229,6 +229,10 @@ class TaskFormActivity : BaseActivity() {
supportActionBar?.setBackgroundDrawable(ColorDrawable(upperTintColor))
binding.upperTextWrapper.setBackgroundColor(upperTintColor)
binding.exactAlarmDisabledContainer.background = ContextCompat.getDrawable(this, R.drawable.layout_rounded_bg_task_form)
binding.exactAlarmDisabledContainer.background.mutate().setTint(this.getThemeColor(R.attr.tintedUiMain))
binding.exactAlarmDisabledText.setTextColor(getThemeColor(R.attr.textColorTintedPrimary))
isChallengeTask = bundle.getBoolean(IS_CHALLENGE_TASK, false)
taskType = TaskType.from(bundle.getString(TASK_TYPE_KEY)) ?: TaskType.HABIT

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
View file

@ -107,6 +107,9 @@ class MainActivityViewModel
"checkin_count",
user.loginIncentives.toString(),
)
user.preferences?.pushNotifications?.listOfEnabledKeys()?.let {
Analytics.setUserProperty("allowed_push_notifications", it)
}
Analytics.setUserProperty("level", user.stats?.lvl?.toString() ?: "")
pushNotificationManager.setUser(user)
if (!pushNotificationManager.notificationPermissionEnabled()) {

2
version.properties
View file

@ -1,2 +1,2 @@
NAME=4.6.0
CODE=9301
CODE=9311