TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Styling

Browse Source
This commit is contained in:
serso
2015-02-08 17:04:16 +01:00
parent b7a05b66bc
commit 362189f6ad
57 changed files with 298 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android-app/src/main/res/values/arrays.xml
View File

@@ -22,24 +22,18 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<string-array name="p_theme_names">
<item>@string/p_default_theme</item>
<item>@string/p_violet_theme</item>
<item>@string/p_light_blue_theme</item>
<item>@string/p_material_theme</item>
<item>@string/p_material_light_theme</item>
<item>@string/p_metro_blue_theme</item>
<item>@string/p_metro_green_theme</item>
<item>@string/p_metro_purple_theme</item>
<item>@string/p_material_theme</item>
<item>@string/p_material_light_theme</item>
</string-array>
<string-array name="p_theme_values" translatable="false">
<item>default_theme</item>
<item>violet_theme</item>
<item>light_blue_theme</item>
<item>material_theme</item>
<item>material_light_theme</item>
<item>metro_blue_theme</item>
<item>metro_green_theme</item>
<item>metro_purple_theme</item>
<item>material_theme</item>
<item>material_light_theme</item>
</string-array>
<string-array name="p_grouping_separator_names">

5
android-app/src/main/res/values/attributes.xml
View File

@@ -28,5 +28,10 @@
<attr name="cpp_button_style_control_image" format="reference"/>
<attr name="cpp_button_style_operation" format="reference"/>
<attr name="cpp_main_bg" format="reference"/>
<attr name="cpp_fab_bg" format="reference"/>
<attr name="cpp_toolbar_theme" format="reference"/>
<attr name="cpp_text_color" format="reference"/>
<attr name="cpp_text_error_color" format="reference"/>
</resources>

9
android-app/src/main/res/values/colors.xml
View File

@@ -22,8 +22,12 @@
<resources>
<color name="cpp_list_divider">#ff2e2e2e</color>
<color name="cpp_text">#ffeeeeee</color>
<color name="cpp_text_error">#ff393939</color>
<color name="cpp_text">#ffe6e6e6</color>
<color name="cpp_text_inverse">#424242</color>
<color name="cpp_text_error">@color/cpp_text_inverse</color>
<color name="cpp_text_error_inverse">@color/cpp_text</color>
<color name="cpp_button_text">#ffffffff</color>
<color name="cpp_button_text_operator">#ffffff99</color>
<color name="cpp_button_text_ce">#ffffffff</color>
@@ -32,7 +36,6 @@
<color name="cpp_main_light_bg">#fff6f1ef</color>
<color name="cpp_wizard_primary">#FAFAFA</color>
<color name="cpp_wizard_secondary">#9E9E9E</color>
<color name="cpp_wizard_bg">@color/cpp_material_grey</color>
<color name="cpp_wizard_overscroll">#FAFAFA</color>
<color name="cpp_wizard_button_normal">#424242</color>
<color name="cpp_wizard_button_disabled">#616161</color>

25
android-app/src/main/res/values/styles.xml
View File

@@ -74,7 +74,7 @@
<item name="android:textSize">@dimen/cpp_editor_text_size_mobile</item>
</style>
<style name="CppText.Display">
<style name="CppText.Display" parent="CppText">
<item name="android:gravity">top|right</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
@@ -95,7 +95,7 @@
<style name="CppText">
<item name="android:background">@android:color/transparent</item>
<item name="android:textColor">@color/cpp_text</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="cpp_simple_metro_digit_button_style" parent="metro_digit_button_style">
@@ -251,11 +251,28 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">bottom|end</item>
<item name="android:layout_margin">16dp</item>
<item name="fab_colorNormal">@color/cpp_material_grey</item>
<item name="fab_colorPressed">@color/cpp_material_grey</item>
<item name="fab_colorNormal">?attr/cpp_fab_bg</item>
<item name="fab_colorPressed">?attr/cpp_fab_bg</item>
<item name="fab_colorRipple">?attr/colorControlHighlight</item>
</style>
<style name="CppListViewItemTextPrimary">
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/cpp_li_text_size</item>
</style>
<style name="CppListViewItemTextSecondary">
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">@dimen/cpp_li_secondary_text_size</item>
</style>
<style name="CppListViewItemTextPrimary.History" parent="CppListViewItemTextPrimary">
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
</style>
<style name="CppListView">
<item name="android:id">@android:id/list</item>
<item name="android:dividerHeight">1px</item>

