new plotter

android-app/res/layout/cpp_plot_function_list_item.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    a:layout_width="match_parent"
+    a:layout_height="wrap_content"
+    a:orientation="horizontal">
+
+    <TextView
+        a:id="@+id/cpp_plot_function_expression_textview"
+        a:layout_width="0dp"
+        a:layout_height="wrap_content"
+        a:layout_weight="3"/>
+
+    <CheckBox
+        a:id="@+id/cpp_plot_function_pinned_checkbox"
+        a:layout_width="0dp"
+        a:layout_height="wrap_content"
+        a:layout_weight="1"/>
+
+    <CheckBox
+        a:id="@+id/cpp_plot_function_visible_checkbox"
+        a:layout_width="0dp"
+        a:layout_height="wrap_content"
+        a:layout_weight="1"/>
+
+	<ImageButton
+			a:id="@+id/cpp_plot_function_settings_button"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:src="@drawable/ab_settings"/>
+
+</LinearLayout>

android-app/res/layout/cpp_plot_function_settings_dialog.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    a:layout_width="wrap_content"
+    a:layout_height="wrap_content"
+    a:id="@+id/dialog_layout"
+    style="?cpp_dialog_style"
+    a:orientation="vertical">
+
+</LinearLayout>

android-app/res/layout/cpp_plot_function_settings_fragment.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    a:id="@+id/main_fragment_layout"
+    style="?cpp_fragment_layout_style"
+    a:layout_width="match_parent"
+    a:layout_height="match_parent"
+	a:orientation="vertical">
+
+    <include layout="@layout/ad" />
+
+	<TextView a:text="Line color type"
+			  a:layout_width="match_parent"
+			  a:layout_height="wrap_content"/>
+
+	<Spinner a:id="@+id/cpp_plot_function_line_color_type_spinner"
+			 a:entries="@array/cpp_plot_line_color_type_names"
+			 a:layout_width="match_parent"
+			 a:layout_height="wrap_content"/>
+
+	<TextView a:text="Line color"
+			  a:layout_width="match_parent"
+			  a:layout_height="wrap_content"/>
+
+	<Spinner a:id="@+id/cpp_plot_function_line_color_spinner"
+			 a:entries="@array/cpp_plot_line_color_names"
+			 a:layout_width="match_parent"
+			 a:layout_height="wrap_content"/>
+
+	<TextView a:text="Line style"
+			  a:layout_width="match_parent"
+			  a:layout_height="wrap_content"/>
+
+	<Spinner a:id="@+id/cpp_plot_function_line_style_spinner"
+			 a:entries="@array/cpp_plot_line_style_names"
+			 a:layout_width="match_parent"
+			 a:layout_height="wrap_content"/>
+
+	<Button a:id="@+id/cpp_ok_button"
+			a:text="@string/ok"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"/>
+
+</LinearLayout>

android-app/res/layout/cpp_plot_functions_fragment.xml

@@ -6,12 +6,6 @@
     a:layout_width="match_parent"
     a:layout_height="match_parent">
 
-    <TextView
-        a:id="@+id/fragment_title"
-        a:layout_height="wrap_content"
-        a:layout_width="match_parent"
-        style="?cpp_fragment_title_style" />
-
     <include layout="@layout/ad" />
 
     <LinearLayout
@@ -37,6 +31,10 @@
             a:layout_weight="1"
             a:text="Visible"/>
 
+		<TextView
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"/>
 
     </LinearLayout>
 

android-app/res/values/arrays.xml

@@ -87,19 +87,4 @@
 		<item>bin</item>
 	</string-array>
 
-    <string-array name="graph_line_color_names">
-        <item>@string/p_white_line_color</item>
-        <item>@string/p_grey_line_color</item>
-        <item>@string/p_red_line_color</item>
-        <item>@string/p_blue_line_color</item>
-        <item>@string/p_green_line_color</item>
-    </string-array>
-    <string-array name="graph_line_color_values">
-        <item>white</item>
-        <item>grey</item>
-        <item>red</item>
-        <item>blue</item>
-        <item>green</item>
-    </string-array>
-
 </resources>

android-app/res/xml/preferences_plot.xml

@@ -19,14 +19,14 @@
         <ListPreference a:key="graph_line_color_real"
                         a:title="@string/prefs_graph_real_color_title"
                         a:summary="@string/prefs_graph_real_color_summary"
-                        a:entries="@array/graph_line_color_names"
-                        a:entryValues="@array/graph_line_color_values"/>
+                        a:entries="@array/cpp_plot_line_color_names"
+                        a:entryValues="@array/cpp_plot_line_color_values"/>
 
         <ListPreference a:key="graph_line_color_imag"
                         a:title="@string/prefs_graph_imag_color_title"
                         a:summary="@string/prefs_graph_imag_color_summary"
-                        a:entries="@array/graph_line_color_names"
-                        a:entryValues="@array/graph_line_color_values"/>
+                        a:entries="@array/cpp_plot_line_color_names"
+                        a:entryValues="@array/cpp_plot_line_color_values"/>
 
     </PreferenceScreen>