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

Material Light theme

Browse Source
This commit is contained in:
serso
2015-02-08 01:08:44 +01:00
parent c46a276f3f
commit 655f4dc3bf
24 changed files with 303 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,8 @@
<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>
@@ -36,6 +38,8 @@
<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">

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

@@ -29,19 +29,21 @@
<color name="cpp_button_text_ce">#ffffffff</color>
<color name="cpp_selected_angle_unit_text">#ffffff99</color>
<color name="cpp_main_bg">#101010</color>
<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">#212121</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>
<color name="cpp_wizard_button_pressed">#757575</color>
<color name="cpp_pane_background">#212121</color>
<color name="cpp_pane_background">@color/cpp_material_grey</color>
<color name="cpp_metro_button_dark">#ff000000</color>
<color name="cpp_metro_button">#212121</color>
<color name="cpp_metro_button_light">#393939</color>
<color name="cpp_metro_button">@color/cpp_material_grey</color>
<color name="cpp_metro_button_light">@color/cpp_material_grey_light</color>
<color name="cpp_metro_blue">#10648c</color>
<color name="cpp_material_blue">#ff0d4663</color>
<color name="cpp_material_light">#2196F3</color>
<color name="cpp_metro_blue_dark">#ff092c39</color>
<color name="cpp_metro_green">#088e3a</color>
<color name="cpp_metro_purple">#651456</color>
@@ -51,4 +53,9 @@
<color name="cpp_widget_ripple">#40ffffff</color>
<color name="cpp_wizard_disabled_text">#66ffffff</color>
<color name="cpp_material_grey">#212121</color>
<color name="cpp_material_grey_light">#393939</color>
<color name="cpp_material_actionbar">@color/cpp_material_grey</color>
<color name="cpp_material_actionbar_light">@color/cpp_material_grey_light</color>
</resources>

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

@@ -62,7 +62,7 @@
<item name="android:scrollbars">horizontal</item>
</style>
<style name="CppText.Editor" parent="CppText">
<style name="CppText.Editor">
<item name="android:text">""</item>
<item name="android:gravity">left|top</item>
<item name="android:layout_width">fill_parent</item>
@@ -74,7 +74,7 @@
<item name="android:textSize">@dimen/cpp_editor_text_size_mobile</item>
</style>
<style name="CppText.Display" parent="CppText">
<style name="CppText.Display">
<item name="android:gravity">top|right</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
@@ -85,7 +85,7 @@
<item name="android:textSize">@dimen/cpp_onscreen_display_text_size</item>
</style>
<style name="CppText.About" parent="CppText">
<style name="CppText.About">
<item name="android:gravity">center</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">fill_parent</item>
@@ -117,7 +117,7 @@
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="cpp_widget_main_layout_style" parent="CppMain">
<style name="CppMain.Widget" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">1dp</item>
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
@@ -131,7 +131,7 @@
<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
</style>
<style name="cpp_onscreen_main_layout_style" parent="CppMain">
<style name="CppMain.Onscreen" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">1dp</item>
</style>
@@ -251,8 +251,8 @@
<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_metro_button</item>
<item name="fab_colorPressed">@color/cpp_metro_button</item>
<item name="fab_colorNormal">@color/cpp_material_grey</item>
<item name="fab_colorPressed">@color/cpp_material_grey</item>
<item name="fab_colorRipple">?attr/colorControlHighlight</item>
</style>
@@ -270,4 +270,43 @@
<item name="android:layout_marginBottom">@dimen/cpp_pane_padding</item>
</style>
<style name="CppActionBar" parent="@style/Widget.AppCompat.ActionBar">
<item name="background">@color/cpp_material_actionbar</item>
<item name="android:background">@color/cpp_material_actionbar</item>
<item name="backgroundStacked">@color/cpp_material_actionbar</item>
<item name="android:backgroundStacked">@color/cpp_material_actionbar</item>
<item name="backgroundSplit">@color/cpp_material_actionbar</item>
<item name="android:backgroundSplit">@color/cpp_material_actionbar</item>
</style>
<style name="CppActionBar.Light" parent="CppActionBar">
<item name="background">@color/cpp_material_actionbar_light</item>
<item name="android:background">@color/cpp_material_actionbar_light</item>
<item name="backgroundStacked">@color/cpp_material_actionbar_light</item>
<item name="android:backgroundStacked">@color/cpp_material_actionbar_light</item>
<item name="backgroundSplit">@color/cpp_material_actionbar_light</item>
<item name="android:backgroundSplit">@color/cpp_material_actionbar_light</item>
</style>
<style name="CppToolbar" parent="@style/Widget.AppCompat.Toolbar">
<item name="background">@color/cpp_material_actionbar</item>
<item name="android:background">@color/cpp_material_actionbar</item>
<item name="backgroundStacked">@color/cpp_material_actionbar</item>
<item name="android:backgroundStacked">@color/cpp_material_actionbar</item>
<item name="backgroundSplit">@color/cpp_material_actionbar</item>
<item name="android:backgroundSplit">@color/cpp_material_actionbar</item>
<item name="navigationIcon">?attr/homeAsUpIndicator</item>
<item name="android:navigationIcon">?attr/homeAsUpIndicator</item>
</style>
<style name="CppToolbar.Light" parent="CppToolbar">
<item name="background">@color/cpp_material_actionbar_light</item>
<item name="android:background">@color/cpp_material_actionbar_light</item>
<item name="backgroundStacked">@color/cpp_material_actionbar_light</item>
<item name="android:backgroundStacked">@color/cpp_material_actionbar_light</item>
<item name="backgroundSplit">@color/cpp_material_actionbar_light</item>
<item name="android:backgroundSplit">@color/cpp_material_actionbar_light</item>
</style>
</resources>

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

