mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-08-18 11:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue implementing reminders.

Browse Source
This commit is contained in:
Docile-Alligator
2026-07-01 18:57:13 -04:00
parent cd7f7a4eb7
commit bff52a8bde
5 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/ml/docilealligator/infinityforreddit/activities/SetReminderActivity.kt
View File

@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.fillMaxSize
@ -22,6 +23,8 @@ import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.DatePicker
import androidx.compose.material3.DatePickerDialog
@ -50,6 +53,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.core.view.WindowInsetsControllerCompat
import androidx.lifecycle.ViewModelProvider
@ -67,6 +71,7 @@ import ml.docilealligator.infinityforreddit.customviews.compose.CustomPositiveTe
import ml.docilealligator.infinityforreddit.customviews.compose.LocalAppTheme
import ml.docilealligator.infinityforreddit.customviews.compose.LocalTypography
import ml.docilealligator.infinityforreddit.customviews.compose.PrimaryText
import ml.docilealligator.infinityforreddit.customviews.compose.SecondaryText
import ml.docilealligator.infinityforreddit.customviews.compose.ThemedTopAppBar
import ml.docilealligator.infinityforreddit.post.Post
import ml.docilealligator.infinityforreddit.reminder.ReminderManager
@ -197,7 +202,6 @@ class SetReminderActivity: BaseActivity() {
setContent {
AppTheme(customThemeWrapper.themeType, mSharedPreferences) {
val context = LocalContext.current
val scrollBehavior = enterAlwaysScrollBehavior()
val content = remember {
mViewModel.content
@ -288,7 +292,6 @@ class SetReminderActivity: BaseActivity() {
},
modifier = Modifier
.fillMaxSize()
.nestedScroll(scrollBehavior.nestedScrollConnection)
.imePadding(),
snackbarHost = {
SnackbarHost(hostState = snackbarHostState)
@ -299,7 +302,8 @@ class SetReminderActivity: BaseActivity() {
modifier = Modifier
.fillMaxSize()
.background(Color(LocalAppTheme.current.backgroundColor))
.padding(innerPadding),
.padding(innerPadding)
.verticalScroll(rememberScrollState()),
) {
if (content.isNotEmpty()) {
PrimaryText(
@ -397,6 +401,23 @@ class SetReminderActivity: BaseActivity() {
}
}
Spacer(Modifier.weight(1f))
PrimaryText(
R.string.note,
modifier = Modifier
.padding(horizontal = 16.dp),
fontSize = LocalTypography.current.fontSize.size16,
fontWeight = FontWeight.Bold
)
SecondaryText(
R.string.reminder_reliability_notice,
modifier = Modifier
.padding(horizontal = 16.dp),
textAlign = TextAlign.Justify
)
if (showDatePicker) {
DatePickerDialog(
onDismissRequest = {

1
app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java
View File

@ -124,6 +124,7 @@ public class CommentMoreBottomSheetFragment extends LandscapeExpandedRoundedBott
binding.setReminderCommentMoreBottomSheetFragment.setOnClickListener(view -> {
SetReminderActivity.Companion.startReminderActivity(activity, comment.getLinkId(), comment);
dismiss();
});
}

1
app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostOptionsBottomSheetFragment.java
View File

@ -255,6 +255,7 @@ public class PostOptionsBottomSheetFragment extends LandscapeExpandedRoundedBott
binding.setReminderTextViewPostOptionsBottomSheetFragment.setOnClickListener(view -> {
SetReminderActivity.Companion.startReminderActivity(mBaseActivity, mPost, null);
dismiss();
});
binding.reportTextViewPostOptionsBottomSheetFragment.setOnClickListener(view -> {

2
app/src/main/java/ml/docilealligator/infinityforreddit/customviews/compose/CustomText.kt
View File

@ -22,6 +22,7 @@ fun PrimaryText(
fontFamily: FontFamily? = LocalTypography.current.fontFamily,
fontSize: TextUnit = LocalTypography.current.fontSize.default,
textAlign: TextAlign? = null,
fontWeight: FontWeight? = null,
lineHeight: TextUnit = TextUnit.Unspecified
) {
Text(
@ -31,6 +32,7 @@ fun PrimaryText(
fontFamily = fontFamily,
fontSize = fontSize,
textAlign = textAlign,
fontWeight = fontWeight,
lineHeight = lineHeight
)
}

2
app/src/main/res/values/strings.xml
View File

@ -1668,6 +1668,8 @@
<string name="please_set_reminder_time">Please set a reminder time</string>
<string name="reminder_time_must_be_in_future">The reminder time must be in the future.</string>
<string name="invalid_reminder_post_id">Invalid post id</string>
<string name="note">Note:</string>
<string name="reminder_reliability_notice">Reminders may not be delivered if you force stop the app or if the app is updated and not opened afterward. Simply opening the app again will restore reminder functionality.</string>
<string name="reminder_set">Reminder set</string>
<string name="reminder">Reminder</string>