Themes refactored

This commit is contained in:
serso
2015-02-07 18:06:03 +01:00
parent 323011391c
commit c46a276f3f
87 changed files with 346 additions and 400 deletions

View File

@@ -51,7 +51,7 @@
a:text="@string/c_about_content"
a:layout_height="match_parent"
a:layout_width="match_parent"
style="@style/cpp_about_style" />
style="@style/CppText.About" />
<TextView
@@ -60,7 +60,7 @@
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:paddingBottom="0dp"
style="@style/cpp_about_style" />
style="@style/CppText.About" />
<TextView
a:id="@+id/cpp_about_translators"
@@ -68,7 +68,7 @@
a:layout_height="wrap_content"
a:layout_width="match_parent"
a:paddingTop="0dp"
style="@style/cpp_about_style" />
style="@style/CppText.About" />
</LinearLayout>
</ScrollView>

View File

@@ -29,4 +29,4 @@
a:text="0"
c:textDown="000"
c:directionTextScale="0.5"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -29,4 +29,4 @@
c:textUp="sin"
c:textLeft="A"
c:textDown="asin"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -29,4 +29,4 @@
c:textUp="cos"
c:textLeft="B"
c:textDown="acos"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -29,4 +29,4 @@
c:textUp="tan"
c:textLeft="C"
c:textDown="atan"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -28,4 +28,4 @@
c:textUp="x"
c:textLeft="D"
c:textDown="y"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -28,4 +28,4 @@
c:textUp="t"
c:textLeft="E"
c:textDown="j"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -30,4 +30,4 @@
c:textLeft="F"
c:textDown="rad"
c:directionTextScale="0.33;0.30;0.33;0.33"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -30,4 +30,4 @@
c:textLeft="0b:"
c:textDown="!"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -30,4 +30,4 @@
c:textLeft="0d:"
c:textDown="lg"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -30,4 +30,4 @@
c:textLeft="0x:"
c:textUp="π"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -30,4 +30,4 @@
c:textDown="bin"
c:textLeft="hex"
a:textStyle="bold"
style="?cpp_control_image_button_style"/>
style="?attr/cpp_button_style_control_image"/>

View File

@@ -25,4 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_copy"
a:src="@drawable/kb_copy"
style="?cpp_control_image_button_style"/>
style="?attr/cpp_button_style_control_image"/>

View File

@@ -29,4 +29,4 @@
a:text="/"
c:textDown="√"
c:directionTextScale="0.5"
style="?cpp_operation_button_style"/>
style="?attr/cpp_button_style_operation"/>

View File

@@ -25,4 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_like"
a:src="@drawable/kb_share"
style="?cpp_control_image_button_style"/>
style="?attr/cpp_button_style_control_image"/>

View File

@@ -28,4 +28,4 @@
a:text="."
c:textUp=","
c:directionTextScale="0.5"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -21,4 +21,4 @@
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.drag.DirectionDragButton style="?cpp_control_button_style"/>
<org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control"/>

View File

@@ -28,4 +28,4 @@
a:text="="
c:textDown="@string/cpp_plot_button_text"
c:directionTextScale="0.5;0.5;0.33;0.5"
style="?cpp_control_button_style"/>
style="?attr/cpp_button_style_control"/>

View File

@@ -25,4 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_erase"
a:src="@drawable/kb_erase"
style="?cpp_control_image_button_style"/>
style="?attr/cpp_button_style_control_image"/>

View File

@@ -29,4 +29,4 @@
c:textUp="+ƒ"
a:text="ƒ(x)"
a:textStyle="italic"
style="?cpp_control_button_style"/>
style="?attr/cpp_button_style_control"/>

View File

@@ -28,5 +28,5 @@
c:textUp="@string/c_undo"
c:textDown="@string/c_redo"
c:directionTextScale="0.27"
style="?cpp_control_button_style"
style="?attr/cpp_button_style_control"
a:textStyle="bold"/>

View File

@@ -28,4 +28,4 @@
c:textUp="◁◁"
a:text="◁"
c:directionTextScale="0.5"
style="?cpp_control_button_style"/>
style="?attr/cpp_button_style_control"/>

View File

