From e50e2860946067a262f56dc3e0853008100e730c Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 18 Jul 2024 16:46:05 +1000 Subject: [PATCH 1/2] Using the new translate URL Cleaned up unused references --- .../securesms/preferences/HelpSettingsActivity.kt | 2 +- .../org/thoughtcrime/securesms/ui/components/RadioButton.kt | 5 ----- .../java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt index e7e5f2d5f61..c20df126d38 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt @@ -36,7 +36,7 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() { private const val FAQ = "faq" private const val SUPPORT = "support" - private const val CROWDIN_URL = "https://crowdin.com/project/session-android" + private const val CROWDIN_URL = " https://getsession.org/translate" private const val FEEDBACK_URL = "https://getsession.org/survey" private const val FAQ_URL = "https://getsession.org/faq" private const val SUPPORT_URL = "https://sessionapp.zendesk.com/hc/en-us" diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/RadioButton.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/RadioButton.kt index 154c9ea3a1f..cabe5367673 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/RadioButton.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/RadioButton.kt @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.ui.components -import android.content.ContentProvider import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.scaleIn import androidx.compose.animation.scaleOut @@ -24,11 +23,9 @@ import androidx.compose.material3.LocalContentColor import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.semantics.Role import androidx.compose.ui.tooling.preview.Preview @@ -42,8 +39,6 @@ import org.thoughtcrime.securesms.ui.theme.LocalColors import org.thoughtcrime.securesms.ui.theme.LocalDimensions import org.thoughtcrime.securesms.ui.theme.LocalType import org.thoughtcrime.securesms.ui.theme.PreviewTheme -import org.thoughtcrime.securesms.ui.theme.sessionTypography -import org.thoughtcrime.securesms.ui.theme.textEnabled import org.thoughtcrime.securesms.ui.theme.transparentButtonColors import kotlin.time.Duration.Companion.days diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt index 8d080b65b74..252497f0230 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt @@ -43,7 +43,6 @@ val ThemeColors.textSelectionColors fun ThemeColors.text(isError: Boolean): Color = if (isError) danger else text fun ThemeColors.textSecondary(isError: Boolean): Color = if (isError) danger else textSecondary -fun ThemeColors.textEnabled(enabled: Boolean) = if (enabled) text else disabled fun ThemeColors.borders(isError: Boolean): Color = if (isError) danger else borders fun ThemeColors.toMaterialColors() = if (isLight) { From 780ed9b54f783068bcc0d3515082a3cead9edc5d Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 18 Jul 2024 16:51:38 +1000 Subject: [PATCH 2/2] empty space --- .../thoughtcrime/securesms/preferences/HelpSettingsActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt index c20df126d38..339047bbf6f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/HelpSettingsActivity.kt @@ -36,7 +36,7 @@ class HelpSettingsFragment: CorrectedPreferenceFragment() { private const val FAQ = "faq" private const val SUPPORT = "support" - private const val CROWDIN_URL = " https://getsession.org/translate" + private const val CROWDIN_URL = "https://getsession.org/translate" private const val FEEDBACK_URL = "https://getsession.org/survey" private const val FAQ_URL = "https://getsession.org/faq" private const val SUPPORT_URL = "https://sessionapp.zendesk.com/hc/en-us"