This commit is contained in:
serso
2016-02-24 15:29:42 +01:00
parent b83d5f68e9
commit 828f9fa07b
47 changed files with 2450 additions and 596 deletions

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent" />

View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/list_item_height"
android:background="@drawable/material_clickable_selector"
android:gravity="center_vertical|start"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingRight="16dp"
tools:ignore="Overdraw">
<org.solovyev.android.plotter.PlotIconView
android:id="@+id/function_icon"
android:layout_width="40dp"
android:layout_height="match_parent" />
<TextView
android:id="@+id/fn_name_edittext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:drawableEnd="@drawable/ic_mode_edit_white_18dp"
android:drawablePadding="16dp"
android:drawableRight="@drawable/ic_mode_edit_white_18dp" />
</LinearLayout>

View File

@@ -31,51 +31,8 @@
a:layout_height="wrap_content"
a:orientation="vertical">
<android.support.design.widget.TextInputLayout
a:id="@+id/function_name_label"
a:layout_width="match_parent"
a:layout_height="wrap_content">
<EditText
a:id="@+id/function_name"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_function_name"
a:inputType="text" />
</android.support.design.widget.TextInputLayout>
<org.solovyev.android.calculator.functions.FunctionParamsView
a:id="@+id/function_params"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="vertical" />
<android.support.design.widget.TextInputLayout
a:id="@+id/function_body_label"
a:layout_width="match_parent"
a:layout_height="wrap_content">
<org.solovyev.android.calculator.view.EditTextCompat
a:id="@+id/function_body"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_function_value"
a:imeOptions="flagNoExtractUi"
a:inputType="text" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
a:layout_width="match_parent"
a:layout_height="wrap_content">
<EditText
a:id="@+id/function_description"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_function_description"
a:inputType="textMultiLine"
a:maxLines="4" />
</android.support.design.widget.TextInputLayout>
<include layout="@layout/fragment_function_edit_base_controls" />
</LinearLayout>

View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<merge xmlns:a="http://schemas.android.com/apk/res/android">
<android.support.design.widget.TextInputLayout
a:id="@+id/function_name_label"
a:layout_width="match_parent"
a:layout_height="wrap_content">
<EditText
a:id="@+id/function_name"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_function_name"
a:inputType="text" />
</android.support.design.widget.TextInputLayout>
<org.solovyev.android.calculator.functions.FunctionParamsView
a:id="@+id/function_params"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="vertical" />
<android.support.design.widget.TextInputLayout
a:id="@+id/function_body_label"
a:layout_width="match_parent"
a:layout_height="wrap_content">
<org.solovyev.android.calculator.view.EditTextCompat
a:id="@+id/function_body"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_function_value"
a:imeOptions="flagNoExtractUi"
a:inputType="text" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
a:layout_width="match_parent"
a:layout_height="wrap_content">
<EditText
a:id="@+id/function_description"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_function_description"
a:inputType="textMultiLine"
a:maxLines="4" />
</android.support.design.widget.TextInputLayout>
</merge>

View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<org.solovyev.android.plotter.PlotViewFrame xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/plot_view_frame"
a:layout_width="match_parent"
a:layout_height="match_parent">
<org.solovyev.android.plotter.PlotView
a:id="@id/plot_view"
a:layout_width="match_parent"
a:layout_height="match_parent" />
<org.solovyev.android.material.MaterialImageButton
a:id="@+id/plot_dimensions"
style="@style/CppPlotButton"
a:layout_gravity="top|start"
a:src="@drawable/ic_straighten_white_24dp" />
<org.solovyev.android.material.MaterialButton
a:id="@id/plot_3d_button"
style="@style/CppPlotButton"
a:layout_gravity="top|end"
a:text="@string/cpp_plot_3d" />
<LinearLayout
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="bottom|start"
a:orientation="vertical">
<org.solovyev.android.material.MaterialButton
a:id="@+id/plot_add_function"
style="@style/CppPlotButton"
a:text="@string/cpp_plot_add_function" />
<org.solovyev.android.material.MaterialImageButton
a:id="@+id/plot_functions"
style="@style/CppPlotButton"
a:src="@drawable/ic_list_white_24dp" />
</LinearLayout>
<LinearLayout
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="bottom|end"
a:orientation="vertical">
<org.solovyev.android.material.MaterialButton
a:id="@id/plot_zoom_in_button"
style="@style/CppPlotButton"
a:text="@string/cpp_plot_zoom_in" />
<org.solovyev.android.material.MaterialButton
a:id="@id/plot_zoom_reset_button"
style="@style/CppPlotButton"
a:text="@string/cpp_plot_zoom_reset" />
<org.solovyev.android.material.MaterialButton
a:id="@id/plot_zoom_out_button"
style="@style/CppPlotButton"
a:text="@string/cpp_plot_zoom_out" />
</LinearLayout>
</org.solovyev.android.plotter.PlotViewFrame>

View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/x_bounds"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputLayout
android:id="@+id/plot_x_min_label"
style="@style/DimensionTextInput">
<EditText
android:id="@+id/plot_x_min"
style="@style/DimensionEditText"
android:hint="@string/cpp_dimensions_x_min"
android:nextFocusRight="@+id/plot_x_max" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/plot_x_max_label"
style="@style/DimensionTextInput"
android:layout_marginLeft="@dimen/form_input_margin_hor"
android:layout_marginStart="@dimen/form_input_margin_hor">
<EditText
android:id="@+id/plot_x_max"
style="@style/DimensionEditText"
android:hint="@string/dimensions_x_max"
android:nextFocusDown="@+id/plot_y_min"
android:nextFocusRight="@+id/plot_y_min" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/y_bounds"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputLayout
android:id="@+id/plot_y_min_label"
style="@style/DimensionTextInput">
<EditText
android:id="@+id/plot_y_min"
style="@style/DimensionEditText"
android:hint="@string/dimensions_y_min"
android:nextFocusRight="@+id/plot_y_max" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/plot_y_max_label"
style="@style/DimensionTextInput"
android:layout_marginLeft="@dimen/form_input_margin_hor"
android:layout_marginStart="@dimen/form_input_margin_hor">
<EditText
android:id="@+id/plot_y_max"
style="@style/DimensionEditText.Last"
android:hint="@string/dimensions_y_max" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include layout="@layout/fragment_function_edit_base_controls" />
<LinearLayout
android:id="@+id/fn_meshspec_views"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<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:background="#212121"
android:padding="5dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/fn_linewidth_label"
style="@style/TextAppearance.AppCompat.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/fn_line_width" />
<SeekBar
android:id="@+id/fn_linewidth_seekbar"
android:layout_width="match_parent"
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" />
<uz.shift.colorpicker.LineColorPicker
android:id="@+id/fn_color_picker"
android:layout_width="match_parent"
android:layout_height="20dp"
app:lcp_orientation="horizontal" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>