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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
serso
2016-04-18 10:02:40 +02:00
parent 6068644859 f7015ce3fd
commit 6f639e5da8
65 changed files with 1030 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 226 B

BIN
app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 227 B

BIN
app/src/main/res/drawable-mdpi/ic_keyboard_arrow_left_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 164 B

BIN
app/src/main/res/drawable-mdpi/ic_keyboard_arrow_right_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 163 B

32
app/src/main/res/drawable-v21/material_button_black.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="@color/cpp_ripple_material_dark">
<item>
<shape>
<solid a:color="@color/grey_950" />
</shape>
</item>
</ripple>

32
app/src/main/res/drawable-v21/material_button_black_lighter.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="@color/cpp_ripple_material_dark">
<item>
<shape>
<solid a:color="@color/grey_900" />
</shape>
</item>
</ripple>

32
app/src/main/res/drawable-v21/material_button_deep_blue.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="@color/cpp_ripple_material_dark">
<item>
<shape>
<solid a:color="@color/deep_blue_900" />
</shape>
</item>
</ripple>

32
app/src/main/res/drawable-v21/material_button_deep_blue_lighter.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="@color/cpp_ripple_material_dark">
<item>
<shape>
<solid a:color="@color/deep_blue_850" />
</shape>
</item>
</ripple>

BIN
app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_left_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 203 B

BIN
app/src/main/res/drawable-xhdpi/ic_keyboard_arrow_right_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 233 B

BIN
app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_left_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 285 B

BIN
app/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_right_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 286 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_left_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 349 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_right_white_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 354 B

10
app/src/main/res/drawable/ic_chevron_left_24dp.xml → app/src/main/res/drawable/ic_chevron_left_white_24dp.xml
View File

@@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z" />
</vector>

9
app/src/main/res/drawable/ic_favorite_border_white_48dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
</vector>

9
app/src/main/res/drawable/ic_keyboard_arrow_left_white_48dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14,5.5l-6,6 6,6z" />
</vector>

9
app/src/main/res/drawable/ic_keyboard_arrow_right_white_48dp.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#ffffff"
android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z" />
</vector>

35
app/src/main/res/drawable/material_button_black.xml Normal file
View File

@@ -0,0 +1,35 @@
<?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:drawable="@drawable/material_button_pressed" a:state_pressed="true" />
<item>
<shape>
<solid a:color="@color/grey_950" />
</shape>
</item>
</selector>

35
app/src/main/res/drawable/material_button_black_lighter.xml Normal file
View File

@@ -0,0 +1,35 @@
<?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:drawable="@drawable/material_button_pressed" a:state_pressed="true" />
<item>
<shape>
<solid a:color="@color/grey_900" />
</shape>
</item>
</selector>

39
app/src/main/res/drawable/material_button_deep_blue.xml Normal file
View File

@@ -0,0 +1,39 @@
<?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">
<shape>
<solid a:color="@color/deep_blue_850" />
</shape>
</item>
<item>
<shape>
<solid a:color="@color/deep_blue_900" />
</shape>
</item>
</selector>

39
app/src/main/res/drawable/material_button_deep_blue_lighter.xml Normal file
View File

@@ -0,0 +1,39 @@
<?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">
<shape>
<solid a:color="@color/deep_blue_800" />
</shape>
</item>
<item>
<shape>
<solid a:color="@color/deep_blue_850" />
</shape>
</item>
</selector>

2
app/src/main/res/layout-land/cpp_app_keyboard.xml
View File

@@ -84,7 +84,7 @@
a:baselineAligned="false"
a:orientation="horizontal">
<include layout="@layout/cpp_app_button_paste" />
<include layout="@layout/cpp_app_button_like" />
<include layout="@layout/cpp_app_button_percent" />

2
app/src/main/res/layout/cpp_app_button_copy.xml
View File

@@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.view.NumeralBasesButton
<org.solovyev.android.views.dragbutton.DirectionDragImageButton
android:id="@id/cpp_button_copy"
style="?attr/cpp_button_style_control"
xmlns:android="http://schemas.android.com/apk/res/android"

2
app/src/main/res/layout/cpp_app_button_equals_no_bg.xml
View File

@@ -31,6 +31,6 @@
a:text="="
a:textColor="?attr/cpp_text_color"
c:directionTextColor="?attr/cpp_text_color"
c:directionTextDown="@string/cpp_plot_button_text"
c:directionTextDown="@string/cpp_glyph_graph"
c:directionTextUp="≡"
tools:ignore="HardcodedText" />