@@ -27,4 +27,4 @@
c:textDown="∂,…"
a:text="-"
c:directionTextScale="0.4"
style="?cpp_operation_button_style"/>
style="?attr/cpp_button_style_operation"/>

View File

@@ -29,5 +29,5 @@
c:textUp="^"
c:textDown="^2"
c:textLeft="Π"
style="?cpp_operation_button_style"
style="?attr/cpp_button_style_operation"
c:directionTextScale="0.5"/>

View File

@@ -25,4 +25,4 @@
<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_operators"
a:text="∂,…"
style="?cpp_control_button_style"/>
style="?attr/cpp_button_style_control"/>

View File

@@ -25,4 +25,4 @@
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@id/cpp_button_paste"
a:src="@drawable/kb_paste"
style="?cpp_control_image_button_style"/>
style="?attr/cpp_button_style_control_image"/>

View File

@@ -28,4 +28,4 @@
c:textUp="°"
c:textDown="E"
a:text="+"
style="?cpp_operation_button_style"/>
style="?attr/cpp_button_style_operation"/>

View File

@@ -28,4 +28,4 @@
c:textUp="▷▷"
a:text="▷"
c:directionTextScale="0.5"
style="?cpp_control_button_style"/>
style="?attr/cpp_button_style_control"/>

View File

@@ -30,4 +30,4 @@
c:textDown=")"
c:textLeft="(…)"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_digit_button_style"/>
style="?attr/cpp_button_style_digit"/>

View File

@@ -29,4 +29,4 @@
c:textUp="+π"
a:text="π,…"
a:textStyle="italic"
style="?cpp_control_button_style"/>
style="?attr/cpp_button_style_control"/>

View File

@@ -24,7 +24,7 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/cpp_display_style"
style="@style/CppText.Display"
a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine"
a:maxLines="3"

View File

@@ -24,7 +24,7 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/cpp_display_style"
style="@style/CppText.Display"
a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine"
a:maxLines="3"

View File

@@ -24,14 +24,14 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_style"
style="@style/CppText.Editor"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"

View File

@@ -24,14 +24,14 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<org.solovyev.android.calculator.AndroidCalculatorEditorView
a:id="@+id/calculator_editor"
style="@style/cpp_editor_mobile_style"
style="@style/CppText.Editor.Mobile"
a:textIsSelectable="true"
a:singleLine="false"
a:scrollbars="vertical"

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/dialog_layout"
style="@style/cpp_dialog"
style="@style/CppDialog"
a:orientation="vertical">
</LinearLayout>

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"

View File

@@ -23,7 +23,7 @@
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/cpp_dialog">
style="@style/CppDialog">
<LinearLayout
a:id="@+id/cpp_fixable_messages_container"

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent">
@@ -32,7 +32,7 @@
a:id="@+id/fragment_title"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
style="@style/CppFragmentTitle"/>
<include layout="@layout/ad"/>

View File

@@ -24,6 +24,6 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/dialog_layout"
style="@style/cpp_dialog">
style="@style/CppDialog">
</LinearLayout>

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="wrap_content"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent">
@@ -60,6 +60,6 @@
</LinearLayout>
<ListView style="@style/ListView"/>
<ListView style="@style/CppListView"/>
</LinearLayout>

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_gravity="center_horizontal"
a:layout_height="match_parent"

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/wizard_layout"
style="@style/cpp_dialog"
style="@style/CppDialog"
a:orientation="vertical">
<FrameLayout

View File

@@ -56,6 +56,6 @@
c:textDown="^2"
c:textUp="%"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?cpp_control_button_style" />
style="?attr/cpp_button_style_control" />
</LinearLayout>

View File

@@ -28,7 +28,7 @@
<TextView
a:id="@+id/feedbackText"
style="@style/cpp_about_style"
style="@style/CppText.About"
a:layout_width="fill_parent"
a:text="@string/c_feedback_text"
a:layout_height="fill_parent"/>

View File

