diff options
author | Stefan Niedermann <stefan.niedermann@googlemail.com> | 2016-01-29 17:35:14 +0300 |
---|---|---|
committer | Stefan Niedermann <stefan.niedermann@googlemail.com> | 2016-01-29 17:35:14 +0300 |
commit | 2af6e4555deda5f56504d4ea218b57a8a4dbd326 (patch) | |
tree | dc432cd12ac9d318503ffa07f6b8f325129b20da | |
parent | 5c34f83022bfbeceb568690aa65f1a747cba2c91 (diff) |
Version bump to v0.5.0v0.5.0
Commented out widgets because they are not ready yet.
-rw-r--r-- | .idea/.name | 2 | ||||
-rw-r--r-- | .idea/codeStyleSettings.xml | 229 | ||||
-rw-r--r-- | .idea/gradle.xml | 3 | ||||
-rw-r--r-- | .idea/misc.xml | 27 | ||||
-rw-r--r-- | app/build.gradle | 4 | ||||
-rw-r--r-- | app/src/main/AndroidManifest.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-hy/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-ru/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-sr/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
11 files changed, 15 insertions, 272 deletions
diff --git a/.idea/.name b/.idea/.name index 84405a01..88bdaf19 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -OwnCloudNotes
\ No newline at end of file +OwnCloud-Notes
\ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index d8f708f1..00000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,229 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectCodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS"> - <value> - <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND"> - <value /> - </option> - <option name="IMPORT_LAYOUT_TABLE"> - <value> - <package name="android" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="com" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="junit" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="net" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="org" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="java" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="javax" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="" withSubpackages="true" static="false" /> - <emptyLine /> - <package name="" withSubpackages="true" static="true" /> - <emptyLine /> - </value> - </option> - <option name="RIGHT_MARGIN" value="100" /> - <AndroidXmlCodeStyleSettings> - <option name="USE_CUSTOM_SETTINGS" value="true" /> - </AndroidXmlCodeStyleSettings> - <Objective-C-extensions> - <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" /> - <option name="RELEASE_STYLE" value="IVAR" /> - <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" /> - <file> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> - </file> - <class> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> - <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> - </class> - <extensions> - <pair source="cpp" header="h" /> - <pair source="c" header="h" /> - </extensions> - </Objective-C-extensions> - <XML> - <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> - </XML> - <codeStyleSettings language="XML"> - <option name="FORCE_REARRANGE_MODE" value="1" /> - <indentOptions> - <option name="CONTINUATION_INDENT_SIZE" value="4" /> - </indentOptions> - <arrangement> - <rules> - <section> - <rule> - <match> - <AND> - <NAME>xmlns:android</NAME> - <XML_NAMESPACE>Namespace:</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>xmlns:.*</NAME> - <XML_NAMESPACE>Namespace:</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:id</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:name</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>name</NAME> - <XML_NAMESPACE>^$</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>style</NAME> - <XML_NAMESPACE>^$</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*</NAME> - <XML_NAMESPACE>^$</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:layout_width</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:layout_height</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:layout_.*</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:width</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*:height</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*</NAME> - <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - <section> - <rule> - <match> - <AND> - <NAME>.*</NAME> - <XML_NAMESPACE>.*</XML_NAMESPACE> - </AND> - </match> - <order>BY_NAME</order> - </rule> - </section> - </rules> - </arrangement> - </codeStyleSettings> - </value> - </option> - <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" /> - </component> -</project>
\ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0833b17c..1bbc21dc 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,8 @@ <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> - <option name="distributionType" value="LOCAL" /> + <option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" /> <option name="gradleJvm" value="1.7" /> <option name="modules"> <set> diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a3eaffb..e45faed7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,32 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="EntryPointsManager"> - <entry_points version="2.0" /> - </component> - <component name="NullableNotNullManager"> - <option name="myDefaultNullable" value="android.support.annotation.Nullable" /> - <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> - <option name="myNullables"> - <value> - <list size="4"> - <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> - <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> - <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> - <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> - </list> - </value> - </option> - <option name="myNotNulls"> - <value> - <list size="4"> - <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> - <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> - <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> - <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> - </list> - </value> - </option> - </component> <component name="ProjectLevelVcsManager" settingsEditedManually="false"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> diff --git a/app/build.gradle b/app/build.gradle index d83c0a0c..6bf70861 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "it.niedermann.owncloud.notes"
minSdkVersion 22
targetSdkVersion 23
- versionCode 4
- versionName "0.4.0"
+ versionCode 5
+ versionName "0.5.0"
}
buildTypes {
release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 499c4d43..dee55a7e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ <manifest package="it.niedermann.owncloud.notes" xmlns:android="http://schemas.android.com/apk/res/android" - android:versionCode="4" - android:versionName="0.4.0"> + android:versionCode="5" + android:versionName="0.5.0"> <uses-sdk android:minSdkVersion="11" @@ -64,7 +64,7 @@ <!-- All Notes Widget --> - <receiver + <!--receiver android:name="it.niedermann.owncloud.notes.android.widget.AllNotesWidget" android:label="@string/widget_all_notes_title"> <intent-filter> @@ -75,11 +75,11 @@ android:name="android.appwidget.provider" android:resource="@xml/all_notes_widget_provider_info" /> </receiver> - <service android:name=".android.widget.AllNotesWidget$StackWidgetService" /> + <service android:name=".android.widget.AllNotesWidget$StackWidgetService" /--> <!-- Single Note Widget --> - <receiver + <!--receiver android:name="it.niedermann.owncloud.notes.android.widget.SingleNoteWidget" android:label="@string/widget_single_note_title"> <intent-filter> @@ -97,6 +97,6 @@ <intent-filter> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" /> </intent-filter> - </activity> + </activity--> </application> </manifest>
\ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f0c4500d..8378755f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -61,7 +61,7 @@ <!-- About --> <string name="about_version_title">Version</string> - <string name="about_version">Sie benutzen aktuell <strong>v0.4.0</strong></string> + <string name="about_version">Sie benutzen aktuell <strong>v0.5.0</strong></string> <string name="about_maintainer_title">Maintainer</string> <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> <string name="about_developers_title">Entwickler</string> diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index b19aafea..e7486424 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -61,7 +61,7 @@ <!-- About --> <string name="about_version_title">տարբերակ</string> - <string name="about_version">դուք օգտագործում եք <strong>v0.4.0</strong></string> + <string name="about_version">դուք օգտագործում եք <strong>v0.5.0</strong></string> <string name="about_maintainer_title">ղեկավար</string> <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> <string name="about_developers_title">ծրագրավորող</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index aba41f95..fdf9c15f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -61,7 +61,7 @@ <!-- About --> <string name="about_version_title">версия</string> - <string name="about_version">вы сейчас используете <strong>v0.4.0</strong></string> + <string name="about_version">вы сейчас используете <strong>v0.5.0</strong></string> <string name="about_maintainer_title">руководитель</string> <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> <string name="about_developers_title">разработчики</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index c712ea6e..4aa40a81 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -62,7 +62,7 @@ <!-- About --> <string name="about_version_title">Издање</string> - <string name="about_version">Текуће издање је <strong>0.4.0</strong></string> + <string name="about_version">Текуће издање је <strong>0.5.0</strong></string> <string name="about_maintainer_title">Главни програмер</string> <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> <string name="about_developers_title">Програмери</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c4a1a2af..51964ce2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,7 +62,7 @@ <!-- About --> <string name="about_version_title">Version</string> - <string name="about_version">You are currently using <strong>v0.4.0</strong></string> + <string name="about_version">You are currently using <strong>v0.5.0</strong></string> <string name="about_maintainer_title">Maintainer</string> <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string> <string name="about_developers_title">Developers</string> |