From 33e37fe1d6c55a520d787eaf22cdf1a625a26a31 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 11 Dec 2023 16:42:48 +0200
Subject: [PATCH] Disable signup for fdroid
---
.../org/futo/circles/auth/feature/log_in/LogInFragment.kt | 5 +++--
auth/src/main/res/layout/fragment_log_in.xml | 5 +++++
.../main/java/org/futo/circles/core/base/CirclesAppConfig.kt | 2 ++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
index 65b724dd1..8d913ee85 100644
--- a/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
+++ b/auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt
@@ -16,6 +16,7 @@ import org.futo.circles.auth.feature.log_in.switch_user.list.SwitchUsersViewHold
import org.futo.circles.auth.model.RemoveUser
import org.futo.circles.core.base.CirclesAppConfig
import org.futo.circles.core.base.NetworkObserver
+import org.futo.circles.core.base.fragment.HasLoadingState
import org.futo.circles.core.base.list.BaseRvDecoration
import org.futo.circles.core.extensions.getText
import org.futo.circles.core.extensions.navigateSafe
@@ -25,7 +26,6 @@ import org.futo.circles.core.extensions.setEnabledViews
import org.futo.circles.core.extensions.setIsVisible
import org.futo.circles.core.extensions.showError
import org.futo.circles.core.extensions.withConfirmation
-import org.futo.circles.core.base.fragment.HasLoadingState
@AndroidEntryPoint
@@ -66,6 +66,7 @@ class LogInFragment : Fragment(R.layout.fragment_log_in), HasLoadingState {
private fun setupViews() {
with(binding) {
+ groupSignup.setIsVisible(CirclesAppConfig.isSignupEnabled())
tvDomain.apply {
setAdapter(autocompleteAdapter)
onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
@@ -87,7 +88,7 @@ class LogInFragment : Fragment(R.layout.fragment_log_in), HasLoadingState {
}
private fun setupObservers() {
- NetworkObserver.observe(this){ setEnabledViews(it) }
+ NetworkObserver.observe(this) { setEnabledViews(it) }
viewModel.loginResultLiveData.observeResponse(this,
success = {
findNavController().navigateSafe(LogInFragmentDirections.toLoginStagesFragment())
diff --git a/auth/src/main/res/layout/fragment_log_in.xml b/auth/src/main/res/layout/fragment_log_in.xml
index dcfac5851..3f5ecbe3b 100644
--- a/auth/src/main/res/layout/fragment_log_in.xml
+++ b/auth/src/main/res/layout/fragment_log_in.xml
@@ -194,6 +194,11 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
+ <androidx.constraintlayout.widget.Group
+ android:id="@+id/groupSignup"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:constraint_referenced_ids="tvNotMember, btnSignUp" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/src/main/java/org/futo/circles/core/base/CirclesAppConfig.kt b/core/src/main/java/org/futo/circles/core/base/CirclesAppConfig.kt
index 2c223b303..a950d50df 100644
--- a/core/src/main/java/org/futo/circles/core/base/CirclesAppConfig.kt
+++ b/core/src/main/java/org/futo/circles/core/base/CirclesAppConfig.kt
@@ -25,6 +25,8 @@ object CirclesAppConfig {
var isRageshakeEnabled = false
private set
+ fun isSignupEnabled(): Boolean = buildFlavourName.contains("gplay", true)
+
data class Initializer(
private var appId: String? = null,
private var version: String? = null,
--
GitLab