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

Light Wizard theme

Browse Source
This commit is contained in:
serso
2015-02-09 13:00:19 +01:00
parent 3b0d16aa68
commit bc0e6d2344
24 changed files with 262 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android-app/src/main/res/color/cpp_wizard_button_selector_light.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/cpp_material_light_darker" android:state_enabled="true" android:state_pressed="true" />
<item android:color="@color/cpp_material_light_disabled" android:state_enabled="false" />
<item android:color="@color/cpp_material_light" />
</selector>

32
android-app/src/main/res/drawable-v21/button_no_bg.xml Normal file
View File

@@ -0,0 +1,32 @@
<?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
-->
<ripple xmlns:a="http://schemas.android.com/apk/res/android"
a:color="?attr/colorControlHighlight">
<item>
<shape>
<solid a:color="?attr/cpp_main_bg" />
</shape>
</item>
</ripple>

34
android-app/src/main/res/drawable/button_no_bg.xml Normal file
View File

@@ -0,0 +1,34 @@
<?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
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true" a:drawable="@drawable/button_no_bg_pressed" />
<item>
<shape>
<solid a:color="@android:color/transparent" />
</shape>
</item>
</selector>

25
android-app/src/main/res/drawable/button_no_bg_pressed.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="#664d4d4d" />
</shape>

6
android-app/src/main/res/drawable/material_blue_button.xml
View File

@@ -24,7 +24,11 @@
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed" />
<item a:state_pressed="true">
<shape>
<solid a:color="@color/cpp_material_blue_lighter" />
</shape>
</item>
<item>
<shape>

2
android-app/src/main/res/drawable/material_button_dark.xml
View File

@@ -24,7 +24,7 @@
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed" />
<item a:state_pressed="true" a:drawable="@drawable/material_button_pressed" />
<item>
<shape>

2
android-app/src/main/res/drawable/material_button_light.xml
View File

@@ -23,7 +23,7 @@
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed" />
<item a:state_pressed="true" a:drawable="@drawable/material_button_pressed" />
<item>
<shape>

6
android-app/src/main/res/drawable/material_button_light_primary.xml
View File

@@ -24,7 +24,11 @@
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<item a:state_pressed="true" a:drawable="@drawable/metro_button_pressed" />
<item a:state_pressed="true">
<shape>
<solid a:color="@color/cpp_material_light_darker" />
</shape>
</item>
<item>
<shape>

25
android-app/src/main/res/drawable/material_button_pressed.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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
-->
<shape xmlns:a="http://schemas.android.com/apk/res/android">
<solid a:color="#ff4d4d4d" />
</shape>

3
android-app/src/main/res/layout/cpp_activity_wizard.xml
View File

@@ -17,6 +17,7 @@
android:id="@+id/pager_indicator"
android:layout_height="wrap_content"
android:layout_width="match_parent"
my:radius="5dp" />
my:radius="5dp"
my:fillColor="?attr/colorAccent"/>
</LinearLayout>

34
android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml Normal file
View File

@@ -0,0 +1,34 @@
<?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
-->
<org.solovyev.android.calculator.drag.DirectionDragButton a:id="@id/cpp_button_equals"
style="?attr/cpp_button_style_control"
xmlns:a="http://schemas.android.com/apk/res/android"
xmlns:c="http://schemas.android.com/apk/res-auto"
a:text="="
a:textColor="?android:attr/textColorPrimary"
c:directionTextColor="?android:attr/textColorPrimary"
c:directionTextScale="0.5;0.5;0.33;0.5"
c:textDown="@string/cpp_plot_button_text"
a:background="@drawable/button_no_bg"
c:textUp="≡" />

2
android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
View File

@@ -63,7 +63,7 @@
c:directionTextScale="0.5"
a:layout_width="100dp"
a:layout_height="100dp"
style="?attr/cpp_button_style_digit" />
style="?attr/cpp_button_style_operation" />
</FrameLayout>
<TextView

16
android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
View File

@@ -30,6 +30,22 @@
a:padding="3dp"
a:background="?attr/cpp_main_bg">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_equals_no_bg" />
<TextView
a:layout_width="0dp"
a:layout_height="match_parent"
style="@style/CppText.Display"
a:text="3.1415"
a:layout_weight="2"/>
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"

3
android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
View File

@@ -51,11 +51,10 @@
a:layout_weight="0"
a:layout_gravity="center"
a:id="@+id/wizard_dragbutton"
a:background="@drawable/cpp_wizard_button_selector"
a:text="9"
c:textDown="^2"
c:textUp="%"
c:directionTextScale="0.5;0.5;0.5;0.33"
style="?attr/cpp_button_style_control" />
style="?attr/cpp_button_style_operation" />
</LinearLayout>

2
android-app/src/main/res/layout/main_calculator.xml
View File

@@ -43,7 +43,7 @@
a:baselineAligned="false">
<include
layout="@layout/cpp_app_button_equals"
layout="@layout/cpp_app_button_equals_no_bg"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1" />

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

@@ -31,6 +31,7 @@
<attr name="cpp_pane_bg" format="reference"/>
<attr name="cpp_fab_bg" format="reference"/>
<attr name="cpp_toolbar_theme" format="reference"/>
<attr name="cpp_wizard_button_bg" format="reference"/>
<attr name="cpp_text_color" format="reference"/>
<attr name="cpp_text_error_color" format="reference"/>

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

@@ -45,7 +45,10 @@
<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_material_blue_lighter">#ff0d668d</color>
<color name="cpp_material_light">#4285f4</color>
<color name="cpp_material_light_darker">#ff3463bd</color>
<color name="cpp_material_light_disabled">#c1d2ef</color>
<color name="cpp_metro_blue_dark">#ff092c39</color>
<color name="cpp_metro_green">#088e3a</color>
<color name="cpp_metro_purple">#651456</color>

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

@@ -37,6 +37,7 @@
<item name="android:textSize">@dimen/cpp_keyboard_button_text_size</item>
<item name="android:textColor">@color/cpp_button_text</item>
<item name="android:scaleType">centerInside</item>
<item name="directionTextColor">@color/cpp_button_text</item>
</style>
<style name="cpp_onscreen_editor_style" parent="CppText.Editor">
@@ -173,8 +174,8 @@
</style>
<style name="MaterialButton.Wizard" parent="MaterialButton">
<item name="android:textColor">@color/cpp_text</item>
<item name="materialColor">@color/cpp_wizard_button_selector</item>
<item name="android:textColor">@color/cpp_button_text</item>
<item name="materialColor">?attr/cpp_wizard_button_bg</item>
<item name="android:textAppearance">@android:style/TextAppearance.Medium</item>
</style>

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

@@ -108,21 +108,17 @@
</style>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">
<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>
<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowActionBar">false</item>
<item name="cpp_wizard_button_bg">@color/cpp_wizard_button_selector</item>
</style>
<style name="Cpp.Theme.Wizard.Light" parent="Cpp.Theme.Material.Light">
<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>
<item name="android:textColorSecondary">@color/cpp_wizard_secondary</item>
<item name="android:textColorPrimary">@color/cpp_wizard_primary</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowActionBar">false</item>
<item name="cpp_wizard_button_bg">@color/cpp_wizard_button_selector_light</item>
</style>
<style name="Cpp.Theme.Settings" parent="Cpp.Theme">