icons + widget fix
Before Width: | Height: | Size: 469 B |
Before Width: | Height: | Size: 596 B |
Before Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 856 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 752 B |
Before Width: | Height: | Size: 471 B |
Before Width: | Height: | Size: 803 B |
Before Width: | Height: | Size: 1.1 KiB |
BIN
android-app-core/res/drawable-hdpi/kb_contract.png
Normal file
After Width: | Height: | Size: 581 B |
BIN
android-app-core/res/drawable-hdpi/kb_copy.png
Normal file
After Width: | Height: | Size: 602 B |
BIN
android-app-core/res/drawable-hdpi/kb_disk.png
Normal file
After Width: | Height: | Size: 473 B |
BIN
android-app-core/res/drawable-hdpi/kb_erase.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
android-app-core/res/drawable-hdpi/kb_expand.png
Normal file
After Width: | Height: | Size: 667 B |
BIN
android-app-core/res/drawable-hdpi/kb_menu.png
Normal file
After Width: | Height: | Size: 315 B |
BIN
android-app-core/res/drawable-hdpi/kb_paste.png
Normal file
After Width: | Height: | Size: 722 B |
BIN
android-app-core/res/drawable-hdpi/kb_plus.png
Normal file
After Width: | Height: | Size: 429 B |
BIN
android-app-core/res/drawable-hdpi/kb_settings.png
Normal file
After Width: | Height: | Size: 771 B |
BIN
android-app-core/res/drawable-hdpi/kb_share.png
Normal file
After Width: | Height: | Size: 896 B |
BIN
android-app-core/res/drawable-hdpi/kb_stats.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 520 B |
Before Width: | Height: | Size: 786 B |
Before Width: | Height: | Size: 628 B |
Before Width: | Height: | Size: 873 B |
Before Width: | Height: | Size: 289 B |
Before Width: | Height: | Size: 619 B |
Before Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 676 B |
Before Width: | Height: | Size: 718 B |
BIN
android-app-core/res/drawable-mdpi/kb_contract.png
Normal file
After Width: | Height: | Size: 466 B |
BIN
android-app-core/res/drawable-mdpi/kb_copy.png
Normal file
After Width: | Height: | Size: 498 B |
BIN
android-app-core/res/drawable-mdpi/kb_disk.png
Normal file
After Width: | Height: | Size: 403 B |
BIN
android-app-core/res/drawable-mdpi/kb_erase.png
Normal file
After Width: | Height: | Size: 752 B |
BIN
android-app-core/res/drawable-mdpi/kb_expand.png
Normal file
After Width: | Height: | Size: 419 B |
BIN
android-app-core/res/drawable-mdpi/kb_menu.png
Normal file
After Width: | Height: | Size: 281 B |
BIN
android-app-core/res/drawable-mdpi/kb_paste.png
Normal file
After Width: | Height: | Size: 611 B |
BIN
android-app-core/res/drawable-mdpi/kb_plus.png
Normal file
After Width: | Height: | Size: 336 B |
BIN
android-app-core/res/drawable-mdpi/kb_settings.png
Normal file
After Width: | Height: | Size: 603 B |
BIN
android-app-core/res/drawable-mdpi/kb_share.png
Normal file
After Width: | Height: | Size: 610 B |
BIN
android-app-core/res/drawable-mdpi/kb_stats.png
Normal file
After Width: | Height: | Size: 769 B |
Before Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 566 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 768 B |
Before Width: | Height: | Size: 422 B |
Before Width: | Height: | Size: 736 B |
Before Width: | Height: | Size: 1.4 KiB |
BIN
android-app-core/res/drawable-xhdpi/kb_contract.png
Normal file
After Width: | Height: | Size: 747 B |
BIN
android-app-core/res/drawable-xhdpi/kb_copy.png
Normal file
After Width: | Height: | Size: 566 B |
BIN
android-app-core/res/drawable-xhdpi/kb_disk.png
Normal file
After Width: | Height: | Size: 415 B |
BIN
android-app-core/res/drawable-xhdpi/kb_erase.png
Normal file
After Width: | Height: | Size: 2.0 KiB |
BIN
android-app-core/res/drawable-xhdpi/kb_expand.png
Normal file
After Width: | Height: | Size: 858 B |
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
BIN
android-app-core/res/drawable-xhdpi/kb_paste.png
Normal file
After Width: | Height: | Size: 734 B |
BIN
android-app-core/res/drawable-xhdpi/kb_plus.png
Normal file
After Width: | Height: | Size: 467 B |
BIN
android-app-core/res/drawable-xhdpi/kb_settings.png
Normal file
After Width: | Height: | Size: 677 B |
BIN
android-app-core/res/drawable-xhdpi/kb_share.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
android-app-core/res/drawable-xhdpi/kb_stats.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_copy"
|
||||
a:src="@drawable/ab_copy"
|
||||
a:src="@drawable/kb_copy"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Copy" />
|
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_erase"
|
||||
a:src="@drawable/ab_erase"
|
||||
a:src="@drawable/kb_erase"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Erase" />
|
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_paste"
|
||||
a:src="@drawable/ab_paste"
|
||||
a:src="@drawable/kb_paste"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Paste" />
|
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_settings"
|
||||
a:src="@drawable/ab_settings"
|
||||
a:src="@drawable/kb_settings"
|
||||
style="@style/cpp_simple_metro_control_image_button_style"
|
||||
a:contentDescription="Settings" />
|
@ -9,6 +9,7 @@ import android.content.Intent;
|
||||
import android.text.Html;
|
||||
import android.widget.RemoteViews;
|
||||
import org.solovyev.android.calculator.*;
|
||||
import org.solovyev.android.calculator.external.CalculatorExternalListenersContainer;
|
||||
import org.solovyev.android.calculator.external.ExternalCalculatorIntentHandler;
|
||||
import org.solovyev.android.calculator.external.ExternalCalculatorStateUpdater;
|
||||
|
||||
@ -41,9 +42,6 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
|
||||
@Nonnull
|
||||
private ExternalCalculatorIntentHandler intentHandler = new CalculatorWidgetIntentHandler(this);
|
||||
|
||||
private boolean initialized = false;
|
||||
|
||||
|
||||
/*
|
||||
**********************************************************************
|
||||
*
|
||||
@ -53,6 +51,13 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
|
||||
*/
|
||||
|
||||
protected AbstractCalculatorWidgetProvider() {
|
||||
final Class<? extends AppWidgetProvider> componentClass = this.getComponentClass();
|
||||
|
||||
final CalculatorExternalListenersContainer externalListenersContainer = Locator.getInstance().getExternalListenersContainer();
|
||||
// NOTE: null might be in tests, now robolectric creates widget provider before application
|
||||
if (externalListenersContainer != null) {
|
||||
externalListenersContainer.addExternalListener(componentClass);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@ -66,13 +71,6 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider implem
|
||||
@Override
|
||||
public void onEnabled(Context context) {
|
||||
super.onEnabled(context);
|
||||
|
||||
if (!initialized) {
|
||||
final Class<? extends AppWidgetProvider> componentClass = this.getComponentClass();
|
||||
Locator.getInstance().getExternalListenersContainer().addExternalListener(componentClass);
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
getCursorColor(context);
|
||||
}
|
||||
|
||||
|
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_copy"
|
||||
a:src="@drawable/ab_copy"
|
||||
a:src="@drawable/kb_copy"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="copyButtonClickHandler" />
|
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_erase"
|
||||
a:src="@drawable/ab_erase"
|
||||
a:src="@drawable/kb_erase"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="eraseButtonClickHandler" />
|
@ -8,6 +8,6 @@
|
||||
|
||||
<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@id/cpp_button_paste"
|
||||
a:src="@drawable/ab_paste"
|
||||
a:src="@drawable/kb_paste"
|
||||
style="?cpp_control_image_button_style"
|
||||
a:onClick="pasteButtonClickHandler" />
|
@ -31,6 +31,6 @@
|
||||
a:paddingTop="0dp"
|
||||
a:paddingBottom="0dp"
|
||||
a:scaleType="centerInside"
|
||||
a:src="@drawable/ab_settings" />
|
||||
a:src="@drawable/kb_settings" />
|
||||
|
||||
</LinearLayout>
|
@ -11,6 +11,6 @@
|
||||
<item
|
||||
a:id="@+id/functions_menu_add_function"
|
||||
a:title="@string/c_add"
|
||||
a:icon="@drawable/ab_add"
|
||||
a:icon="@drawable/kb_plus"
|
||||
a:showAsAction="always" />
|
||||
</menu>
|
@ -11,37 +11,37 @@
|
||||
<item
|
||||
a:id="@+id/menu_plot_2d"
|
||||
a:title="@string/cpp_plot_2d"
|
||||
a:icon="@drawable/ab_graph"
|
||||
a:icon="@drawable/kb_stats"
|
||||
a:showAsAction="always" />
|
||||
|
||||
<item
|
||||
a:id="@+id/menu_plot_3d"
|
||||
a:title="@string/cpp_plot_3d"
|
||||
a:icon="@drawable/ab_graph"
|
||||
a:icon="@drawable/kb_stats"
|
||||
a:showAsAction="always" />
|
||||
|
||||
<item
|
||||
a:id="@+id/menu_plot_range"
|
||||
a:title="@string/cpp_plot_range"
|
||||
a:icon="@drawable/ab_expand"
|
||||
a:icon="@drawable/kb_contract"
|
||||
a:showAsAction="always" />
|
||||
|
||||
<item
|
||||
a:id="@+id/menu_plot_functions"
|
||||
a:title="@string/cpp_plot_functions"
|
||||
a:icon="@drawable/ab_menu"
|
||||
a:icon="@drawable/kb_menu"
|
||||
a:showAsAction="always" />
|
||||
|
||||
<item
|
||||
a:id="@+id/menu_plot_schreeshot"
|
||||
a:title="@string/cpp_plot_screenshot"
|
||||
a:icon="@drawable/ab_save"
|
||||
a:icon="@drawable/kb_disk"
|
||||
a:showAsAction="always" />
|
||||
|
||||
<item
|
||||
a:id="@+id/menu_plot_settings"
|
||||
a:title="@string/c_settings"
|
||||
a:icon="@drawable/ab_settings"
|
||||
a:icon="@drawable/kb_settings"
|
||||
a:showAsAction="always" />
|
||||
|
||||
</menu>
|
@ -11,6 +11,6 @@
|
||||
<item
|
||||
a:id="@+id/var_menu_add_var"
|
||||
a:title="@string/c_add"
|
||||
a:icon="@drawable/ab_add"
|
||||
a:icon="@drawable/kb_plus"
|
||||
a:showAsAction="always" />
|
||||
</menu>
|