4
app/src/main/res/layout/cpp_app_button_history.xml
View File

@@ -28,5 +28,5 @@
style="?attr/cpp_button_style_control"
a:src="@drawable/ic_history_white_48dp"
app:directionTextScale="0.5"
app:directionTextDown="@string/cpp_kb_redo"
app:directionTextUp="@string/cpp_kb_undo" />
app:directionTextDown="@string/cpp_glyph_redo"
app:directionTextUp="@string/cpp_glyph_undo" />

1
app/src/main/res/layout/cpp_app_button_left.xml
View File

@@ -29,4 +29,5 @@
xmlns:tools="http://schemas.android.com/tools"
a:src="@drawable/ic_keyboard_arrow_left_white_48dp"
c:directionTextUp="&lt;&lt;"
c:directionTextDown="@string/cpp_glyph_copy"
tools:ignore="HardcodedText" />

29
app/src/main/res/layout/cpp_app_button_like.xml Normal file
View File

@@ -0,0 +1,29 @@
<?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.views.dragbutton.DirectionDragImageButton
android:id="@id/cpp_button_like"
style="?attr/cpp_button_style_control"
xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ic_favorite_border_white_48dp" />

2
app/src/main/res/layout/cpp_app_button_paste.xml
View File

@@ -22,7 +22,7 @@
~ Site: http://se.solovyev.org
-->
<org.solovyev.android.calculator.view.AngleUnitsButton
<org.solovyev.android.views.dragbutton.DirectionDragImageButton
android:id="@id/cpp_button_paste"
style="?attr/cpp_button_style_control"
xmlns:android="http://schemas.android.com/apk/res/android"

1
app/src/main/res/layout/cpp_app_button_right.xml
View File

@@ -29,4 +29,5 @@
xmlns:tools="http://schemas.android.com/tools"
a:src="@drawable/ic_keyboard_arrow_right_white_48dp"
c:directionTextUp="&gt;&gt;"
c:directionTextDown="@string/cpp_glyph_paste"
tools:ignore="HardcodedText" />

6
app/src/main/res/menu/main.xml
View File

@@ -8,7 +8,7 @@
app:showAsAction="never">
<menu>
<item
android:icon="@drawable/ic_chevron_left_24dp"
android:icon="@drawable/ic_chevron_left_white_24dp"
android:title="@string/cpp_mode"
app:showAsAction="never" />
<item
@@ -30,7 +30,7 @@
app:showAsAction="never">
<menu>
<item
android:icon="@drawable/ic_chevron_left_24dp"
android:icon="@drawable/ic_chevron_left_white_24dp"
android:title="@string/cpp_angles"
app:showAsAction="never" />
<item
@@ -52,7 +52,7 @@
app:showAsAction="never">
<menu>
<item
android:icon="@drawable/ic_chevron_left_24dp"
android:icon="@drawable/ic_chevron_left_white_24dp"
android:title="@string/cpp_radix"
app:showAsAction="never" />
<item

15
app/src/main/res/values/arrays.xml
View File

@@ -21,21 +21,6 @@
-->
<resources>
<string-array name="p_theme_names">
<item>@string/cpp_theme_dark</item>
<item>@string/cpp_theme_light</item>
<item>@string/p_metro_blue_theme</item>
<item>@string/p_metro_green_theme</item>
<item>@string/p_metro_purple_theme</item>
</string-array>
<string-array name="p_theme_values" translatable="false">
<item>material_theme</item>
<item>material_light_theme</item>
<item>metro_blue_theme</item>
<item>metro_green_theme</item>
<item>metro_purple_theme</item>
</string-array>
<string-array name="p_simple_theme_names">
<item>@string/p_use_app_theme</item>
<item>@string/cpp_theme_dark</item>

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

@@ -47,6 +47,11 @@
<color name="grey_850">#313131</color>
<color name="grey_900">#212121</color>
<color name="grey_950">#101010</color>
<color name="grey_965">#0a0a0a</color>
<color name="deep_blue_900">#06224d</color>
<color name="deep_blue_850">#082a5e</color>
<color name="deep_blue_800">#0a3980</color>
<color name="blue_900">#0D47A1</color>
<color name="blue_800">#1565C0</color>

