Fixes
This commit is contained in:
parent
4637547691
commit
029137f2c9
@ -5,12 +5,12 @@
|
||||
<parent>
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
<version>1.5.1-b2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-core</artifactId>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
<version>1.5.1-b2-SNAPSHOT</version>
|
||||
<name>Calculator++ Application Core</name>
|
||||
|
||||
<packaging>jar</packaging>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
<version>1.5.1-b2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -50,7 +50,7 @@
|
||||
|
||||
<!-- WIDGET CONFIG -->
|
||||
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".widget.CalculatorWidgetProvider">
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
@ -62,7 +62,7 @@
|
||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x3"/>
|
||||
</receiver>
|
||||
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".widget.CalculatorWidgetProvider3x4">
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_3x4_name" android:name=".widget.CalculatorWidgetProvider3x4">
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
@ -74,7 +74,7 @@
|
||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_3x4"/>
|
||||
</receiver>
|
||||
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".widget.CalculatorWidgetProvider4x4">
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x4_name" android:name=".widget.CalculatorWidgetProvider4x4">
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
@ -86,6 +86,18 @@
|
||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x4"/>
|
||||
</receiver>
|
||||
|
||||
<receiver android:icon="@drawable/icon" android:label="@string/c_app_widget_4x5_name" android:name=".widget.CalculatorWidgetProvider4x5">
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
<action android:name="org.solovyev.calculator.widget.EDITOR_STATE_CHANGED"/>
|
||||
<action android:name="org.solovyev.calculator.widget.DISPLAY_STATE_CHANGED"/>
|
||||
<action android:name="org.solovyev.calculator.widget.BUTTON_PRESSED"/>
|
||||
</intent-filter>
|
||||
|
||||
<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget_info_4x5"/>
|
||||
</receiver>
|
||||
|
||||
<!-- ADMOB + BILLING CONFIG -->
|
||||
|
||||
<activity android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" android:name="com.google.ads.AdActivity"/>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
<version>1.5.1-b2-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@ -21,7 +21,7 @@
|
||||
<dependency>
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-core</artifactId>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
<version>1.5.1-b2-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
@ -9,19 +9,19 @@
|
||||
|
||||
# Project target.
|
||||
target=android-15
|
||||
android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.5
|
||||
android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.5
|
||||
android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.5
|
||||
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.5
|
||||
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.5
|
||||
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.5
|
||||
android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.5
|
||||
android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.5
|
||||
android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.5
|
||||
android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.5
|
||||
android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.5
|
||||
android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.5
|
||||
android.library.reference.1=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6
|
||||
android.library.reference.2=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6
|
||||
android.library.reference.3=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6
|
||||
android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6
|
||||
android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6
|
||||
android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6
|
||||
android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6
|
||||
android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6
|
||||
android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6
|
||||
android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6
|
||||
android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6
|
||||
android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6
|
||||
android.library.reference.13=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0
|
||||
android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.5
|
||||
android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6
|
||||
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#001c45"
|
||||
a:endColor="#003481"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp" />
|
||||
</shape>
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item a:state_pressed="true"
|
||||
a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/blue_button_shape"/>
|
||||
|
||||
</selector>
|
@ -1,14 +1,10 @@
|
||||
<?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
|
||||
-->
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#000d1f"
|
||||
a:endColor="#002255"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp" />
|
||||
</shape>
|
||||
<item a:state_pressed="true"
|
||||
a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/blue_button_dark_shape"/>
|
||||
|
||||
</selector>
|
14
calculatorpp/res/drawable/blue_button_dark_shape.xml
Normal file
14
calculatorpp/res/drawable/blue_button_dark_shape.xml
Normal file
@ -0,0 +1,14 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#000d1f"
|
||||
a:endColor="#002255"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp" />
|
||||
</shape>
|
8
calculatorpp/res/drawable/blue_button_shape.xml
Normal file
8
calculatorpp/res/drawable/blue_button_shape.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#001c45"
|
||||
a:endColor="#003481"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp" />
|
||||
</shape>
|
@ -1,14 +1,10 @@
|
||||
<?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
|
||||
-->
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#520546"
|
||||
a:endColor="#8a307c"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp"/>
|
||||
</shape>
|
||||
<item a:state_pressed="true"
|
||||
a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/violet_button_shape"/>
|
||||
|
||||
</selector>
|
@ -1,14 +1,10 @@
|
||||
<?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
|
||||
-->
|
||||
<selector xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#2b0325"
|
||||
a:endColor="#4f1c47"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp"/>
|
||||
</shape>
|
||||
<item a:state_pressed="true"
|
||||
a:drawable="@drawable/metro_button_pressed"/>
|
||||
|
||||
<item a:drawable="@drawable/violet_button_dark_shape"/>
|
||||
|
||||
</selector>
|
14
calculatorpp/res/drawable/violet_button_dark_shape.xml
Normal file
14
calculatorpp/res/drawable/violet_button_dark_shape.xml
Normal file
@ -0,0 +1,14 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#2b0325"
|
||||
a:endColor="#4f1c47"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp"/>
|
||||
</shape>
|
14
calculatorpp/res/drawable/violet_button_shape.xml
Normal file
14
calculatorpp/res/drawable/violet_button_shape.xml
Normal file
@ -0,0 +1,14 @@
|
||||
<?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
|
||||
-->
|
||||
|
||||
<shape xmlns:a="http://schemas.android.com/apk/res/android">
|
||||
<gradient a:startColor="#520546"
|
||||
a:endColor="#8a307c"
|
||||
a:angle="90"/>
|
||||
<corners a:radius="0dp"/>
|
||||
</shape>
|
@ -232,7 +232,7 @@
|
||||
|
||||
<string name="c_release_notes_for_107">
|
||||
1. Поддержка пользовательских функций (кнопка +f или кнопка + на экране функций)\n
|
||||
2. Добавлены различные размеры виджета: 3x3, 3x4, 4x4\n
|
||||
2. Добавлены различные размеры виджета: 3x3, 3x4, 4x4, 4x5\n
|
||||
3. Добавлено несколько функций: re(x), im(x), √3(x), √4(x), √n(x, n)\n
|
||||
4. Система счисления/единицы измерения углов по умолчанию + окно с ошибками расчётов\n
|
||||
5. Ускорена работа приложения\n
|
||||
|
@ -265,5 +265,9 @@
|
||||
<string name="preferred_angle_units_message">Единицы измерения углов по умолчанию \'%1$s\' отличаются от текущих \'%2$s\'. Забыли их вернуть?</string>
|
||||
|
||||
<string name="close">Закрыть</string>
|
||||
<string name="c_app_widget_3x3_name">Калькулятор++ Виджет (3x3)</string>
|
||||
<string name="c_app_widget_3x4_name">Калькулятор++ Виджет (3x4)</string>
|
||||
<string name="c_app_widget_4x4_name">Калькулятор++ Виджет (4x4)</string>
|
||||
<string name="c_app_widget_4x5_name">Калькулятор++ Виджет (4x5)</string>
|
||||
|
||||
</resources>
|
@ -231,7 +231,7 @@
|
||||
|
||||
<string name="c_release_notes_for_107">
|
||||
1. Support for user-defined functions (see +f button or + button inside functions screen)\n
|
||||
2. Widget in different sizes: 3x3, 3x4, 4x4\n
|
||||
2. Widget in different sizes: 3x3, 3x4, 4x4, 4x5\n
|
||||
3. Several functions added: re(x), im(x), √3(x), √4(x), √n(x, n)\n
|
||||
4. Default number systems/angle units + special warning dialog in case of calculations errors\n
|
||||
5. Performance improvements\n
|
||||
|
@ -265,5 +265,9 @@
|
||||
<string name="p_preferred_angle_units_summary">Defines the default angle units</string>
|
||||
<string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to change back?</string>
|
||||
<string name="close">Close</string>
|
||||
<string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
|
||||
<string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
|
||||
<string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
|
||||
<string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
|
||||
|
||||
</resources>
|
10
calculatorpp/res/xml/calculator_widget_info_4x5.xml
Normal file
10
calculatorpp/res/xml/calculator_widget_info_4x5.xml
Normal file
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:minWidth="250dp"
|
||||
a:minHeight="320dp"
|
||||
a:initialLayout="@layout/widget_layout"
|
||||
a:previewImage="@drawable/widget_preview"
|
||||
a:resizeMode="horizontal|vertical">
|
||||
|
||||
</appwidget-provider>
|
@ -0,0 +1,9 @@
|
||||
package org.solovyev.android.calculator.widget;
|
||||
|
||||
/**
|
||||
* User: serso
|
||||
* Date: 11/18/12
|
||||
* Time: 7:43 PM
|
||||
*/
|
||||
public class CalculatorWidgetProvider4x5 extends AbstractCalculatorWidgetProvider {
|
||||
}
|
4
pom.xml
4
pom.xml
@ -12,7 +12,7 @@
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.5.1-SNAPSHOT</version>
|
||||
<version>1.5.1-b2-SNAPSHOT</version>
|
||||
<name>Calculator++</name>
|
||||
|
||||
<scm>
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<android.common.version>1.0.5</android.common.version>
|
||||
<android.common.version>1.0.6</android.common.version>
|
||||
<common.version>1.0.3</common.version>
|
||||
</properties>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user