Changes
This commit is contained in:
parent
5ae964a8b2
commit
fa7904c1cd
@ -9,7 +9,7 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainLayoutStyle">
|
||||
style="?cpp_main_layout_style">
|
||||
|
||||
<include layout="@layout/main_first_pane"/>
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainLayoutStyle">
|
||||
style="?cpp_main_layout_style">
|
||||
|
||||
<include layout="@layout/main_first_pane_mobile"/>
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainMultiPaneLayoutStyle">
|
||||
style="?cpp_main_multi_pane_layout_style">
|
||||
|
||||
<LinearLayout
|
||||
a:layout_height="0dp"
|
||||
@ -28,13 +28,13 @@
|
||||
<LinearLayout a:id="@+id/editorContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="1"/>
|
||||
|
||||
<LinearLayout a:id="@+id/displayContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -44,7 +44,7 @@
|
||||
a:layout_width="0dp"
|
||||
a:layout_weight="1"
|
||||
a:orientation="vertical"
|
||||
style="?paneStyle"/>
|
||||
style="?cpp_pane_style"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -52,6 +52,6 @@
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_weight="2"
|
||||
style="?paneStyleTransparent"/>
|
||||
style="?cpp_pane_style_transparent"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -8,17 +8,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
|
||||
a:id="@+id/calculatorDisplay"
|
||||
a:id="@+id/calculator_display"
|
||||
style="@style/cpp_display_style"
|
||||
a:inputType="textMultiLine"
|
||||
a:maxLines="3"
|
||||
|
@ -8,17 +8,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorEditorView
|
||||
a:id="@+id/calculatorEditor"
|
||||
a:id="@+id/calculator_editor"
|
||||
style="@style/cpp_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:singleLine="false"
|
||||
|
@ -9,7 +9,7 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainMultiPaneLayoutStyle">
|
||||
style="?cpp_main_multi_pane_layout_style">
|
||||
|
||||
<LinearLayout
|
||||
a:layout_height="0dp"
|
||||
@ -28,13 +28,13 @@
|
||||
<LinearLayout a:id="@+id/editorContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="4"/>
|
||||
|
||||
<LinearLayout a:id="@+id/displayContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -44,7 +44,7 @@
|
||||
a:layout_width="0dp"
|
||||
a:layout_weight="1"
|
||||
a:orientation="vertical"
|
||||
style="?paneStyle"/>
|
||||
style="?cpp_pane_style"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -52,6 +52,6 @@
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_weight="2"
|
||||
style="?paneStyleTransparent"/>
|
||||
style="?cpp_pane_style_transparent"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -9,7 +9,7 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainMultiPaneLayoutStyle">
|
||||
style="?cpp_main_multi_pane_layout_style">
|
||||
|
||||
<LinearLayout
|
||||
a:layout_height="0dp"
|
||||
@ -28,13 +28,13 @@
|
||||
<LinearLayout a:id="@+id/editorContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="3"/>
|
||||
|
||||
<LinearLayout a:id="@+id/displayContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -44,7 +44,7 @@
|
||||
a:layout_width="0dp"
|
||||
a:layout_weight="1"
|
||||
a:orientation="vertical"
|
||||
style="?paneStyle"/>
|
||||
style="?cpp_pane_style"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -52,6 +52,6 @@
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_weight="1"
|
||||
style="?paneStyleTransparent"/>
|
||||
style="?cpp_pane_style_transparent"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -8,17 +8,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
|
||||
a:id="@+id/calculatorDisplay"
|
||||
a:id="@+id/calculator_display"
|
||||
style="@style/cpp_display_style"
|
||||
a:inputType="textMultiLine"
|
||||
a:maxLines="3"
|
||||
|
@ -8,17 +8,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorEditorView
|
||||
a:id="@+id/calculatorEditor"
|
||||
a:id="@+id/calculator_editor"
|
||||
style="@style/cpp_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:singleLine="false"
|
||||
|
@ -9,7 +9,7 @@
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainMultiPaneLayoutStyle">
|
||||
style="?cpp_main_multi_pane_layout_style">
|
||||
|
||||
<LinearLayout
|
||||
a:layout_height="0dp"
|
||||
@ -28,13 +28,13 @@
|
||||
<LinearLayout a:id="@+id/editorContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="4"/>
|
||||
|
||||
<LinearLayout a:id="@+id/displayContainer"
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
style="?paneStyle"
|
||||
style="?cpp_pane_style"
|
||||
a:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -44,7 +44,7 @@
|
||||
a:layout_width="0dp"
|
||||
a:layout_weight="1"
|
||||
a:orientation="vertical"
|
||||
style="?paneStyle"/>
|
||||
style="?cpp_pane_style"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -52,6 +52,6 @@
|
||||
a:layout_height="0dp"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_weight="1"
|
||||
style="?paneStyleTransparent"/>
|
||||
style="?cpp_pane_style_transparent"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -14,5 +14,5 @@
|
||||
c:textDown="bin"
|
||||
c:textLeft="hex"
|
||||
a:textStyle="bold"
|
||||
style="?controlImageButtonStyle"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="clearButtonClickHandler"/>
|
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/copyButton"
|
||||
a:src="@drawable/kb_copy"
|
||||
style="?controlImageButtonStyle"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="copyButtonClickHandler"/>
|
@ -8,7 +8,7 @@
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/calculatorDisplay"
|
||||
a:id="@+id/calculator_display"
|
||||
style="@style/cpp_display_style"
|
||||
a:padding="@dimen/cpp_display_padding"
|
||||
a:inputType="textMultiLine"
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorDisplayView
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/calculatorDisplay"
|
||||
a:id="@+id/calculator_display"
|
||||
style="@style/cpp_display_style"
|
||||
a:padding="@dimen/cpp_display_padding"
|
||||
a:inputType="textMultiLine"
|
||||
|
@ -13,5 +13,5 @@
|
||||
a:text="/"
|
||||
c:textDown="√"
|
||||
c:directionTextScale="0.5"
|
||||
style="?operationButtonStyle"
|
||||
style="?cpp_operation_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/likeButton"
|
||||
a:src="@drawable/kb_facebook"
|
||||
style="?controlImageButtonStyle"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="likeButtonClickHandler"/>
|
@ -12,5 +12,5 @@
|
||||
a:text="."
|
||||
c:textUp=","
|
||||
c:directionTextScale="0.5"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -8,13 +8,13 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:padding="@dimen/cpp_editor_padding">
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorEditorView
|
||||
a:id="@+id/calculatorEditor"
|
||||
a:id="@+id/calculator_editor"
|
||||
style="@style/cpp_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:singleLine="false"
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent"
|
||||
a:padding="@dimen/cpp_editor_padding">
|
||||
|
||||
<org.solovyev.android.calculator.AndroidCalculatorEditorView
|
||||
a:id="@+id/calculatorEditor"
|
||||
a:id="@+id/calculator_editor"
|
||||
style="@style/cpp_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:singleLine="false"
|
||||
|
@ -13,5 +13,5 @@
|
||||
c:textLeft="0d:"
|
||||
c:textDown="lg"
|
||||
c:directionTextScale="0.5;0.5;0.5;0.33"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -7,4 +7,4 @@
|
||||
-->
|
||||
<org.solovyev.android.view.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
xmlns:c="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
|
||||
style="?controlButtonStyle"/>
|
||||
style="?cpp_control_button_style"/>
|
@ -14,5 +14,5 @@
|
||||
c:directionTextScale="0.5"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent"
|
||||
style="?controlButtonStyle"
|
||||
style="?cpp_control_button_style"
|
||||
a:onClick="equalsButtonClickHandler"/>
|
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/eraseButton"
|
||||
a:src="@drawable/kb_delete"
|
||||
style="?controlImageButtonStyle"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="eraseButtonClickHandler"/>
|
@ -12,5 +12,5 @@
|
||||
c:textUp="t"
|
||||
c:textLeft="E"
|
||||
c:textDown="j"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -12,5 +12,5 @@
|
||||
c:textUp="x"
|
||||
c:textLeft="D"
|
||||
c:textDown="y"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -14,4 +14,4 @@
|
||||
a:text="ƒ(x)"
|
||||
a:textStyle="italic"
|
||||
a:onClick="functionsButtonClickHandler"
|
||||
style="?controlButtonStyle" />
|
||||
style="?cpp_control_button_style" />
|
@ -12,6 +12,6 @@
|
||||
c:textUp="@string/c_undo"
|
||||
c:textDown="@string/c_redo"
|
||||
c:directionTextScale="0.27"
|
||||
style="?controlButtonStyle"
|
||||
style="?cpp_control_button_style"
|
||||
a:textStyle="bold"
|
||||
a:onClick="historyButtonClickHandler"/>
|
@ -12,5 +12,5 @@
|
||||
c:textUp="◀◀"
|
||||
a:text="◀"
|
||||
c:directionTextScale="0.5"
|
||||
style="?controlButtonStyle"
|
||||
style="?cpp_control_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -13,6 +13,6 @@
|
||||
c:textUp="^"
|
||||
c:textDown="^2"
|
||||
c:textLeft="Π"
|
||||
style="?operationButtonStyle"
|
||||
style="?cpp_operation_button_style"
|
||||
c:directionTextScale="0.5"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -13,5 +13,5 @@
|
||||
c:textLeft="0x:"
|
||||
c:textUp="π"
|
||||
c:directionTextScale="0.5;0.5;0.5;0.33"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -13,5 +13,5 @@
|
||||
c:textUp="sin"
|
||||
c:textLeft="A"
|
||||
c:textDown="asin"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -10,4 +10,4 @@
|
||||
a:id="@+id/functions_button"
|
||||
a:text="∂,…"
|
||||
a:onClick="operatorsButtonClickHandler"
|
||||
style="?controlButtonStyle"/>
|
||||
style="?cpp_control_button_style"/>
|
@ -9,5 +9,5 @@
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/pasteButton"
|
||||
a:src="@drawable/kb_paste"
|
||||
style="?controlImageButtonStyle"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="pasteButtonClickHandler"/>
|
@ -12,5 +12,5 @@
|
||||
c:textUp="°"
|
||||
c:textDown="E"
|
||||
a:text="+"
|
||||
style="?operationButtonStyle"
|
||||
style="?cpp_operation_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -12,5 +12,5 @@
|
||||
c:textUp="▶▶"
|
||||
a:text="▶"
|
||||
c:directionTextScale="0.5"
|
||||
style="?controlButtonStyle"
|
||||
style="?cpp_control_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -14,5 +14,5 @@
|
||||
c:textDown=")"
|
||||
c:textLeft="(…)"
|
||||
c:directionTextScale="0.5;0.5;0.5;0.33"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -13,5 +13,5 @@
|
||||
c:textLeft="0b:"
|
||||
c:textDown="!"
|
||||
c:directionTextScale="0.5;0.5;0.5;0.33"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -14,5 +14,5 @@
|
||||
c:textLeft="F"
|
||||
c:textDown="rad"
|
||||
c:directionTextScale="0.33;0.30;0.33;0.33"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -11,5 +11,5 @@
|
||||
c:textDown="∂,…"
|
||||
a:text="-"
|
||||
c:directionTextScale="0.5"
|
||||
style="?operationButtonStyle"
|
||||
style="?cpp_operation_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -13,5 +13,5 @@
|
||||
c:textUp="tan"
|
||||
c:textLeft="C"
|
||||
c:textDown="atan"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -13,5 +13,5 @@
|
||||
c:textUp="cos"
|
||||
c:textLeft="B"
|
||||
c:textDown="acos"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -14,4 +14,4 @@
|
||||
a:text="π,…"
|
||||
a:textStyle="italic"
|
||||
a:onClick="varsButtonClickHandler"
|
||||
style="?controlButtonStyle"/>
|
||||
style="?cpp_control_button_style"/>
|
@ -13,5 +13,5 @@
|
||||
a:text="0"
|
||||
c:textDown="000"
|
||||
c:directionTextScale="0.5"
|
||||
style="?digitButtonStyle"
|
||||
style="?cpp_digit_button_style"
|
||||
a:onClick="digitButtonClickHandler"/>
|
@ -3,7 +3,7 @@
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:layout_width="wrap_content"
|
||||
a:layout_height="wrap_content"
|
||||
style="?dialogStyle"
|
||||
style="?cpp_dialog_style"
|
||||
a:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
|
@ -27,7 +27,7 @@
|
||||
c:textDown="@string/c_down"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"
|
||||
style="?digitButtonStyle"/>
|
||||
style="?cpp_digit_button_style"/>
|
||||
|
||||
<org.solovyev.android.view.drag.DirectionDragButton a:id="@+id/calibrationButtonRight"
|
||||
a:text=""
|
||||
@ -35,7 +35,7 @@
|
||||
c:textDown="@string/c_down"
|
||||
a:layout_width="80dp"
|
||||
a:layout_height="80dp"
|
||||
style="?digitButtonStyle"/>
|
||||
style="?cpp_digit_button_style"/>
|
||||
|
||||
<ImageView a:id="@+id/calibrationArrowRight"
|
||||
a:layout_gravity="right"
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
|
@ -7,14 +7,14 @@
|
||||
-->
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
|
@ -7,14 +7,14 @@
|
||||
-->
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
|
@ -2,17 +2,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
<ListView style="?fragmentListViewStyle"/>
|
||||
<ListView style="?cpp_fragment_list_view_style"/>
|
||||
|
||||
</LinearLayout>
|
@ -8,7 +8,7 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:orientation="vertical"
|
||||
style="?fragmentListViewItemStyle"
|
||||
style="?cpp_fragment_list_view_item_style"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent">
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
a:layout_height="match_parent"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainLayoutStyle">
|
||||
style="?cpp_main_layout_style">
|
||||
|
||||
<LinearLayout a:id="@+id/editorContainer"
|
||||
a:layout_weight="2"
|
||||
|
@ -12,7 +12,7 @@
|
||||
a:layout_height="match_parent"
|
||||
a:id="@+id/main_layout"
|
||||
a:orientation="vertical"
|
||||
style="?mainLayoutStyle">
|
||||
style="?cpp_main_layout_style">
|
||||
|
||||
<LinearLayout a:id="@+id/editorContainer"
|
||||
a:layout_weight="2"
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
style="?mainLayoutStyle"
|
||||
style="?cpp_main_layout_style"
|
||||
a:orientation="vertical">
|
||||
|
||||
</LinearLayout>
|
@ -8,7 +8,7 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_layout"
|
||||
style="?mainMultiPaneLayoutStyle"
|
||||
style="?cpp_main_multi_pane_layout_style"
|
||||
a:orientation="vertical">
|
||||
|
||||
</LinearLayout>
|
@ -2,17 +2,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
<ListView style="?fragmentListViewStyle"/>
|
||||
<ListView style="?cpp_fragment_list_view_style"/>
|
||||
|
||||
</LinearLayout>
|
@ -9,7 +9,7 @@
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentListViewItemStyle"
|
||||
style="?cpp_fragment_list_view_item_style"
|
||||
a:paddingBottom="@dimen/cpp_pane_padding"
|
||||
a:orientation="vertical">
|
||||
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:orientation="vertical"
|
||||
style="?fragmentListViewItemStyle"
|
||||
style="?cpp_fragment_list_view_item_style"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent">
|
||||
|
||||
|
@ -8,17 +8,17 @@
|
||||
|
||||
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="?fragmentLayoutStyle"
|
||||
style="?cpp_fragment_layout_style"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<TextView a:id="@+id/fragmentTitle"
|
||||
<TextView a:id="@+id/fragment_title"
|
||||
a:layout_height="wrap_content"
|
||||
a:layout_width="match_parent"
|
||||
style="?fragmentTitleStyle"/>
|
||||
style="?cpp_fragment_title_style"/>
|
||||
|
||||
<include layout="@layout/ad"/>
|
||||
|
||||
<ListView style="?fragmentListViewStyle"/>
|
||||
<ListView style="?cpp_fragment_list_view_style"/>
|
||||
|
||||
</LinearLayout>
|
@ -8,7 +8,7 @@
|
||||
|
||||
<TextView
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/calculatorDisplay"
|
||||
a:id="@+id/calculator_display"
|
||||
style="@style/cpp_widget_display_style"
|
||||
a:textIsSelectable="true"
|
||||
a:padding="@dimen/cpp_display_padding"
|
||||
|
@ -14,7 +14,7 @@
|
||||
a:padding="@dimen/cpp_editor_padding">
|
||||
|
||||
<TextView
|
||||
a:id="@+id/calculatorEditor"
|
||||
a:id="@+id/calculator_editor"
|
||||
style="@style/cpp_widget_editor_style"
|
||||
a:textIsSelectable="true"
|
||||
a:singleLine="false"
|
||||
|
@ -1,19 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<attr name="dialogStyle" format="reference" />
|
||||
<attr name="digitButtonStyle" format="reference" />
|
||||
<attr name="controlButtonStyle" format="reference" />
|
||||
<attr name="controlImageButtonStyle" format="reference" />
|
||||
<attr name="operationButtonStyle" format="reference" />
|
||||
<attr name="fragmentLayoutStyle" format="reference" />
|
||||
<attr name="fragmentTitleStyle" format="reference" />
|
||||
<attr name="fragmentListViewStyle" format="reference" />
|
||||
<attr name="fragmentListViewItemStyle" format="reference" />
|
||||
<attr name="buttonStyle" format="reference" />
|
||||
<attr name="paneStyle" format="reference" />
|
||||
<attr name="paneStyleTransparent" format="reference" />
|
||||
<attr name="mainLayoutStyle" format="reference" />
|
||||
<attr name="mainMultiPaneLayoutStyle" format="reference" />
|
||||
<attr name="cpp_dialog_style" format="reference" />
|
||||
<attr name="cpp_digit_button_style" format="reference" />
|
||||
<attr name="cpp_control_button_style" format="reference" />
|
||||
<attr name="cpp_control_image_button_style" format="reference" />
|
||||
<attr name="cpp_operation_button_style" format="reference" />
|
||||
<attr name="cpp_fragment_layout_style" format="reference" />
|
||||
<attr name="cpp_fragment_title_style" format="reference" />
|
||||
<attr name="cpp_fragment_list_view_style" format="reference" />
|
||||
<attr name="cpp_fragment_list_view_item_style" format="reference" />
|
||||
<attr name="cpp_button_style" format="reference" />
|
||||
<attr name="cpp_pane_style" format="reference" />
|
||||
<attr name="cpp_pane_style_transparent" format="reference" />
|
||||
<attr name="cpp_main_layout_style" format="reference" />
|
||||
<attr name="cpp_main_multi_pane_layout_style" format="reference" />
|
||||
|
||||
</resources>
|
||||
|
@ -115,24 +115,24 @@
|
||||
</style>
|
||||
|
||||
<style name="default_theme" parent="Theme.Sherlock">
|
||||
<item name="digitButtonStyle">@style/default_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/default_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/default_control_image_button_style</item>
|
||||
<item name="operationButtonStyle">@style/default_operation_button_style</item>
|
||||
<item name="fragmentTitleStyle">@style/default_fragment_title_style</item>
|
||||
<item name="fragmentListViewStyle">@style/default_fragment_list_view_style</item>
|
||||
<item name="fragmentListViewItemStyle">@style/default_fragment_list_view_item_style</item>
|
||||
<item name="buttonStyle">@style/default_button_style</item>
|
||||
<item name="cpp_digit_button_style">@style/default_digit_button_style</item>
|
||||
<item name="cpp_control_button_style">@style/default_control_button_style</item>
|
||||
<item name="cpp_control_image_button_style">@style/default_control_image_button_style</item>
|
||||
<item name="cpp_operation_button_style">@style/default_operation_button_style</item>
|
||||
<item name="cpp_fragment_title_style">@style/default_fragment_title_style</item>
|
||||
<item name="cpp_fragment_list_view_style">@style/default_fragment_list_view_style</item>
|
||||
<item name="cpp_fragment_list_view_item_style">@style/default_fragment_list_view_item_style</item>
|
||||
<item name="cpp_button_style">@style/default_button_style</item>
|
||||
|
||||
<item name="mainLayoutStyle">@style/default_main_layout_style</item>
|
||||
<item name="mainMultiPaneLayoutStyle">@style/default_main_multi_pane_layout_style</item>
|
||||
<item name="cpp_main_layout_style">@style/default_main_layout_style</item>
|
||||
<item name="cpp_main_multi_pane_layout_style">@style/default_main_multi_pane_layout_style</item>
|
||||
|
||||
<item name="fragmentLayoutStyle">@style/default_fragment_layout_style</item>
|
||||
<item name="cpp_fragment_layout_style">@style/default_fragment_layout_style</item>
|
||||
|
||||
<item name="dialogStyle">@style/default_dialog_style</item>
|
||||
<item name="cpp_dialog_style">@style/default_dialog_style</item>
|
||||
|
||||
<item name="paneStyle">@style/default_pane_style</item>
|
||||
<item name="paneStyleTransparent">@style/default_pane_style_transparent</item>
|
||||
<item name="cpp_pane_style">@style/default_pane_style</item>
|
||||
<item name="cpp_pane_style_transparent">@style/default_pane_style_transparent</item>
|
||||
|
||||
<!-- action bar-->
|
||||
<item name="actionBarTabStyle">@style/default_actionbar_tab_style</item>
|
||||
|
@ -24,10 +24,10 @@
|
||||
</style>
|
||||
|
||||
<style name="light_blue_theme" parent="default_theme">
|
||||
<item name="digitButtonStyle">@style/light_blue_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/light_blue_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/light_blue_control_image_button_style</item>
|
||||
<item name="operationButtonStyle">@style/light_blue_operation_button_style</item>
|
||||
<item name="cpp_digit_button_style">@style/light_blue_digit_button_style</item>
|
||||
<item name="cpp_control_button_style">@style/light_blue_control_button_style</item>
|
||||
<item name="cpp_control_image_button_style">@style/light_blue_control_image_button_style</item>
|
||||
<item name="cpp_operation_button_style">@style/light_blue_operation_button_style</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
@ -48,12 +48,12 @@
|
||||
</style>
|
||||
|
||||
<style name="metro_blue_theme" parent="default_theme">
|
||||
<item name="digitButtonStyle">@style/metro_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/metro_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/metro_control_image_button_style</item>
|
||||
<item name="operationButtonStyle">@style/metro_blue_operation_button_style</item>
|
||||
<item name="cpp_digit_button_style">@style/metro_digit_button_style</item>
|
||||
<item name="cpp_control_button_style">@style/metro_control_button_style</item>
|
||||
<item name="cpp_control_image_button_style">@style/metro_control_image_button_style</item>
|
||||
<item name="cpp_operation_button_style">@style/metro_blue_operation_button_style</item>
|
||||
|
||||
<item name="fragmentListViewItemStyle">@style/metro_blue_fragment_list_view_item_style</item>
|
||||
<item name="cpp_fragment_list_view_item_style">@style/metro_blue_fragment_list_view_item_style</item>
|
||||
|
||||
<!--action bar-->
|
||||
<!-- <item name="actionBarTabStyle">@style/metro_blue_actionbar_tab_style</item>
|
||||
|
@ -10,8 +10,8 @@
|
||||
</style>
|
||||
|
||||
<style name="metro_green_theme" parent="metro_blue_theme">
|
||||
<item name="operationButtonStyle">@style/metro_green_operation_button_style</item>
|
||||
<item name="fragmentListViewItemStyle">@style/metro_green_fragment_list_view_item_style</item>
|
||||
<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
|
||||
<item name="cpp_fragment_list_view_item_style">@style/metro_green_fragment_list_view_item_style</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
@ -11,8 +11,8 @@
|
||||
</style>
|
||||
|
||||
<style name="metro_purple_theme" parent="metro_blue_theme">
|
||||
<item name="operationButtonStyle">@style/metro_purple_operation_button_style</item>
|
||||
<item name="fragmentListViewItemStyle">@style/metro_purple_fragment_list_view_item_style</item>
|
||||
<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
|
||||
<item name="cpp_fragment_list_view_item_style">@style/metro_purple_fragment_list_view_item_style</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
@ -23,9 +23,9 @@
|
||||
</style>
|
||||
|
||||
<style name="violet_theme" parent="default_theme">
|
||||
<item name="digitButtonStyle">@style/violet_digit_button_style</item>
|
||||
<item name="controlButtonStyle">@style/violet_control_button_style</item>
|
||||
<item name="controlImageButtonStyle">@style/violet_control_image_button_style</item>
|
||||
<item name="operationButtonStyle">@style/violet_operation_button_style</item>
|
||||
<item name="cpp_digit_button_style">@style/violet_digit_button_style</item>
|
||||
<item name="cpp_control_button_style">@style/violet_control_button_style</item>
|
||||
<item name="cpp_control_image_button_style">@style/violet_control_image_button_style</item>
|
||||
<item name="cpp_operation_button_style">@style/violet_operation_button_style</item>
|
||||
</style>
|
||||
</resources>
|
@ -59,7 +59,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
|
||||
}
|
||||
|
||||
public void setDisplay(@NotNull Activity activity) {
|
||||
final AndroidCalculatorDisplayView displayView = (AndroidCalculatorDisplayView) activity.findViewById(R.id.calculatorDisplay);
|
||||
final AndroidCalculatorDisplayView displayView = (AndroidCalculatorDisplayView) activity.findViewById(R.id.calculator_display);
|
||||
setDisplay(activity, displayView);
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ public class AndroidCalculator implements Calculator, CalculatorEventListener, S
|
||||
}
|
||||
|
||||
public void setEditor(@NotNull Activity activity) {
|
||||
final AndroidCalculatorEditorView editorView = (AndroidCalculatorEditorView) activity.findViewById(R.id.calculatorEditor);
|
||||
final AndroidCalculatorEditorView editorView = (AndroidCalculatorEditorView) activity.findViewById(R.id.calculator_editor);
|
||||
setEditor(activity, editorView);
|
||||
}
|
||||
|
||||
|
@ -47,7 +47,7 @@ public class CalculatorFragmentHelperImpl extends AbstractCalculatorHelper imple
|
||||
}
|
||||
|
||||
public void setPaneTitle(@NotNull Fragment fragment, int titleResId) {
|
||||
final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragmentTitle);
|
||||
final TextView fragmentTitle = (TextView) fragment.getView().findViewById(R.id.fragment_title);
|
||||
if (fragmentTitle != null) {
|
||||
if (!isPane(fragment)) {
|
||||
fragmentTitle.setVisibility(View.GONE);
|
||||
|
@ -204,10 +204,10 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
|
||||
|
||||
private void updateDisplayState(@NotNull Context context, @NotNull RemoteViews views, @NotNull CalculatorDisplayViewState displayState) {
|
||||
if (displayState.isValid()) {
|
||||
views.setTextViewText(R.id.calculatorDisplay, displayState.getText());
|
||||
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_default_text_color));
|
||||
views.setTextViewText(R.id.calculator_display, displayState.getText());
|
||||
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_default_text_color));
|
||||
} else {
|
||||
views.setTextColor(R.id.calculatorDisplay, context.getResources().getColor(R.color.cpp_display_error_text_color));
|
||||
views.setTextColor(R.id.calculator_display, context.getResources().getColor(R.color.cpp_display_error_text_color));
|
||||
}
|
||||
}
|
||||
|
||||
@ -221,7 +221,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
|
||||
newText = Html.fromHtml(text.substring(0, selection) + "<font color=\"#" + getCursorColor(context) + "\">|</font>" + text.substring(selection));
|
||||
}
|
||||
CalculatorLocatorImpl.getInstance().getNotifier().showDebugMessage(TAG, "New editor state: " + text);
|
||||
views.setTextViewText(R.id.calculatorEditor, newText);
|
||||
views.setTextViewText(R.id.calculator_editor, newText);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user