This commit is contained in:
Sergey Solovyev
2012-11-18 16:58:33 +04:00
parent 344018a44c
commit b3396d0ffe
63 changed files with 208 additions and 207 deletions

View File

@@ -27,7 +27,7 @@
a:layout_gravity="top|center_horizontal"
a:layout_weight="1"
a:scrollbars="vertical"
style="@style/about_style"/>
style="@style/cpp_about_style"/>
<!--
a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility

View File

@@ -9,8 +9,8 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculatorDisplay"
style="@style/display_style"
a:padding="@dimen/display_padding"
style="@style/cpp_display_style"
a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"

View File

@@ -9,8 +9,8 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculatorDisplay"
style="@style/display_style"
a:padding="@dimen/display_padding"
style="@style/cpp_display_style"
a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine"
a:maxLines="3"
a:scrollHorizontally="false"

View File

@@ -11,11 +11,11 @@
style="?fragmentLayoutStyle"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/editor_padding">
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculatorEditor"
style="@style/editor_style"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"

View File

@@ -11,11 +11,11 @@
style="?fragmentLayoutStyle"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/editor_padding">
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculatorEditor"
style="@style/editor_style"
style="@style/cpp_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"

View File

@@ -16,14 +16,14 @@
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:layout_gravity="left"
style="@style/WindowTitle"
style="@style/cpp_window_title"
a:text="@string/c_app_name"/>
<org.solovyev.android.calculator.view.CalculatorAdditionalTitle
a:id="@+id/additional_title_text"
a:layout_width="fill_parent"
a:layout_height="wrap_content"
style="@style/WindowTitle"
style="@style/cpp_window_title"
a:gravity="center_vertical|right"
a:layout_gravity="right"/>

View File

@@ -24,10 +24,10 @@
a:orientation="horizontal"
a:gravity="center">
<Button a:id="@+id/ok_button"
<Button a:id="@+id/close_button"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:text="@string/ok"/>
a:text="@string/close"/>
</LinearLayout>

View File

@@ -17,7 +17,7 @@
a:id="@+id/fix_button"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:layout_weight="2"
a:text="@string/fix"/>
</LinearLayout>

View File

@@ -23,7 +23,7 @@
a:layout_height="fill_parent"
a:layout_width="wrap_content"
a:padding="6dp"
style="@style/default_text_size"/>
style="@style/cpp_default_text_size"/>
</LinearLayout>

View File

@@ -11,7 +11,7 @@
a:layout_height="fill_parent">
<TextView a:id="@+id/feedbackText"
style="@style/about_style"
style="@style/cpp_about_style"
a:layout_width="fill_parent"
a:text="@string/c_feedback_text"
a:layout_height="fill_parent"/>

View File

@@ -18,19 +18,19 @@
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:text="@string/c_function_name"/>
<EditText a:id="@+id/function_edit_name"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:text="@string/c_function_parameters"/>
<org.solovyev.android.calculator.function.FunctionParamsView
@@ -40,26 +40,26 @@
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_function_value"/>
<EditText a:id="@+id/function_edit_value"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:text="@string/c_function_description"/>
<EditText a:id="@+id/function_edit_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<LinearLayout

View File

@@ -27,7 +27,7 @@
a:id="@+id/function_param_edit_text"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="text" />
</LinearLayout>

View File

@@ -28,7 +28,7 @@
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
style="@style/cpp_about_style"/>
</ScrollView>

View File

@@ -27,7 +27,7 @@
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
style="@style/cpp_about_style"/>
</ScrollView>

View File

@@ -27,7 +27,7 @@
a:layout_height="wrap_content"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
style="@style/cpp_about_style"/>
</ScrollView>

View File

@@ -21,7 +21,7 @@
<TextView a:layout_height="fill_parent"
a:layout_width="fill_parent"
a:padding="6dp"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:text="@string/c_history_expression"/>
<TextView a:id="@+id/history_edit_expression"
@@ -29,12 +29,12 @@
a:padding="6dp"
a:textStyle="bold"
a:layout_height="wrap_content"
style="@style/default_text_size">
style="@style/cpp_default_text_size">
</TextView>
<TextView a:layout_height="fill_parent"
a:layout_width="fill_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_history_comment"/>
@@ -44,7 +44,7 @@
a:minLines="4"
a:maxLines="4"
a:gravity="top|left"
style="@style/default_text_size">
style="@style/cpp_default_text_size">
</EditText>
</LinearLayout>

View File

@@ -20,7 +20,7 @@
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/button_operator_text_color"
a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item"/>
<LinearLayout a:orientation="horizontal"

View File

@@ -24,7 +24,7 @@
a:layout_height="0dp">
<include layout="@layout/calc_equals_button"
a:layout_margin="@dimen/button_margin"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent"/>

View File

@@ -24,7 +24,7 @@
a:layout_height="0dp">
<include layout="@layout/calc_equals_button"
a:layout_margin="@dimen/button_margin"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent"/>

View File

@@ -10,7 +10,7 @@
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?fragmentListViewItemStyle"
a:paddingBottom="@dimen/pane_padding"
a:paddingBottom="@dimen/cpp_pane_padding"
a:orientation="vertical">
<TextView a:id="@+id/math_entity_text"

View File

@@ -11,7 +11,7 @@
a:layout_height="fill_parent">
<TextView a:id="@+id/notespp_announce"
style="@style/about_style"
style="@style/cpp_about_style"
a:layout_width="fill_parent"
a:text="@string/c_notespp_announce_text"
a:layout_height="fill_parent"/>

View File

@@ -19,7 +19,7 @@
a:layout_weight="1"
a:gravity="top|left"
a:scrollbars="vertical"
style="@style/about_style"/>
style="@style/cpp_about_style"/>
<!--
a:scrollbarFadeDuration="0" is not support in android_1.6_compatibility

View File

@@ -20,7 +20,7 @@
<TextView a:id="@+id/history_item"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:textColor="@color/button_operator_text_color"
a:textColor="@color/cpp_button_operator_text_color"
style="@style/history_item"/>
<LinearLayout a:orientation="horizontal"

View File

@@ -18,37 +18,37 @@
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:text="@string/c_var_name"/>
<EditText a:id="@+id/var_edit_name"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:padding="6dp"
a:text="@string/c_var_value"/>
<EditText a:id="@+id/var_edit_value"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="numberDecimal"/>
<TextView a:layout_height="wrap_content"
a:layout_width="match_parent"
a:padding="6dp"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:text="@string/c_var_description"/>
<EditText a:id="@+id/var_edit_description"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/default_text_size"
style="@style/cpp_default_text_size"
a:inputType="text"/>
<LinearLayout

View File

@@ -9,8 +9,8 @@
<TextView
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculatorDisplay"
style="@style/widget_display_style"
style="@style/cpp_widget_display_style"
a:textIsSelectable="true"
a:padding="@dimen/display_padding"
a:padding="@dimen/cpp_display_padding"
a:singleLine="false"
a:scrollbars="vertical"/>

View File

@@ -11,11 +11,11 @@
style="@style/default_fragment_layout_style"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/editor_padding">
a:padding="@dimen/cpp_editor_padding">
<TextView
a:id="@+id/calculatorEditor"
style="@style/widget_editor_style"
style="@style/cpp_widget_editor_style"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"

View File

@@ -16,7 +16,7 @@
a:layout_height="0dp">
<include layout="@layout/widget_equals_button"
a:layout_margin="@dimen/button_margin"
a:layout_margin="@dimen/cpp_button_margin"
a:layout_weight="1"
a:layout_width="0dp"
a:layout_height="match_parent"/>