37
android-app/src/main/res/values/styles_history.xml
View File

@@ -1,37 +0,0 @@
<!--
~ 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
-->
<resources>
<style name="history_time" parent="math_entity_description" />
<style name="history_item" parent="math_entity_text">
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
</style>
<style name="history_item_label" parent="math_entity_description">
<item name="android:textStyle">bold</item>
<item name="android:textColor">@android:color/white</item>
</style>
</resources>

40
android-app/src/main/res/values/styles_var.xml
View File

@@ -1,40 +0,0 @@
<?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
-->
<resources>
<style name="math_entity_text">
<item name="android:textColor">@color/cpp_text_primary</item>
<item name="android:textSize">@dimen/cpp_li_text_size</item>
</style>
<style name="math_entity_description">
<item name="android:textColor">@color/cpp_text_secondary</item>
<item name="android:textSize">@dimen/cpp_li_secondary_text_size</item>
</style>
<style name="add_var_button">
<item name="android:paddingLeft">40dp</item>
<item name="android:paddingRight">40dp</item>
</style>
</resources>

2
android-app/src/main/res/values/text_strings.xml
View File

@@ -86,7 +86,7 @@
<string name="p_default_theme">Grey</string>
<string name="p_violet_theme">Violet</string>
<string name="p_light_blue_theme">Light Blue</string>
<string name="p_metro_blue_theme">Metro Blue (Default)</string>
<string name="p_metro_blue_theme">Metro Blue</string>
<string name="p_metro_green_theme">Metro Green</string>
<string name="p_metro_purple_theme">Metro Purple</string>
<string name="p_material_theme">Material</string>

10
android-app/src/main/res/values/text_wizard.xml
View File

@@ -21,15 +21,15 @@
<string name="cpp_restart_wizard">Start wizard</string>
<string name="cpp_wizard_dragbutton_action_end">Excellent! Tap the button one more time to try again</string>
<string name="cpp_wizard_dragbutton_action_center">Tap the button below once to use 9</string>
<string name="cpp_wizard_dragbutton_action_up">Drag from the center of the button up to use %</string>
<string name="cpp_wizard_dragbutton_action_left">Drag from the center of the button to the left to use sin</string>
<string name="cpp_wizard_dragbutton_action_down">Drag from the center of the button down to use ^2</string>
<string name="cpp_wizard_dragbutton_action_up">Swipe from the center of the button up to use %</string>
<string name="cpp_wizard_dragbutton_action_left">Swipe from the center of the button to the left to use sin</string>
<string name="cpp_wizard_dragbutton_action_down">Swipe from the center of the button down to use ^2</string>
<string name="cpp_wizard_welcome_title">Welcome</string>
<string name="cpp_wizard_layout_title">Choose layout</string>
<string name="cpp_wizard_mode_title">Choose mode</string>
<string name="cpp_wizard_theme_title">Choose theme</string>
<string name="cpp_wizard_onscreen_calculator_title">Calculator in a separate window</string>
<string name="cpp_wizard_dragbutton_title">Drag button basics</string>
<string name="cpp_wizard_dragbutton_title">Swipe button basics</string>
<string name="cpp_wizard_final_done">The app is set up and ready to use.</string>
<string name="cpp_wizard_final_title">Almost done!</string>
<string name="cpp_wizard_final_free_and_opensource">Calculator++ is free and open-source: all the features are free
@@ -44,7 +44,7 @@
using other apps on your device
</string>
<string name="cpp_wizard_onscreen_checkbox">Enable</string>
<string name="cpp_wizard_dragbutton_description">Drag button is an exclusive feature of Calculator++ which provides
<string name="cpp_wizard_dragbutton_description">Swipe button is an exclusive feature of Calculator++ which provides
fast access to the secondary functions
</string>
<string name="cpp_wizard_finish_confirmation">Do you really want to finish wizard?</string>

51
android-app/src/main/res/values/theme.xml
View File

