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

Material themes for widget

Browse Source
This commit is contained in:
serso
2015-06-18 11:55:53 +02:00
parent 70a5e7e2e5
commit a0ff19e4cd
34 changed files with 864 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
android-app/src/main/res/layout/cpp_simple_button_operators_material.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
-->
<Button a:id="@id/cpp_button_operators"
style="@style/CppKeyboardButton.Material.Simple.Control"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="∂,…"
a:textStyle="italic" />

29
android-app/src/main/res/layout/cpp_simple_button_operators_material_light.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
-->
<Button a:id="@id/cpp_button_operators"
style="@style/CppKeyboardButton.Material.Light.Simple.Control"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="∂,…"
a:textStyle="italic" />

29
android-app/src/main/res/layout/cpp_simple_button_paste_material.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
-->
<ImageButton a:id="@id/cpp_button_paste"
style="@style/CppKeyboardButton.Material.Simple.Control.Image"
xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Paste"
a:src="@drawable/kb_paste" />

29
android-app/src/main/res/layout/cpp_simple_button_paste_material_light.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
-->
<ImageButton a:id="@id/cpp_button_paste"
style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Paste"
a:src="@drawable/kb_paste" />

28
android-app/src/main/res/layout/cpp_simple_button_right_material.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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
-->
<Button a:id="@id/cpp_button_right"
style="@style/CppKeyboardButton.Material.Simple.Control"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="▷" />

28
android-app/src/main/res/layout/cpp_simple_button_right_material_light.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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
-->
<Button a:id="@id/cpp_button_right"
style="@style/CppKeyboardButton.Material.Light.Simple.Control"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="▷" />

29
android-app/src/main/res/layout/cpp_simple_button_settings_material.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
-->
<ImageButton a:id="@id/cpp_button_settings"
style="@style/CppKeyboardButton.Material.Simple.Control.Image"
xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Settings"
a:src="@drawable/kb_settings" />

29
android-app/src/main/res/layout/cpp_simple_button_settings_material_light.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
-->
<ImageButton a:id="@id/cpp_button_settings"
style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Settings"
a:src="@drawable/kb_settings" />

29
android-app/src/main/res/layout/cpp_simple_button_vars_material.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
-->
<Button a:id="@id/cpp_button_vars"
style="@style/CppKeyboardButton.Material.Simple.Control"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="π,…"
a:textStyle="italic" />

29
android-app/src/main/res/layout/cpp_simple_button_vars_material_light.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
-->
<Button a:id="@id/cpp_button_vars"
style="@style/CppKeyboardButton.Material.Light.Simple.Control"
xmlns:a="http://schemas.android.com/apk/res/android"
a:text="π,…"
a:textStyle="italic" />

15
android-app/src/main/res/layout/widget_display_light.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<TextView a:id="@+id/calculator_display"
style="@style/CppText.Display.Widget.Light"
xmlns:a="http://schemas.android.com/apk/res/android"
a:padding="@dimen/cpp_display_padding"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />

5
android-app/src/main/res/layout/widget_editor.xml
View File

@@ -6,8 +6,7 @@
~ or visit http://se.solovyev.org
-->
<LinearLayout a:id="@+id/main_fragment_layout"
style="@style/CppFragment"
<FrameLayout a:id="@+id/main_fragment_layout"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
@@ -21,4 +20,4 @@
a:singleLine="false"
a:textIsSelectable="true" />
</LinearLayout>
</FrameLayout>

23
android-app/src/main/res/layout/widget_editor_light.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
~ For more information, please, contact se.solovyev@gmail.com
~ or visit http://se.solovyev.org
-->
<LinearLayout a:id="@+id/main_fragment_layout"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:padding="@dimen/cpp_editor_padding">
<TextView
a:id="@+id/calculator_editor"
style="@style/CppText.Editor.Widget.Light"
a:hint="@string/c_calc_editor_hint"
a:scrollbars="vertical"
a:singleLine="false"
a:textIsSelectable="true" />
</LinearLayout>

0
android-app/src/main/res/layout/cpp_simple_keyboard.xml → android-app/src/main/res/layout/widget_keyboard.xml
View File