13
app/src/main/res/values/text_glyphs.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="cpp_glyph_paste" translatable="false">"\ue000"</string>
<string name="cpp_glyph_copy" translatable="false">"\ue001"</string>
<string name="cpp_glyph_left" translatable="false">"\ue002"</string>
<string name="cpp_glyph_right" translatable="false">"\ue003"</string>
<string name="cpp_glyph_backspace" translatable="false">"\ue004"</string>
<string name="cpp_glyph_history" translatable="false">"\ue005"</string>
<string name="cpp_glyph_heart" translatable="false">"\ue006"</string>
<string name="cpp_glyph_undo" translatable="false">"\ue007"</string>
<string name="cpp_glyph_redo" translatable="false">"\ue008"</string>
<string name="cpp_glyph_graph" translatable="false">"\ue009"</string>
</resources>

1
app/src/main/res/values/text_non_translatable.xml
View File

@@ -16,6 +16,7 @@
<string name="cpp_function_body" translatable="false">f(x, y)</string>
<string name="cpp_show_greek_keyboard" translatable="false">αβγ</string>
<string name="cpp_exponent" translatable="false">E</string>
<string name="cpp_theme_black" translatable="false">%1$s (AMOLED)</string>
<string-array name="cpp_prefs_precisions" translatable="false">
<item>0</item>
<item>1</item>

79
app/src/main/res/values/theme_material_black.xml Normal file
View File

@@ -0,0 +1,79 @@
<!--
~ 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.Black.Digit" parent="CppKeyboardButton">
<item name="android:background">@drawable/material_button_black</item>
</style>
<style name="CppKeyboardButton.Material.Black.Digit.Highlighted" parent="CppKeyboardButton.Material.Black.Digit">
<item name="android:background">@drawable/material_button_black_lighter</item>
</style>
<style name="CppKeyboardButton.Material.Black.Operation" parent="CppKeyboardButton.Material.Digit">
<item name="android:background">@drawable/material_button_deep_blue</item>
<item name="directionTextAlpha">0.7</item>
</style>
<style name="CppKeyboardButton.Material.Black.Operation.Highlighted" parent="CppKeyboardButton.Material.Black.Operation">
<item name="android:background">@drawable/material_button_deep_blue_lighter</item>
</style>
<style name="CppKeyboardButton.Material.Black.Control" parent="CppKeyboardButton.Material.Black.Digit" />
<style name="Cpp.Theme.Material.Black" parent="Cpp.Theme">
<item name="android:windowBackground">@color/grey_965</item>
<item name="cpp_editor_bg">@color/grey_965</item>
<item name="cpp_fab_bg">@color/deep_blue_900</item>
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Black.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Black.Digit</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Black.Digit.Highlighted</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Black.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Black.Operation.Highlighted</item>
</style>
<style name="Cpp.Theme.Material.Black.Dialog" parent="Cpp.Theme.Dialog">
<item name="cpp_editor_bg">@color/grey_965</item>
<item name="cpp_fab_bg">@color/deep_blue_900</item>
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Black.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Black.Digit</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Black.Digit.Highlighted</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Black.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Black.Operation.Highlighted</item>
</style>
<style name="Cpp.Theme.Material.Black.Dialog.Alert" parent="Cpp.Theme.Dialog.Alert">
<item name="cpp_editor_bg">@color/grey_965</item>
<item name="cpp_fab_bg">@color/deep_blue_900</item>
<item name="cpp_button_style_digit">@style/CppKeyboardButton.Material.Black.Digit</item>
<item name="cpp_button_style_control">@style/CppKeyboardButton.Material.Black.Digit</item>
<item name="cpp_button_style_control_highlighted">@style/CppKeyboardButton.Material.Black.Digit.Highlighted</item>
<item name="cpp_button_style_operation">@style/CppKeyboardButton.Material.Black.Operation</item>
<item name="cpp_button_style_operation_highlighted">@style/CppKeyboardButton.Material.Black.Operation.Highlighted</item>
</style>
<style name="Cpp.Theme.Material.Black.Calculator" parent="Cpp.Theme.Material.Black">
<item name="android:windowAnimationStyle">@null</item>
</style>
</resources>

2
app/src/main/res/xml/preferences_appearance.xml
View File

@@ -35,8 +35,6 @@
a:title="@string/cpp_prefs_vibrate_on_keypress" />
<ListPreference
a:entries="@array/p_theme_names"
a:entryValues="@array/p_theme_values"
a:key="gui.theme"
a:title="@string/cpp_theme" />