@@ -24,14 +24,14 @@
<LinearLayout
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:id="@+id/fragment_title"
style="?cpp_fragment_title_style"
style="@style/CppFragmentTitle"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
@@ -41,11 +41,11 @@
a:layout_width="match_parent"
a:layout_height="match_parent">
<ListView style="@style/ListView" />
<ListView style="@style/CppListView" />
<com.melnykov.fab.FloatingActionButton
a:id="@+id/fab"
style="@style/Fab"
style="@style/CppFab"
a:src="@drawable/ic_delete_white_36dp" />
</FrameLayout>
</LinearLayout>

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="horizontal"
style="@style/ListViewItem">
style="@style/CppListViewItem">
<LinearLayout

View File

@@ -23,7 +23,7 @@
-->
<LinearLayout a:id="@+id/main_layout"
style="?cpp_main_layout_style"
style="@style/CppMain"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"

View File

@@ -27,7 +27,7 @@
a:layout_height="match_parent"
a:id="@+id/main_layout"
a:orientation="vertical"
style="?cpp_main_layout_style">
style="@style/CppMain">
<LinearLayout
a:id="@+id/editorContainer"

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
style="?cpp_main_layout_style"
style="@style/CppMain"
a:orientation="vertical">
</LinearLayout>

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_layout"
style="?cpp_main_multi_pane_layout_style"
style="@style/CppMain.Multipane"
a:orientation="vertical">
</LinearLayout>

View File

@@ -24,14 +24,14 @@
<LinearLayout
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:id="@+id/fragment_title"
style="?cpp_fragment_title_style"
style="@style/CppFragmentTitle"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
@@ -41,11 +41,11 @@
a:layout_width="match_parent"
a:layout_height="match_parent">
<ListView style="@style/ListView" />
<ListView style="@style/CppListView" />
<com.melnykov.fab.FloatingActionButton
a:id="@+id/fab"
style="@style/Fab"
style="@style/CppFab"
a:src="@drawable/ic_add_white_36dp"
a:visibility="gone" />
</FrameLayout>

View File

@@ -25,7 +25,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="@style/ListViewItem"
style="@style/CppListViewItem"
a:orientation="horizontal">
<LinearLayout

View File

@@ -26,7 +26,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:picker="http://schemas.android.com/apk/res-auto"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent">
@@ -34,7 +34,7 @@
a:id="@+id/fragmentTitle"
a:layout_height="wrap_content"
a:layout_width="match_parent"
style="?cpp_fragment_title_style"/>
style="@style/CppFragmentTitle"/>
<include layout="@layout/ad"/>

View File

@@ -28,7 +28,7 @@
<TextView
a:id="@+id/notespp_announce"
style="@style/cpp_about_style"
style="@style/CppText.About"
a:layout_width="fill_parent"
a:text="@string/c_notespp_announce_text"
a:layout_height="fill_parent"/>

View File

@@ -8,7 +8,7 @@
<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/calculator_display"
style="@style/cpp_onscreen_display_style"
style="@style/CppText.Display.Onscreen"
a:padding="@dimen/cpp_display_padding"
a:inputType="textMultiLine"
a:maxLines="3"

View File

@@ -8,7 +8,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">

View File

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

View File

@@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical"
style="@style/ListViewItem">
style="@style/CppListViewItem">
<TextView
a:id="@+id/history_item"

View File

@@ -24,14 +24,14 @@
<LinearLayout
a:id="@+id/main_fragment_layout"
style="?cpp_fragment_layout_style"
style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent">
<TextView
a:id="@+id/fragment_title"
style="?cpp_fragment_title_style"
style="@style/CppFragmentTitle"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
@@ -41,11 +41,11 @@
a:layout_width="match_parent"
a:layout_height="match_parent">
<ListView style="@style/ListView" />
<ListView style="@style/CppListView" />
<com.melnykov.fab.FloatingActionButton
a:id="@+id/fab"
style="@style/Fab"
style="@style/CppFab"
a:src="@drawable/ic_add_white_36dp" />
</FrameLayout>

View File

@@ -8,7 +8,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="@style/cpp_default_fragment_layout_style"
style="@style/CppFragment"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">

View File

@@ -8,7 +8,7 @@
<LinearLayout
a:id="@+id/main_fragment_layout"
style="@style/cpp_default_fragment_layout_style"
style="@style/CppFragment"
a:orientation="horizontal"
a:layout_width="match_parent"
a:layout_height="0dp"