126
android-app/src/main/res/layout/widget_keyboard_material.xml Normal file
View File

@@ -0,0 +1,126 @@
<?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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_7_material" />
<include layout="@layout/cpp_simple_button_8_material" />
<include layout="@layout/cpp_simple_button_9_material" />
<include layout="@layout/cpp_simple_button_multiplication_material" />
<include layout="@layout/cpp_simple_button_percent_material" />
<include layout="@layout/cpp_simple_button_clear_material" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_4_material" />
<include layout="@layout/cpp_simple_button_5_material" />
<include layout="@layout/cpp_simple_button_6_material" />
<include layout="@layout/cpp_simple_button_division_material" />
<include layout="@layout/cpp_simple_button_power_material" />
<include layout="@layout/cpp_simple_button_erase_material" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_1_material" />
<include layout="@layout/cpp_simple_button_2_material" />
<include layout="@layout/cpp_simple_button_3_material" />
<include layout="@layout/cpp_simple_button_plus_material" />
<include layout="@layout/cpp_simple_button_settings_material" />
<include layout="@layout/cpp_simple_button_copy_material" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_round_brackets_material" />
<include layout="@layout/cpp_simple_button_0_material" />
<include layout="@layout/cpp_simple_button_dot_material" />
<include layout="@layout/cpp_simple_button_minus_material" />
<include layout="@layout/cpp_simple_button_app_material" />
<include layout="@layout/cpp_simple_button_paste_material" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_left_material" />
<include layout="@layout/cpp_simple_button_right_material" />
<include layout="@layout/cpp_simple_button_vars_material" />
<include layout="@layout/cpp_simple_button_functions_material" />
<include layout="@layout/cpp_simple_button_operators_material" />
<include layout="@layout/cpp_simple_button_history_material" />
</LinearLayout>
</LinearLayout>

126
android-app/src/main/res/layout/widget_keyboard_material_light.xml Normal file
View File

@@ -0,0 +1,126 @@
<?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
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_7_material_light" />
<include layout="@layout/cpp_simple_button_8_material_light" />
<include layout="@layout/cpp_simple_button_9_material_light" />
<include layout="@layout/cpp_simple_button_multiplication_material_light" />
<include layout="@layout/cpp_simple_button_percent_material_light" />
<include layout="@layout/cpp_simple_button_clear_material_light" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_4_material_light" />
<include layout="@layout/cpp_simple_button_5_material_light" />
<include layout="@layout/cpp_simple_button_6_material_light" />
<include layout="@layout/cpp_simple_button_division_material_light" />
<include layout="@layout/cpp_simple_button_power_material_light" />
<include layout="@layout/cpp_simple_button_erase_material_light" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_1_material_light" />
<include layout="@layout/cpp_simple_button_2_material_light" />
<include layout="@layout/cpp_simple_button_3_material_light" />
<include layout="@layout/cpp_simple_button_plus_material_light" />
<include layout="@layout/cpp_simple_button_settings_material_light" />
<include layout="@layout/cpp_simple_button_copy_material_light" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_round_brackets_material_light" />
<include layout="@layout/cpp_simple_button_0_material_light" />
<include layout="@layout/cpp_simple_button_dot_material_light" />
<include layout="@layout/cpp_simple_button_minus_material_light" />
<include layout="@layout/cpp_simple_button_app_material_light" />
<include layout="@layout/cpp_simple_button_paste_material_light" />
</LinearLayout>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
<include layout="@layout/cpp_simple_button_left_material_light" />
<include layout="@layout/cpp_simple_button_right_material_light" />
<include layout="@layout/cpp_simple_button_vars_material_light" />
<include layout="@layout/cpp_simple_button_functions_material_light" />
<include layout="@layout/cpp_simple_button_operators_material_light" />
<include layout="@layout/cpp_simple_button_history_material_light" />
</LinearLayout>
</LinearLayout>

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

@@ -34,7 +34,7 @@
</LinearLayout>
<include
layout="@layout/cpp_simple_keyboard"
layout="@layout/widget_keyboard"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="5"/>