@@ -90,6 +90,7 @@
<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>
<string name="p_material_light_theme">Material Light</string>
<string name="c_calc_result_precision_summary">Precision of the result value (all calculations are done with maximum
precision regardless of the value of this option)
</string>

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

@@ -22,17 +22,32 @@
<resources>
<style name="Cpp.Theme" parent="Cpp.Theme.Base"/>
<style name="Cpp.Theme" parent="@style/Theme.AppCompat">
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="android:colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</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>
<style name="Cpp.Theme.Dialog" parent="Cpp.Theme.Base.Dialog"/>
<style name="Cpp.Theme.Base" parent="@style/Theme.AppCompat">
<item name="android:windowBackground">@color/cpp_main_bg</item>
<item name="actionBarStyle">@style/CppActionBar</item>
<item name="android:actionBarStyle">@style/CppActionBar</item>
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
<style name="Cpp.Theme.Base.Dialog" parent="@style/Theme.AppCompat.Dialog">
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.Dialog">
<item name="colorPrimary">@color/cpp_metro_button</item>
<item name="android:colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</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:windowNoTitle">false</item>
<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
<item name="windowActionBar">false</item>
@@ -41,31 +56,77 @@
<item name="cpp_main_bg">@color/cpp_main_bg</item>
</style>
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<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="actionBarStyle">@style/CppActionBar.Light</item>
<item name="android:actionBarStyle">@style/CppActionBar.Light</item>
<item name="cpp_main_bg">@color/cpp_main_light_bg</item>
</style>
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
<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="android:windowNoTitle">false</item>
<item name="android:windowTitleBackgroundStyle">@android:color/transparent</item>
<item name="windowActionBar">false</item>
<item name="android:windowActionBar">false</item>
<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>
</style>
<style name="Cpp.Theme.Wizard" parent="@style/cpp_metro_blue_theme">
<style name="Cpp.Theme.Wizard.Light" parent="Cpp.Theme.Light">
<item name="android:windowBackground">@color/cpp_wizard_bg</item>
</style>
<style name="Cpp.Theme.Settings.Base" parent="@style/cpp_metro_blue_theme">
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
<item name="toolbarStyle">@style/Widget.Toolbar</item>
<item name="android:windowBackground">@color/cpp_main_bg</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>
<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
</style>
<style name="Cpp.Theme.Settings" parent="Cpp.Theme.Settings.Base"/>
<style name="Widget.Toolbar" parent="@style/Widget.AppCompat.Toolbar">
<item name="android:background">?attr/colorPrimary</item>
<item name="android:navigationIcon">?attr/homeAsUpIndicator</item>
<item name="navigationIcon">?attr/homeAsUpIndicator</item>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme">
<item name="android:windowBackground">@color/cpp_wizard_bg</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>
<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
</style>
<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>
</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="toolbarStyle">@style/CppToolbar.Light</item>
<item name="android:toolbarStyle">@style/CppToolbar.Light</item>
</style>
</resources>

52
android-app/src/main/res/values/theme_material.xml Normal file
View File

@@ -0,0 +1,52 @@
<!--
~ 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="CppKeyboardButton.Material.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/material_button_dark</item>
<item name="android:stateListAnimator">@null</item>
</style>
<style name="CppKeyboardButton.Material.Operation" parent="CppKeyboardButton.Material.Digit">
<item name="android:background">@drawable/material_blue_button</item>
</style>
<style name="CppKeyboardButton.Material.Control.Image" parent="CppKeyboardButton.Material.Digit">
<item name="android:padding">6dp</item>
</style>
<style name="Cpp.Theme.Material" parent="Cpp.Theme">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
</style>
<style name="Cpp.Theme.Dialog.Material" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Digit</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Operation</item>
</style>
</resources>

52
android-app/src/main/res/values/theme_material_light.xml Normal file
View File

@@ -0,0 +1,52 @@
<!--
~ 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="CppKeyboardButton.Material.Light.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/material_button_light</item>
<item name="android:stateListAnimator">@null</item>
</style>
<style name="CppKeyboardButton.Material.Light.Operation" parent="CppKeyboardButton.Material.Digit">
<item name="android:background">@drawable/material_button_light_primary</item>
</style>
<style name="CppKeyboardButton.Material.Light.Control.Image" parent="CppKeyboardButton.Material.Light.Digit">
<item name="android:padding">6dp</item>
</style>
<style name="Cpp.Theme.Material.Light" parent="Cpp.Theme.Light">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
</style>
<style name="Cpp.Theme.Dialog.Material.Light" parent="Cpp.Theme.Light.Dialog">
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Light.Digit</item>
<item name="cpp_button_style_control_image">@style/CppKeyboardButton.Material.Light.Control.Image</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Light.Operation</item>
</style>
</resources>

8
android-app/src/main/res/values/theme_metro_blue.xml
View File

@@ -39,7 +39,6 @@
<item name="android:background">@drawable/metro_widget_button_light</item>
</style>
<style name="metro_blue_operation_button_style" parent="metro_digit_button_style">
<item name="android:background">@drawable/metro_blue_button</item>
</style>
@@ -55,11 +54,4 @@
<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
</style>
<style name="Cpp.Theme.Dialog.Material" parent="Cpp.Theme.Dialog">
<item name="cpp_button_style_digit">@style/metro_digit_button_style</item>
<item name="cpp_button_style_control">@style/metro_control_button_style</item>
<item name="cpp_button_style_control_image">@style/metro_control_image_button_style</item>
<item name="cpp_button_style_operation">@style/metro_blue_operation_button_style</item>
</style>
</resources>