From 4e1c62a3744f337e832677cba69ed445cd0c714b Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Fri, 26 Feb 2016 15:23:15 +0100
Subject: [PATCH] Align form inputs

---
 .../functions/BaseFunctionFragment.java       |  4 ++-
 .../plot/PlotEditFunctionFragment.java        |  2 ++
 .../fragment_function_edit_base_controls.xml  |  3 +-
 .../layout/fragment_plot_function_edit.xml    | 33 +++++++++++--------
 app/src/main/res/values/dimens.xml            |  3 ++
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java b/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
index 0eb75f4d..10a542d9 100644
--- a/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
@@ -94,8 +94,10 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
     public TextInputLayout bodyLabel;
     @Bind(R.id.function_body)
     public EditTextCompat bodyView;
+    @Bind(R.id.function_description_label)
+    public TextInputLayout descriptionLabel;
     @Bind(R.id.function_description)
-    EditText descriptionView;
+    public EditText descriptionView;
     @Inject
     Calculator calculator;
     @Inject
diff --git a/app/src/main/java/org/solovyev/android/calculator/plot/PlotEditFunctionFragment.java b/app/src/main/java/org/solovyev/android/calculator/plot/PlotEditFunctionFragment.java
index b5169efa..724628b7 100644
--- a/app/src/main/java/org/solovyev/android/calculator/plot/PlotEditFunctionFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/plot/PlotEditFunctionFragment.java
@@ -112,6 +112,8 @@ public class PlotEditFunctionFragment extends BaseFunctionFragment
         final int[] colors = MeshSpec.LightColors.asIntArray();
         colorPicker.setColors(colors);
         paramsView.setMaxParams(2);
+        // no descriptions for functions in plotter
+        descriptionLabel.setVisibility(View.GONE);
         if (savedInstanceState == null) {
             if (plotFunction != null) {
                 setupViews(plotFunction.meshSpec);
diff --git a/app/src/main/res/layout/fragment_function_edit_base_controls.xml b/app/src/main/res/layout/fragment_function_edit_base_controls.xml
index 8bf8eb42..3e90baf1 100644
--- a/app/src/main/res/layout/fragment_function_edit_base_controls.xml
+++ b/app/src/main/res/layout/fragment_function_edit_base_controls.xml
@@ -59,7 +59,8 @@
 
     <android.support.design.widget.TextInputLayout
         a:layout_width="match_parent"
-        a:layout_height="wrap_content">
+        a:layout_height="wrap_content"
+        a:id="@+id/function_description_label">
 
         <EditText
             a:id="@+id/function_description"
diff --git a/app/src/main/res/layout/fragment_plot_function_edit.xml b/app/src/main/res/layout/fragment_plot_function_edit.xml
index cec2f3c8..07154351 100644
--- a/app/src/main/res/layout/fragment_plot_function_edit.xml
+++ b/app/src/main/res/layout/fragment_plot_function_edit.xml
@@ -23,9 +23,10 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            xmlns:tools="http://schemas.android.com/tools"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,7 +34,7 @@
         android:orientation="vertical">
 
 
-        <include layout="@layout/fragment_function_edit_base_controls" />
+        <include layout="@layout/fragment_function_edit_base_controls"/>
 
         <LinearLayout
             android:id="@+id/fn_meshspec_views"
@@ -44,12 +45,12 @@
 
             <org.solovyev.android.plotter.PlotIconView
                 android:id="@+id/fn_iconview"
-                android:layout_width="100dp"
-                android:layout_height="100dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_width="@dimen/cpp_plot_icon_size"
+                android:layout_height="@dimen/cpp_plot_icon_size"
+                android:layout_marginLeft="@dimen/cpp_plot_icon_margin"
+                android:layout_marginRight="@dimen/cpp_plot_icon_margin"
                 android:background="#212121"
-                android:padding="5dp" />
+                android:padding="@dimen/cpp_image_button_padding"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -61,25 +62,31 @@
                     style="@style/TextAppearance.AppCompat.Caption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fn_line_width" />
+                    android:paddingStart="4dp"
+                    android:paddingLeft="4dp"
+                    android:text="@string/fn_line_width"
+                    tools:ignore="RtlSymmetry"/>
 
                 <SeekBar
                     android:id="@+id/fn_linewidth_seekbar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"/>
 
                 <TextView
                     android:id="@+id/fn_color_label"
                     style="@style/TextAppearance.AppCompat.Caption"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/fn_line_color" />
+                    android:paddingStart="4dp"
+                    android:paddingLeft="4dp"
+                    android:text="@string/fn_line_color"
+                    tools:ignore="RtlSymmetry"/>
 
                 <uz.shift.colorpicker.LineColorPicker
                     android:id="@+id/fn_color_picker"
                     android:layout_width="match_parent"
                     android:layout_height="20dp"
-                    app:lcp_orientation="horizontal" />
+                    app:lcp_orientation="horizontal"/>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 73b3b010..7e6fede8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -40,6 +40,9 @@
     <dimen name="cpp_clickable_area_size">50dp</dimen>
     <dimen name="cpp_image_button_size">30dp</dimen>
     <dimen name="cpp_image_button_padding">5dp</dimen>
+    <!-- 3 * cpp_image_button_size - 2 * cpp_plot_icon_margin -->
+    <dimen name="cpp_plot_icon_size">70dp</dimen>
+    <dimen name="cpp_plot_icon_margin">10dp</dimen>
     <dimen name="cpp_dialog_width_max">400dp</dimen>
     <dimen name="cpp_card_margin">4dp</dimen>