From 006a4e8bad85db54b25e3edfc5ed02c05ce834fe Mon Sep 17 00:00:00 2001 From: alansley Date: Tue, 30 Jul 2024 16:43:54 +1000 Subject: [PATCH] Cleaned up MuteDialog.kt --- .../org/thoughtcrime/securesms/MuteDialog.kt | 93 +------------------ 1 file changed, 1 insertion(+), 92 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt index 64b076effb..e6dd1ae4d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.kt @@ -49,95 +49,4 @@ private enum class Option(@StringRes val stringRes: Int, val getTime: () -> Long FOREVER(R.string.notificationsMute, getTime = { Long.MAX_VALUE } ); constructor(@StringRes stringRes: Int, duration: Long): this(stringRes, { duration } ) -} - -/* -package org.thoughtcrime.securesms - -import android.content.Context -import androidx.annotation.StringRes -import androidx.appcompat.app.AlertDialog -import androidx.compose.ui.platform.LocalContext -import com.squareup.phrase.Phrase -import network.loki.messenger.R -import org.session.libsession.LocalisedTimeUtil -import org.session.libsession.utilities.StringSubstitutionConstants.TIME_LARGE_KEY -import java.util.concurrent.TimeUnit -import kotlin.time.Duration.Companion.days -import kotlin.time.Duration.Companion.hours - -private fun getTimestampOfNowPlusDuration(menuItemIndex: Int): (Int) -> Unit { - when (menuItemIndex) { - 0 -> System.currentTimeMillis() + 1.hours.inWholeMilliseconds - 1 -> System.currentTimeMillis() + 2.hours.inWholeMilliseconds - 2 -> System.currentTimeMillis() + 1.days.inWholeMilliseconds - 3 -> System.currentTimeMillis() + 7.days.inWholeMilliseconds - else Long.MAX_VALUE - } -} - -fun showMuteDialog( - context: Context, - onMuteDuration: (Long) -> Unit -): AlertDialog { - val c = context - - val oneHourString = Phrase.from(c, R.string.notificationsMuteFor) - .put(TIME_LARGE_KEY, LocalisedTimeUtil.getDurationWithSingleLargestTimeUnit(c, 1.hours)) - .format().toString() - val oneHourOption:Pair = oneHourString to System.currentTimeMillis() + 1.hours.inWholeMilliseconds - - val twoHoursString = Phrase.from(c, R.string.notificationsMuteFor) - .put(TIME_LARGE_KEY, LocalisedTimeUtil.getDurationWithSingleLargestTimeUnit(c, 2.hours)) - .format().toString() - val twoHoursOption:Pair = twoHoursString to System.currentTimeMillis() + 2.hours.inWholeMilliseconds - - val oneDayString = Phrase.from(c, R.string.notificationsMuteFor) - .put(TIME_LARGE_KEY, LocalisedTimeUtil.getDurationWithSingleLargestTimeUnit(c, 1.days)) - .format().toString() - val oneDayOption:Pair = twoHoursString to System.currentTimeMillis() + 1.days.inWholeMilliseconds - - val oneWeekString = Phrase.from(c, R.string.notificationsMuteFor) - .put(TIME_LARGE_KEY, LocalisedTimeUtil.getDurationWithSingleLargestTimeUnit(c, 7.days)) - .format().toString() - val oneWeekOption:Pair = twoHoursString to System.currentTimeMillis() + 7.days.inWholeMilliseconds - - val foreverString = c.getString(R.string.notificationsMute) - val foreverOption = foreverString to Long.MAX_VALUE - - val allStrings = arrayOf(oneHourString, twoHoursString, oneDayString, oneWeekString, foreverString) - - val allOptions = listOf(oneHourOption, twoHoursOption, oneDayOption, oneWeekOption, foreverOption) - - val foo: (Int) -> Unit = { getTimestampOfNowPlusDuration(3) } - - context.showSessionDialog { - title(R.string.notificationsMute) - - //items(allStrings, onMuteDuration(getTimestampOfNowPlusDuration(allStrings.val)) - - items(allOptions.map { it.first }.toTypedArray() { allOptions.entries[it].getTime() } ) - - - - items(allOptions.map { it.first }.map(it.)) { it.second } Option.entries.map { it.stringRes }.map( - Phrase.from(context, R.string.notificationsMuteFor) - .put(TIME_LARGE_KEY, LocalisedTimeUtil.getDurationWithSingleLargestTimeUnit(context, it.getTime())..format().toString()toType, - - context::getString).toTypedArray()) { - onMuteDuration(Option.entries[it].getTime()) - } - } -} - -private enum class Option(@StringRes val stringRes: Int, val getTime: () -> Long) { - - ONE_HOUR(R.string.notificationsMuteFor, duration = 1.hours.inWholeMilliseconds), - TWO_HOURS(R.string.notificationsMuteFor, duration = 2.hours.inWholeMilliseconds), - ONE_DAY(R.string.notificationsMuteFor, duration = 1.days.inWholeMilliseconds), - SEVEN_DAYS(R.string.notificationsMuteFor, duration = 7.days.inWholeMilliseconds), - FOREVER(R.string.notificationsMute, getTime = { Long.MAX_VALUE }); - - constructor(@StringRes stringRes: Int, duration: Long): this(stringRes, { System.currentTimeMillis() + duration }) -} -*/ \ No newline at end of file +} \ No newline at end of file