changes
This commit is contained in:
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/appButton"
|
||||
a:src="@drawable/kb_logo"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
a:contentDescription="App"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/clearButton"
|
||||
a:text="@string/c_clear"
|
||||
a:textStyle="bold"
|
||||
style="@style/widget_metro_control_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/copyButton"
|
||||
a:src="@drawable/kb_copy"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
a:contentDescription="Copy"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/divisionButton"
|
||||
a:text="/"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/periodButton"
|
||||
a:text="."
|
||||
style="@style/metro_digit_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/eightDigitButton"
|
||||
a:text="8"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
<Button
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/equalsButton"
|
||||
a:text="="
|
||||
style="@style/widget_metro_control_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/eraseButton"
|
||||
a:src="@drawable/kb_delete"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
a:contentDescription="Erase"/>
|
@@ -1,11 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/fiveDigitButton"
|
||||
a:text="5"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,11 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/fourDigitButton"
|
||||
a:text="4"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/functions_button"
|
||||
a:text="ƒ(x)"
|
||||
a:textStyle="italic"
|
||||
style="@style/widget_metro_control_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/historyButton"
|
||||
a:text="@string/c_history_button"
|
||||
style="@style/widget_metro_control_button_style"
|
||||
a:textStyle="bold"/>
|
@@ -1,74 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<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_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_seven_digit_button"/>
|
||||
<include layout="@layout/widget_eight_digit_button"/>
|
||||
<include layout="@layout/widget_nine_digit_button"/>
|
||||
<include layout="@layout/widget_multiplication_button"/>
|
||||
<include layout="@layout/widget_percent_button"/>
|
||||
<include layout="@layout/widget_clear_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_four_digit_button"/>
|
||||
<include layout="@layout/widget_five_digit_button"/>
|
||||
<include layout="@layout/widget_six_digit_button"/>
|
||||
<include layout="@layout/widget_division_button"/>
|
||||
<include layout="@layout/widget_power_button"/>
|
||||
<include layout="@layout/widget_erase_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_one_digit_button"/>
|
||||
<include layout="@layout/widget_two_digit_button"/>
|
||||
<include layout="@layout/widget_three_digit_button"/>
|
||||
<include layout="@layout/widget_plus_button"/>
|
||||
<include layout="@layout/widget_like_button"/>
|
||||
<include layout="@layout/widget_copy_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_round_brackets_button"/>
|
||||
<include layout="@layout/widget_zero_digit_button"/>
|
||||
<include layout="@layout/widget_dot_button"/>
|
||||
<include layout="@layout/widget_subtraction_button"/>
|
||||
<include layout="@layout/widget_settings_button"/>
|
||||
<include layout="@layout/widget_paste_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout a:layout_weight="1"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="0dp">
|
||||
|
||||
<include layout="@layout/widget_left_button"/>
|
||||
<include layout="@layout/widget_right_button"/>
|
||||
<include layout="@layout/widget_vars_button"/>
|
||||
<include layout="@layout/widget_functions_button"/>
|
||||
<include layout="@layout/widget_app_button"/>
|
||||
<include layout="@layout/widget_history_button"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/leftButton"
|
||||
a:text="◀"
|
||||
style="@style/widget_metro_control_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/likeButton"
|
||||
a:src="@drawable/kb_facebook"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
a:contentDescription="Like"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/multiplicationButton"
|
||||
a:text="×"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/nineDigitButton"
|
||||
a:text="9"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/oneDigitButton"
|
||||
a:text="1"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/pasteButton"
|
||||
a:src="@drawable/kb_paste"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
a:contentDescription="Paste"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/percentButton"
|
||||
a:text="%"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
@@ -1,11 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/plusButton"
|
||||
a:text="+"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/powerButton"
|
||||
a:text="^"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/rightButton"
|
||||
a:text="▶"
|
||||
style="@style/widget_metro_control_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/roundBracketsButton"
|
||||
a:text="()"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/settingsButton"
|
||||
a:src="@drawable/kb_settings"
|
||||
style="@style/widget_metro_control_image_button_style"
|
||||
a:contentDescription="Settings"/>
|
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/sevenDigitButton"
|
||||
a:text="7"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/sixDigitButton"
|
||||
a:text="6"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,11 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/subtractionButton"
|
||||
a:text="-"
|
||||
style="@style/widget_metro_blue_operation_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/threeDigitButton"
|
||||
a:text="3"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/twoDigitButton"
|
||||
a:text="2"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,13 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/vars_button"
|
||||
a:text="π,…"
|
||||
a:textStyle="italic"
|
||||
style="@style/widget_metro_control_button_style"/>
|
@@ -1,12 +0,0 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<Button xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/zeroDigitButton"
|
||||
a:text="0"
|
||||
style="@style/widget_metro_digit_button_style"/>
|
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="cpp_widget_editor_text_size">25sp</dimen>
|
||||
<dimen name="cpp_widget_keyboard_button_text_size">20dp</dimen>
|
||||
<dimen name="cpp_widget_display_text_size">25sp</dimen>
|
||||
<dimen name="cpp_widget_margin">6dp</dimen>
|
||||
</resources>
|
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="cpp_widget_main_layout_style" parent="cpp_default_main_layout_style">
|
||||
<item name="android:padding">1dp</item>
|
||||
<item name="android:layout_margin">@dimen/cpp_widget_margin</item>
|
||||
@@ -13,20 +14,4 @@
|
||||
<item name="android:textSize">@dimen/cpp_widget_display_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_digit_button_style" parent="metro_digit_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_control_button_style" parent="metro_control_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_blue_operation_button_style" parent="metro_blue_operation_button_style">
|
||||
<item name="android:textSize">@dimen/cpp_widget_keyboard_button_text_size</item>
|
||||
</style>
|
||||
|
||||
<style name="widget_metro_control_image_button_style" parent="metro_control_image_button_style">
|
||||
<item name="android:scaleType">center</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
@@ -10,10 +10,7 @@ import android.text.Html;
|
||||
import android.widget.RemoteViews;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.solovyev.android.calculator.CalculatorButtons;
|
||||
import org.solovyev.android.calculator.CalculatorDisplayViewState;
|
||||
import org.solovyev.android.calculator.CalculatorEditorViewState;
|
||||
import org.solovyev.android.calculator.Locator;
|
||||
import org.solovyev.android.calculator.*;
|
||||
import org.solovyev.android.calculator.external.ExternalCalculatorIntentHandler;
|
||||
import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater;
|
||||
|
||||
@@ -113,7 +110,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
|
||||
for (int appWidgetId : appWidgetIds) {
|
||||
final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout);
|
||||
|
||||
for (WidgetButton button : WidgetButton.values()) {
|
||||
for (CalculatorButton button : CalculatorButton.values()) {
|
||||
final Intent onButtonClickIntent = new Intent(context, getComponentClass());
|
||||
onButtonClickIntent.setAction(BUTTON_PRESSED_ACTION);
|
||||
onButtonClickIntent.putExtra(BUTTON_ID_EXTRA, button.getButtonId());
|
||||
|
@@ -3,6 +3,7 @@ package org.solovyev.android.calculator.widget;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.solovyev.android.calculator.CalculatorButton;
|
||||
import org.solovyev.android.calculator.Locator;
|
||||
import org.solovyev.android.calculator.external.DefaultExternalCalculatorIntentHandler;
|
||||
import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater;
|
||||
@@ -25,7 +26,7 @@ public class CalculatorWidgetIntentHandler extends DefaultExternalCalculatorInte
|
||||
if (AbstractCalculatorWidgetProvider.BUTTON_PRESSED_ACTION.equals(intent.getAction())) {
|
||||
final int buttonId = intent.getIntExtra(AbstractCalculatorWidgetProvider.BUTTON_ID_EXTRA, 0);
|
||||
|
||||
final WidgetButton button = WidgetButton.getById(buttonId);
|
||||
final CalculatorButton button = CalculatorButton.getById(buttonId);
|
||||
if (button != null) {
|
||||
button.onClick(context);
|
||||
}
|
||||
|
@@ -1,130 +0,0 @@
|
||||
package org.solovyev.android.calculator.widget;
|
||||
|
||||
import android.content.Context;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.solovyev.android.calculator.CalculatorSpecialButton;
|
||||
import org.solovyev.android.calculator.Locator;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* User: serso
|
||||
* Date: 10/20/12
|
||||
* Time: 12:05 AM
|
||||
*/
|
||||
public enum WidgetButton {
|
||||
|
||||
/*digits*/
|
||||
one(R.id.oneDigitButton, "1"),
|
||||
two(R.id.twoDigitButton, "2"),
|
||||
three(R.id.threeDigitButton, "3"),
|
||||
four(R.id.fourDigitButton, "4"),
|
||||
five(R.id.fiveDigitButton, "5"),
|
||||
six(R.id.sixDigitButton, "6"),
|
||||
seven(R.id.sevenDigitButton, "7"),
|
||||
eight(R.id.eightDigitButton, "8"),
|
||||
nine(R.id.nineDigitButton, "9"),
|
||||
zero(R.id.zeroDigitButton, "0"),
|
||||
|
||||
period(R.id.periodButton, "."),
|
||||
brackets(R.id.roundBracketsButton, "()"),
|
||||
|
||||
settings(R.id.settingsButton, CalculatorSpecialButton.settings_detached),
|
||||
like(R.id.likeButton, CalculatorSpecialButton.like),
|
||||
|
||||
/*last row*/
|
||||
left(R.id.leftButton, CalculatorSpecialButton.cursor_left),
|
||||
right(R.id.rightButton, CalculatorSpecialButton.cursor_right),
|
||||
vars(R.id.vars_button, CalculatorSpecialButton.vars_detached),
|
||||
functions(R.id.functions_button, CalculatorSpecialButton.functions_detached),
|
||||
app(R.id.appButton, CalculatorSpecialButton.open_app),
|
||||
history(R.id.historyButton, CalculatorSpecialButton.history_detached),
|
||||
|
||||
/*operations*/
|
||||
multiplication(R.id.multiplicationButton, "*"),
|
||||
division(R.id.divisionButton, "/"),
|
||||
plus(R.id.plusButton, "+"),
|
||||
subtraction(R.id.subtractionButton, "-"),
|
||||
percent(R.id.percentButton, "%"),
|
||||
power(R.id.powerButton, "^"),
|
||||
|
||||
/*last column*/
|
||||
clear(R.id.clearButton, CalculatorSpecialButton.clear),
|
||||
erase(R.id.eraseButton, CalculatorSpecialButton.erase, CalculatorSpecialButton.clear),
|
||||
copy(R.id.copyButton, CalculatorSpecialButton.copy),
|
||||
paste(R.id.pasteButton, CalculatorSpecialButton.paste),
|
||||
|
||||
/*equals*/
|
||||
equals(R.id.equalsButton, CalculatorSpecialButton.equals);
|
||||
|
||||
|
||||
private final int buttonId;
|
||||
|
||||
@NotNull
|
||||
private final String onClickText;
|
||||
|
||||
@Nullable
|
||||
private final String onLongClickText;
|
||||
|
||||
@NotNull
|
||||
private static Map<Integer, WidgetButton> buttonsByIds = new HashMap<Integer, WidgetButton>();
|
||||
|
||||
WidgetButton(int buttonId, @NotNull CalculatorSpecialButton onClickButton, @Nullable CalculatorSpecialButton onLongClickButton) {
|
||||
this(buttonId, onClickButton.getActionCode(), onLongClickButton == null ? null : onLongClickButton.getActionCode());
|
||||
}
|
||||
|
||||
WidgetButton(int buttonId, @NotNull CalculatorSpecialButton onClickButton) {
|
||||
this(buttonId, onClickButton, null);
|
||||
}
|
||||
|
||||
WidgetButton(int buttonId, @NotNull String onClickText, @Nullable String onLongClickText) {
|
||||
this.buttonId = buttonId;
|
||||
this.onClickText = onClickText;
|
||||
this.onLongClickText = onLongClickText;
|
||||
|
||||
}
|
||||
|
||||
WidgetButton(int buttonId, @NotNull String onClickText) {
|
||||
this(buttonId, onClickText, null);
|
||||
}
|
||||
|
||||
public void onLongClick(@NotNull Context context) {
|
||||
Locator.getInstance().getNotifier().showDebugMessage("Calculator++ Widget", "Button pressed: " + onLongClickText);
|
||||
if (onLongClickText != null) {
|
||||
Locator.getInstance().getKeyboard().buttonPressed(onLongClickText);
|
||||
}
|
||||
}
|
||||
|
||||
public void onClick(@NotNull Context context) {
|
||||
Locator.getInstance().getNotifier().showDebugMessage("Calculator++ Widget", "Button pressed: " + onClickText);
|
||||
Locator.getInstance().getKeyboard().buttonPressed(onClickText);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static WidgetButton getById(int buttonId) {
|
||||
initButtonsByIdsMap();
|
||||
|
||||
return buttonsByIds.get(buttonId);
|
||||
}
|
||||
|
||||
private static void initButtonsByIdsMap() {
|
||||
if ( buttonsByIds.isEmpty() ) {
|
||||
// if not initialized
|
||||
|
||||
final WidgetButton[] widgetButtons = values();
|
||||
|
||||
final Map<Integer, WidgetButton> localButtonsByIds = new HashMap<Integer, WidgetButton>(widgetButtons.length);
|
||||
for (WidgetButton widgetButton : widgetButtons) {
|
||||
localButtonsByIds.put(widgetButton.getButtonId(), widgetButton);
|
||||
}
|
||||
|
||||
buttonsByIds = localButtonsByIds;
|
||||
}
|
||||
}
|
||||
|
||||
public int getButtonId() {
|
||||
return buttonId;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user