fix: modify activity settings views

frater1998 · Nov 30, 2021 · 8f7e4f0 · 8f7e4f0
1 parent 077d490
commit 8f7e4f0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/app/src/main/java/it/ministerodellasalute/verificaC19/ui/SettingsActivity.kt b/app/src/main/java/it/ministerodellasalute/verificaC19/ui/SettingsActivity.kt
@@ -54,7 +54,7 @@ class SettingsActivity : AppCompatActivity(), View.OnClickListener {
         binding.backImage.setOnClickListener(this)
         binding.backText.setOnClickListener(this)
         binding.totemSwitch.setOnClickListener(this)
-        binding.scanButton.setOnClickListener(this)
+        binding.scanCard.setOnClickListener(this)
         binding.faqCard.setOnClickListener(this)
         binding.privacyPolicyCard.setOnClickListener(this)
     }
@@ -84,7 +84,7 @@ class SettingsActivity : AppCompatActivity(), View.OnClickListener {
             finish()
         } else if (v?.id == R.id.totem_switch) {
             viewModel.setTotemMode(binding.totemSwitch.isChecked)
-        } else if (v?.id == R.id.scan_button) {
+        } else if (v?.id == R.id.scan_card) {
             AlertDialogCaller.showScanModeChoiceAlertDialog(
                 this,
                 getString(R.string.label_scan_mode),

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -150,19 +150,24 @@
                     android:textColor="@color/blue_dark"
                     android:textStyle="bold" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/totem_switch"
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="14dp"
-                    android:layout_marginEnd="16dp"
-                    android:fontFamily="@font/titiliumfont"
-                    android:textColor="@color/blue"
-                    android:textSize="@dimen/text_size_14sp"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toTopOf="parent"
-                    app:layout_constraintTop_toBottomOf="parent" />
+                    android:layout_height="match_parent" >
+
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:id="@+id/totem_switch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="16dp"
+                        android:fontFamily="@font/titiliumfont"
+                        android:textColor="@color/blue"
+                        android:textSize="@dimen/text_size_14sp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.cardview.widget.CardView>