@@ -37,6 +37,9 @@
<item name="android:actionBarStyle">@style/CppActionBar</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_fab_bg">@color/cpp_material_grey</item>
<item name="android:textColorPrimary">@color/cpp_text</item>
<item name="android:textColorPrimaryInverse">@color/cpp_text_error</item>
</style>
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.Dialog">
@@ -54,35 +57,40 @@
<item name="android:windowCloseOnTouchOutside">false</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_fab_bg">@color/cpp_material_grey</item>
<item name="android:textColorPrimary">@color/cpp_text</item>
<item name="android:textColorPrimaryInverse">@color/cpp_text_error</item>
</style>
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@color/cpp_main_light_bg</item>
<item name="colorPrimary">@color/cpp_material_light</item>
<item name="android:colorPrimary">@color/cpp_material_light</item>
<item name="colorPrimaryDark">@color/cpp_material_light</item>
<item name="android:colorPrimaryDark">@color/cpp_material_light</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="android:windowBackground">@color/cpp_main_light_bg</item>
<item name="colorAccent">@color/cpp_material_light</item>
<item name="android:colorAccent">@color/cpp_material_light</item>
<item name="actionBarStyle">@style/CppActionBar.Light</item>
<item name="android:actionBarStyle">@style/CppActionBar.Light</item>
<item name="cpp_main_bg">@color/cpp_main_light_bg</item>
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="android:textColorPrimary">@color/cpp_text_inverse</item>
<item name="android:textColorPrimaryInverse">@color/cpp_text_error_inverse</item>
</style>
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
<item name="android:windowBackground">@color/cpp_main_light_bg</item>
<item name="colorPrimary">@color/cpp_material_light</item>
<item name="android:colorPrimary">@color/cpp_material_light</item>
<item name="colorPrimaryDark">@color/cpp_material_light</item>
<item name="android:colorPrimaryDark">@color/cpp_material_light</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="colorAccent">@color/cpp_material_light</item>
<item name="android:colorAccent">@color/cpp_material_light</item>
<item name="android:windowBackground">@color/cpp_main_light_bg</item>
<item name="android:windowNoTitle">false</item>
<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
<item name="windowActionBar">false</item>
@@ -90,15 +98,13 @@
<item name="android:windowCloseOnTouchOutside">false</item>
<item name="cpp_main_bg">@color/cpp_main_light_bg</item>
</style>
<style name="Cpp.Theme.Wizard.Purchase" parent="cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item>
<item name="android:background">@color/cpp_metro_button_light</item>
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="android:textColorPrimary">@color/cpp_text_inverse</item>
<item name="android:textColorPrimaryInverse">@color/cpp_text_error_inverse</item>
</style>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">
<item name="android:windowBackground">@color/cpp_wizard_bg</item>
<item name="android:windowBackground">@color/cpp_material_grey</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
@@ -107,7 +113,7 @@
</style>
<style name="Cpp.Theme.Wizard.Light" parent="Cpp.Theme.Material.Light">
<item name="android:windowBackground">@color/cpp_wizard_bg</item>
<item name="android:windowBackground">@color/cpp_material_grey</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
@@ -118,15 +124,24 @@
<style name="Cpp.Theme.Settings" parent="Cpp.Theme">
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
<item name="toolbarStyle">@style/CppToolbar</item>
<item name="android:toolbarStyle">@style/CppToolbar</item>
<item name="cpp_toolbar_theme">@style/Cpp.Theme.Toolbar</item>
</style>
<style name="Cpp.Theme.Settings.Light" parent="Cpp.Theme.Light">
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
<item name="cpp_toolbar_theme">@style/Cpp.Theme.Toolbar.Light</item>
</style>
<style name="Cpp.Theme.Toolbar" parent="Cpp.Theme">
<item name="toolbarStyle">@style/CppToolbar</item>
<item name="android:toolbarStyle">@style/CppToolbar</item>
</style>
<style name="Cpp.Theme.Toolbar.Light" parent="Cpp.Theme">
<item name="toolbarStyle">@style/CppToolbar.Light</item>
<item name="android:toolbarStyle">@style/CppToolbar.Light</item>
</style>
</resources>