UI changes

This commit is contained in:
serso
2016-03-01 17:43:11 +01:00
parent ea21bbe811
commit 9bcc4d4d9f
15 changed files with 91 additions and 94 deletions

View File

@@ -24,6 +24,4 @@
<org.solovyev.android.calculator.EditorView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor"
xmlns:a="http://schemas.android.com/apk/res/android"
a:hint="@string/c_calc_editor_hint"
a:padding="@dimen/cpp_editor_padding" />
xmlns:a="http://schemas.android.com/apk/res/android"/>

View File

@@ -6,19 +6,7 @@
~ or visit http://se.solovyev.org
-->
<FrameLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<TextView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor.Widget"
a:hint="@string/c_calc_editor_hint"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />
</FrameLayout>
<TextView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor.Widget"
xmlns:a="http://schemas.android.com/apk/res/android"/>

View File

@@ -6,19 +6,7 @@
~ or visit http://se.solovyev.org
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<TextView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor.Widget.Light"
a:hint="@string/c_calc_editor_hint"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />
</LinearLayout>
<TextView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor.Widget.Light"
xmlns:a="http://schemas.android.com/apk/res/android"/>

View File

@@ -22,11 +22,6 @@
a:layout_width="0dp"
a:layout_weight="3"
a:gravity="center_vertical|left"
a:hint="@string/c_calc_editor_hint"
a:padding="@dimen/cpp_editor_padding"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true"
a:textSize="@dimen/cpp_widget_editor_text_size_collapsed" />
<include

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="cpp_direction_text_size" translatable="false">0.4;0.4;0.4;0.35</string>
<string name="cpp_direction_text_size" translatable="false">0.4;0.4;0.4;0.4</string>
</resources>

View File

@@ -55,7 +55,6 @@
<item name="android:inputType">text|textNoSuggestions</item>
<item name="android:gravity">center_vertical|left</item>
<item name="android:scrollbars">horizontal</item>
<item name="android:padding">@dimen/cpp_editor_padding</item>
<item name="android:textColor">@color/cpp_text</item>
</style>
@@ -68,6 +67,7 @@
<item name="android:textColor">?attr/cpp_text_color</item>
<item name="android:inputType">textMultiLine|textNoSuggestions</item>
<item name="android:scrollbars">vertical</item>
<item name="android:padding">@dimen/cpp_editor_padding</item>
</style>
<style name="CppText.Display" parent="CppText">
@@ -120,6 +120,9 @@
<style name="CppText.Editor.Widget" parent="CppText.Editor">
<item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
<item name="android:textColor">@color/cpp_text</item>
<item name="android:scrollbars">vertical</item>
<item name="android:singleLine">false</item>
<item name="android:textIsSelectable">true</item>
</style>
<style name="CppText.Editor.Widget.Light" parent="CppText.Editor.Widget">

View File

@@ -5,7 +5,7 @@
<string name="cpp_kb_operators" translatable="false"></string>
<string name="cpp_kb_undo" translatable="false"></string>
<string name="cpp_kb_redo" translatable="false"></string>
<string name="cpp_direction_text_size" translatable="false">0.3;0.3;0.3;0.25</string>
<string name="cpp_direction_text_size" translatable="false">0.3;0.3;0.3;0.3</string>
<string name="cpp_plot_add_function" translatable="false">+</string>
<string name="cpp_plot_zoom_in" translatable="false">+</string>
<string name="cpp_plot_zoom_reset" translatable="false">0</string>