diff --git a/core/locale/src/main/java/com/twofasapp/locale/Links.kt b/core/locale/src/main/java/com/twofasapp/locale/Links.kt
index f404cd9a..e5bee4b7 100644
--- a/core/locale/src/main/java/com/twofasapp/locale/Links.kt
+++ b/core/locale/src/main/java/com/twofasapp/locale/Links.kt
@@ -6,17 +6,14 @@ import androidx.compose.runtime.Stable
@Stable
@Immutable
class Links {
- val playStore = "https://play.google.com/store/apps/details?id=com.twofasapp"
+ val playStore = "https://play.google.com/store/apps/details?id=at.anexia.authenticator"
val terms = "https://2fas.com/terms-of-service"
val privacyPolicy = "https://2fas.com/privacy-policy"
- val donate = "https://2fas.com/donate"
val support = "https://support.2fas.com"
val browserExt = "https://2fas.com/be"
- val youtube = "https://www.youtube.com/@2fas"
- val twitter = "https://twitter.com/2FAS_com"
- val discord = "https://discord.gg/q4cP6qh2g5"
- val github = "https://github.com/twofas"
- val linkedin = "https://www.linkedin.com/company/2fasapp/"
- val reddit = "https://www.reddit.com/r/2fas_com"
- val facebook = "https://facebook.com/twofas"
+ val youtube = "https://www.youtube.com/user/anexiagmbh"
+ val twitter = "https://twitter.com/_anexia"
+ val linkedin = "https://at.linkedin.com/company/anexia"
+ val instagram = "https://www.instagram.com/_anexia/"
+ val facebook = "https://www.facebook.com/anexiagmbh"
}
\ No newline at end of file
diff --git a/core/locale/src/main/java/com/twofasapp/locale/Strings.kt b/core/locale/src/main/java/com/twofasapp/locale/Strings.kt
index 8d359161..3c5c7425 100644
--- a/core/locale/src/main/java/com/twofasapp/locale/Strings.kt
+++ b/core/locale/src/main/java/com/twofasapp/locale/Strings.kt
@@ -131,7 +131,7 @@ class Strings(c: Context) {
val aboutTellFriend = c.getString(R.string.settings__tell_a_friend)
val aboutTellFriendShareText = c.getString(R.string.settings__recommendation)
val aboutSocialMedia = c.getString(R.string.social__social_media)
- val aboutSocialDiscord = c.getString(R.string.social__discord)
+ val aboutSocialInstagram = c.getString(R.string.social__instagram)
val aboutSocialYouTube = c.getString(R.string.social__youtube)
val aboutSocialTwitter = c.getString(R.string.social__twitter)
val aboutSocialGitHub = c.getString(R.string.social__github)
diff --git a/core/locale/src/main/res/values-de-rDE/strings.xml b/core/locale/src/main/res/values-de-rDE/strings.xml
index 3c2638ba..c6140d73 100644
--- a/core/locale/src/main/res/values-de-rDE/strings.xml
+++ b/core/locale/src/main/res/values-de-rDE/strings.xml
@@ -765,7 +765,7 @@
Willst du Screenshots innerhalb der App zulassen?
Bist du sicher? Diese Option ermöglicht es dir, Screenshots von jedem Bildschirm innerhalb der App aufzunehmen und aufzuzeichnen. Allerdings erlaubt dies auch externe Versuche, Bildschirme in der App zu erfassen. Aus Sicherheitsgründen wird diese Option automatisch nach 5 Minuten deaktiviert.
Soziale Medien
- Discord
+ Instagram
YouTube
X (ehemals Twitter)
GitHub
diff --git a/core/locale/src/main/res/values/strings.xml b/core/locale/src/main/res/values/strings.xml
index b620a15d..bc532ef2 100644
--- a/core/locale/src/main/res/values/strings.xml
+++ b/core/locale/src/main/res/values/strings.xml
@@ -765,7 +765,7 @@
Allow screenshots of the app?
Are you sure? This option allows you to screenshot and record any screen within the app. However, this will also allow any external attempts of capturing screens in the app.\nFor safety reasons, this option will be automatically turned off after 5 minutes.
Social media links
- Discord
+ Instagram
YouTube
X (formerly Twitter)
GitHub
diff --git a/feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutScreen.kt b/feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutScreen.kt
index cc05e4dc..a3292e53 100644
--- a/feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutScreen.kt
+++ b/feature/about/src/main/java/com/twofasapp/feature/about/ui/about/AboutScreen.kt
@@ -83,12 +83,6 @@ private fun ScreenContent(
}
}
- item {
- SettingsLink(title = TwLocale.strings.aboutTerms, icon = TwIcons.Terms, external = true) {
- uriHandler.openSafely(TwLocale.links.terms, activity)
- }
- }
-
item {
SettingsLink(title = TwLocale.strings.aboutLicenses, icon = TwIcons.Licenses) {
onLicensesClick()
@@ -97,20 +91,6 @@ private fun ScreenContent(
item { SettingsDivider() }
- item { SettingsHeader(title = TwLocale.strings.aboutShare) }
-
- item {
- SettingsLink(title = TwLocale.strings.aboutTellFriend, icon = TwIcons.Share) {
- ShareCompat.IntentBuilder(activity)
- .setType("text/plain")
- .setChooserTitle("Share 2FAS")
- .setText(shareText)
- .startChooser()
- }
- }
-
- item { SettingsDivider() }
-
item { SettingsHeader(title = TwLocale.strings.aboutSendCrashes) }
item {
@@ -129,11 +109,11 @@ private fun ScreenContent(
item {
SettingsLink(
- title = TwLocale.strings.aboutSocialDiscord,
- image = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_discord),
+ title = TwLocale.strings.aboutSocialInstagram,
+ image = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_youtube),
external = true
) {
- uriHandler.openSafely(TwLocale.links.discord, activity)
+ uriHandler.openSafely(TwLocale.links.instagram, activity)
}
}
@@ -157,16 +137,6 @@ private fun ScreenContent(
}
}
- item {
- SettingsLink(
- title = TwLocale.strings.aboutSocialGitHub,
- image = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_github),
- external = true
- ) {
- uriHandler.openSafely(TwLocale.links.github, activity)
- }
- }
-
item {
SettingsLink(
title = TwLocale.strings.aboutSocialLinkedIn,
@@ -177,16 +147,6 @@ private fun ScreenContent(
}
}
- item {
- SettingsLink(
- title = TwLocale.strings.aboutSocialReddit,
- image = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_reddit),
- external = true
- ) {
- uriHandler.openSafely(TwLocale.links.reddit, activity)
- }
- }
-
item {
SettingsLink(
title = TwLocale.strings.aboutSocialFacebook,
diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt
index 955ae206..5ae9b61e 100644
--- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt
+++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/services/component/ServicesAppBar.kt
@@ -110,22 +110,6 @@ internal fun ServicesAppBar(
showBackButton = false,
scrollBehavior = scrollBehavior,
actions = {
- Box {
- TwIconButton(
- painter = TwIcons.Notification,
- tint = TwTheme.color.iconTint,
- onClick = onNotificationsClick,
- )
-
- if (hasUnreadNotifications) {
- Badge(
- containerColor = TwTheme.color.primary,
- modifier = Modifier
- .align(Alignment.Center)
- .padding(start = 18.dp, bottom = 18.dp)
- )
- }
- }
}
)
}
diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/settings/SettingsScreen.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/settings/SettingsScreen.kt
index 33998459..27f26450 100644
--- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/settings/SettingsScreen.kt
+++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/settings/SettingsScreen.kt
@@ -101,12 +101,6 @@ private fun SettingsScreen(
}
}
- item {
- SettingsLink(title = TwLocale.strings.settingsSupport, icon = TwIcons.Support, external = true) {
- uriHandler.openSafely(TwLocale.links.support, activity)
- }
- }
-
item {
SettingsLink(title = TwLocale.strings.settingsAbout, icon = TwIcons.Info) {
listener.openAbout()
@@ -115,12 +109,6 @@ private fun SettingsScreen(
item { SettingsDivider() }
- item {
- SettingsLink(title = TwLocale.strings.settingsDonate, icon = TwIcons.Favorite, external = true) {
- uriHandler.openSafely(TwLocale.links.donate, activity)
- }
- }
-
item {
Row(
modifier = Modifier
@@ -129,12 +117,12 @@ private fun SettingsScreen(
horizontalArrangement = Arrangement.spacedBy(14.dp, Alignment.CenterHorizontally),
) {
Image(
- painter = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_discord),
+ painter = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_youtube),
contentDescription = null,
modifier = Modifier
.size(52.dp)
.clip(CircleShape)
- .clickable { uriHandler.openSafely(TwLocale.links.discord, activity) }
+ .clickable { uriHandler.openSafely(TwLocale.links.instagram, activity) }
.padding(14.dp),
)
Image(
@@ -156,13 +144,13 @@ private fun SettingsScreen(
.padding(14.dp),
)
Icon(
- painter = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_github),
+ painter = painterResource(id = com.twofasapp.designsystem.R.drawable.ic_facebook),
contentDescription = null,
tint = TwTheme.color.onSurfacePrimary,
modifier = Modifier
.size(52.dp)
.clip(CircleShape)
- .clickable { uriHandler.openSafely(TwLocale.links.github, activity) }
+ .clickable { uriHandler.openSafely(TwLocale.links.facebook, activity) }
.padding(14.dp),
)
}
diff --git a/feature/startup/src/main/java/com/twofasapp/feature/startup/ui/startup/StartupScreen.kt b/feature/startup/src/main/java/com/twofasapp/feature/startup/ui/startup/StartupScreen.kt
index e33fe3c0..5393664e 100644
--- a/feature/startup/src/main/java/com/twofasapp/feature/startup/ui/startup/StartupScreen.kt
+++ b/feature/startup/src/main/java/com/twofasapp/feature/startup/ui/startup/StartupScreen.kt
@@ -130,17 +130,6 @@ internal fun ScreenContent(
}
}
- if (pagerState.currentPage == 0) {
- Text(
- text = TwLocale.strings.startupTermsLabel,
- style = MaterialTheme.typography.bodyMedium,
- color = TwTheme.color.onSurfaceSecondary,
- modifier = Modifier
- .clip(TwTheme.shape.roundedDefault)
- .clickable { uriHandler.openSafely(TwLocale.links.terms, context) }
- .padding(4.dp)
- )
- } else {
HorizontalPagerIndicator(
pagerState = pagerState,
activeColor = TwTheme.color.primary,
@@ -148,7 +137,6 @@ internal fun ScreenContent(
pageCount = pagerState.pageCount - 1,
pageIndexMapping = { it - 1 }
)
- }
Spacer(modifier = Modifier.height(36.dp))