formatted layouts

NikitaSutulov · May 27, 2024 · dca0647 · dca0647
1 parent e565672
commit dca0647
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 43 deletions.
diff --git a/app/src/main/res/layout/activity_chart_options.xml b/app/src/main/res/layout/activity_chart_options.xml
@@ -9,12 +9,12 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_margin="10dp"
+        android:paddingBottom="60dp"
+        app:layout_constraintBottom_toTopOf="@+id/submitChartOptionsButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/submitChartOptionsButton"
-        android:layout_margin="10dp"
-        android:paddingBottom="60dp">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:id="@+id/inputChartOptionsLayout"
@@ -25,9 +25,9 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="Here you can configure chart options"
                 android:gravity="center"
-                android:textSize="10pt"/>
+                android:text="Here you can configure chart options"
+                android:textSize="10pt" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
@@ -38,8 +38,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:inputType="numberDecimal"
-                    android:hint="horizontal step" />
+                    android:hint="horizontal step"
+                    android:inputType="numberDecimal" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -51,8 +51,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:inputType="numberDecimal"
-                    android:hint="vertical step" />
+                    android:hint="vertical step"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -65,8 +65,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:inputType="numberDecimal"
-                    android:hint="xMin" />
+                    android:hint="xMin"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -79,8 +79,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:inputType="numberDecimal"
-                    android:hint="xMax" />
+                    android:hint="xMax"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -93,8 +93,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:inputType="numberDecimal"
-                    android:hint="yMin" />
+                    android:hint="yMin"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -107,42 +107,42 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:inputType="numberDecimal"
-                    android:hint="yMax" />
+                    android:hint="yMax"
+                    android:inputType="numberDecimal" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <CheckedTextView
+                android:id="@+id/logScaleXCheckedTV"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checkMark="?android:attr/listChoiceIndicatorMultiple"
                 android:checked="false"
-                android:id="@+id/logScaleXCheckedTV"
-                android:text="Scale the X axis logarithmically"/>
+                android:text="Scale the X axis logarithmically" />
 
             <CheckedTextView
+                android:id="@+id/logScaleYCheckedTV"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checkMark="?android:attr/listChoiceIndicatorMultiple"
                 android:checked="false"
-                android:id="@+id/logScaleYCheckedTV"
-                android:text="Scale the Y axis logarithmically"/>
+                android:text="Scale the Y axis logarithmically" />
 
             <CheckedTextView
+                android:id="@+id/showHorizontalLinesCheckedTV"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checkMark="?android:attr/listChoiceIndicatorMultiple"
                 android:checked="false"
-                android:id="@+id/showHorizontalLinesCheckedTV"
-                android:text="Show horizontal lines in the grid"/>
+                android:text="Show horizontal lines in the grid" />
 
             <CheckedTextView
+                android:id="@+id/showVerticalLinesCheckedTV"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:checkMark="?android:attr/listChoiceIndicatorMultiple"
                 android:checked="false"
-                android:id="@+id/showVerticalLinesCheckedTV"
-                android:text="Show vertical lines in the grid"/>
+                android:text="Show vertical lines in the grid" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/activity_chart_render.xml b/app/src/main/res/layout/activity_chart_render.xml
@@ -17,10 +17,10 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <com.nickytoolchick.agraph.render.ChartRenderer
+            android:id="@+id/chartRenderer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/chartRenderer"
-            android:layout_margin="5dp"/>
+            android:layout_margin="5dp" />
 
     </FrameLayout>
 
@@ -37,21 +37,19 @@
             android:id="@+id/exportButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_margin="10dp"
-            android:text="Export as PNG"/>
+            android:layout_weight="1"
+            android:text="Export as PNG" />
 
         <Button
             android:id="@+id/shareButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_margin="10dp"
-            android:text="Share image"/>
+            android:layout_weight="1"
+            android:text="Share image" />
 
     </LinearLayout>
 
 
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_dataset_options.xml b/app/src/main/res/layout/activity_dataset_options.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".ui.DatasetOptionsActivity">
 
     <LinearLayout
@@ -110,5 +110,4 @@
     </LinearLayout>
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -41,30 +41,30 @@
 
     <Button
         android:id="@+id/renderChartButton"
-        android:enabled="false"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="10dp"
+        android:enabled="false"
         android:text="Render the graph"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/configureDatasetButton" />
 
     <Button
+        android:id="@+id/saveButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
         android:layout_margin="10dp"
         android:text="SAVE"
-        android:id="@+id/saveButton" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
+        android:id="@+id/loadButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         android:layout_margin="10dp"
         android:text="LOAD"
-        android:id="@+id/loadButton" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>