Refactor scroll views in settings activities

wifi-tracing · Mar 28, 2021 · 8f28851 · 8f28851
1 parent 7611ffb
commit 8f28851
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 27 deletions.
diff --git a/app/src/main/res/layout/activity_manage_data.xml b/app/src/main/res/layout/activity_manage_data.xml
@@ -10,6 +10,7 @@
         android:id="@+id/scrollView"
         android:layout_width="392dp"
         android:layout_height="400dp"
+        android:isScrollContainer="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -21,8 +22,8 @@
 
             <TextView
                 android:id="@+id/manageDataTextView"
-                android:layout_width="match_parent"
-                android:layout_height="730dp"
+                android:layout_width="364dp"
+                android:layout_height="385dp"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginVertical="10dp"
                 android:scrollIndicators="right"

diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
@@ -4,11 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.PreferencesActivity">
+    tools:context=".ui.fragments.PreferencesActivity">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/preferencesFragment"
-        android:name="com.prj.app.ui.PreferencesFragment"
+        android:name="com.prj.app.ui.fragments.PreferencesFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout_editor_absoluteX="2dp"

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -91,7 +91,7 @@
         app:layout_constraintTop_toBottomOf="@+id/backButton" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/checkExposureButton"
+        android:id="@+id/checkExposureMenuButton"
         android:layout_width="match_parent"
         android:layout_height="59dp"
         android:layout_marginTop="256dp"
@@ -100,7 +100,7 @@
         android:drawableEnd="@drawable/misc_chevron_right"
         android:drawableTint="@color/primary"
         android:foregroundTintMode="src_atop"
-        android:onClick="openPreferences"
+        android:onClick="openCheckExposure"
         android:paddingStart="20dp"
         android:paddingEnd="20dp"
         android:text="@string/check_exposure"

diff --git a/app/src/main/res/layout/activity_upload_scans.xml b/app/src/main/res/layout/activity_upload_scans.xml
@@ -8,31 +8,22 @@
 
     <ScrollView
         android:id="@+id/scrollView"
-        android:layout_width="392dp"
-        android:layout_height="400dp"
+        android:layout_width="408dp"
+        android:layout_height="376dp"
+        android:layout_marginBottom="44dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <TextView
+            android:id="@+id/resultTextView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/resultTextView"
-                android:layout_width="match_parent"
-                android:layout_height="730dp"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginVertical="10dp"
-                android:scrollIndicators="right"
-                android:textColor="@color/black"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:layout_editor_absoluteY="2dp" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginVertical="10dp"
+            android:scrollIndicators="right"
+            android:textColor="@color/black"
+            android:textSize="18sp" />
     </ScrollView>
 
     <View

diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
@@ -13,7 +13,7 @@
         android:insetRight="10dp"
         android:insetBottom="10dp"
         android:onClick="onNextPressed"
-        android:text="next"
+        android:text="@string/next"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />