From 714e58e339adc36a9bc16cd888c4fa63cc41b77e Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 11 Mar 2024 15:03:12 +0200
Subject: [PATCH] Add user id to settings page
---
.../org/futo/circles/feature/settings/SettingsFragment.kt | 7 ++++---
app/src/main/res/layout/fragment_settings.xml | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
index 4af55af0b..8eb9e52ad 100644
--- a/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/settings/SettingsFragment.kt
@@ -16,8 +16,6 @@ import org.futo.circles.auth.model.LogOut
import org.futo.circles.auth.model.SwitchUser
import org.futo.circles.core.base.CirclesAppConfig
import org.futo.circles.core.base.NetworkObserver
-import org.futo.circles.core.extensions.loadUserProfileIcon
-import org.futo.circles.core.extensions.notEmptyDisplayName
import org.futo.circles.core.extensions.observeData
import org.futo.circles.core.extensions.observeResponse
import org.futo.circles.core.extensions.setEnabledViews
@@ -27,11 +25,11 @@ import org.futo.circles.core.extensions.showSuccess
import org.futo.circles.core.extensions.withConfirmation
import org.futo.circles.core.model.DeactivateAccount
import org.futo.circles.core.model.LoadingData
+import org.futo.circles.core.provider.MatrixSessionProvider
import org.futo.circles.core.provider.PreferencesProvider
import org.futo.circles.core.utils.LauncherActivityUtils
import org.futo.circles.core.view.LoadingDialog
import org.futo.circles.databinding.FragmentSettingsBinding
-import org.matrix.android.sdk.api.session.user.model.User
import org.matrix.android.sdk.internal.session.media.MediaUsageInfo
@AndroidEntryPoint
@@ -56,6 +54,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ReAuthCancellatio
private fun setupViews() {
with(binding) {
+ tvUserId.text = MatrixSessionProvider.currentSession?.myUserId
tvManageSubscription.apply {
setIsVisible(CirclesAppConfig.isGplayFlavor())
setOnClickListener { navigator.navigateToSubscriptionInfo() }
@@ -83,6 +82,8 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ReAuthCancellatio
tvLoginSessions.setOnClickListener { navigator.navigateToActiveSessions() }
tvVersion.setOnLongClickListener { toggleDeveloperMode(); true }
tvPushNotifications.setOnClickListener { navigator.navigateToPushSettings() }
+ tvEditProfile.setOnClickListener { navigator.navigateToEditProfile() }
+ tvShareProfile.setOnClickListener { navigator.navigateToShareProfile(viewModel.getSharedCircleSpaceId()) }
}
setVersion()
}
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 852b7f66d..0d1564b6e 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -17,6 +17,7 @@
style="@style/title2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center"
android:padding="16dp"
tools:text="@t22:nl.circles-dev.net" />
--
GitLab