42
android-app/src/main/res/layout/widget_layout_material.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
style="@style/CppMain.Widget"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<include
layout="@layout/widget_editor"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"/>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false">
<include
layout="@layout/cpp_simple_button_equals_material"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/widget_display"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="5"/>
</LinearLayout>
<include
layout="@layout/widget_keyboard_material"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="5"/>
</LinearLayout>

42
android-app/src/main/res/layout/widget_layout_material_light.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
style="@style/CppMain.Widget.Light"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<include
layout="@layout/widget_editor_light"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="2"/>
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:baselineAligned="false">
<include
layout="@layout/cpp_simple_button_equals_material_light"
a:layout_width="0dp"
a:layout_height="match_parent"
a:layout_weight="1"/>
<include
layout="@layout/widget_display_light"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="5"/>
</LinearLayout>
<include
layout="@layout/widget_keyboard_material_light"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="5"/>
</LinearLayout>

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

@@ -36,13 +36,13 @@
<item>metro_purple_theme</item>
</string-array>
<string-array name="p_onscreen_theme_names">
<item>@string/p_onscreen_use_app_theme</item>
<string-array name="p_simple_theme_names">
<item>@string/p_use_app_theme</item>
<item>@string/p_material_theme</item>
<item>@string/p_material_light_theme</item>
<item>@string/p_metro_blue_theme</item>
</string-array>
<string-array name="p_onscreen_theme_values" translatable="false">
<string-array name="p_simple_theme_values" translatable="false">
<item>default_theme</item>
<item>material_theme</item>
<item>material_light_theme</item>

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

@@ -102,16 +102,28 @@
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
</style>
<style name="CppMain.Widget.Light" parent="CppMain.Widget">
<item name="android:background">@color/cpp_main_bg_light</item>
</style>
<style name="CppText.Editor.Widget" parent="CppText.Editor">
<item name="android:textSize">@dimen/cpp_widget_editor_text_size</item>
<item name="android:textColor">@color/cpp_text</item>
</style>
<style name="CppText.Editor.Widget.Light" parent="CppText.Editor.Widget">
<item name="android:textColor">@color/cpp_text_inverse</item>
</style>
<style name="CppText.Display.Widget" parent="CppText.Display">
<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
<item name="android:textColor">@color/cpp_text</item>
</style>
<style name="CppText.Display.Widget.Light" parent="CppText.Display.Widget">
<item name="android:textColor">@color/cpp_text_inverse</item>
</style>
<style name="CppMain.Onscreen" parent="CppMain">
<item name="android:background">@color/cpp_main_bg</item>
<item name="android:padding">@dimen/cpp_onscreen_main_padding</item>

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

@@ -64,7 +64,7 @@
<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_onscreen_use_app_theme">App theme</string>
<string name="p_use_app_theme">App theme</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>
@@ -177,6 +177,7 @@
<string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
<string name="open_onscreen_calculator">Click to open calculator in window mode</string>
<string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
<string name="prefs_widget_title">Widget settings</string>
<string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
<string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after device boot</string>
<string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>

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

@@ -50,5 +50,8 @@
<Preference
a:title="@string/prefs_onscreen_title"
a:key="screen-onscreen" />
<Preference
a:title="@string/prefs_widget_title"
a:key="screen-widget" />
</PreferenceScreen>

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

@@ -25,10 +25,9 @@
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<ListPreference
a:entries="@array/p_onscreen_theme_names"
a:entryValues="@array/p_onscreen_theme_values"
a:entries="@array/p_simple_theme_names"
a:entryValues="@array/p_simple_theme_values"
a:key="onscreen.theme"
a:summary="@string/c_calc_theme_summary"
a:title="@string/c_calc_theme"/>
<android.preference.CheckBoxPreference

33
android-app/src/main/res/xml/preferences_widget.xml Normal file
View File

@@ -0,0 +1,33 @@
<?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
-->
<PreferenceScreen xmlns:a="http://schemas.android.com/apk/res/android">
<ListPreference
a:entries="@array/p_simple_theme_names"
a:entryValues="@array/p_simple_theme_values"
a:key="widget.theme"
a:title="@string/c_calc_theme"/>
</PreferenceScreen>