diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..ae78c11 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae5073e..98651a6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,6 +3,9 @@
+
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5efd058..7131eb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
You can also have a look on the GitHub release page: https://github.com/konradrenner/kolabnotes-android/releases
+## [4.0.0] - 2019-10-18
+### Added
+- Android Q support
+
## [3.2.1] - 2019-07-11
### Fixed
- GitHub issue 197
@@ -100,7 +104,8 @@ You can also have a look on the GitHub release page: https://github.com/konradre
### Fixed
- First stable release, support for all major features of the Kolab notes format
-[Unreleased]: https://github.com/konradrenner/kolabnotes-android/compare/3.2.1...HEAD
+[Unreleased]: https://github.com/konradrenner/kolabnotes-android/compare/4.0.0...HEAD
+[4.0.0]: https://github.com/konradrenner/kolabnotes-android/compare/3.2.1...4.0.0
[3.2.1]: https://github.com/konradrenner/kolabnotes-android/compare/3.2.0...3.2.1
[3.2.0]: https://github.com/konradrenner/kolabnotes-android/compare/3.1.3...3.2.0
[3.1.3]: https://github.com/konradrenner/kolabnotes-android/compare/3.1.2...3.1.3
diff --git a/app/app.iml b/app/app.iml
index 2ab9e3c..89173e7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -4,6 +4,8 @@
+
+
@@ -17,31 +19,30 @@
-
+
+
-
-
+
+
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -84,71 +85,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 1fe3ea2..e876ce5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,18 +1,18 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 26
- buildToolsVersion '27.0.3'
+ compileSdkVersion 29
+ buildToolsVersion '29.0.0'
defaultConfig {
applicationId "org.kore.kolabnotes.android"
minSdkVersion 16
- targetSdkVersion 26
- versionCode 100
- versionName "3.2.1"
+ targetSdkVersion 29
+ versionCode 101
+ versionName "4.0.0"
//Running test
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
packagingOptions {
@@ -31,17 +31,17 @@ android {
dependencies {
//compile fileTree(dir: 'libs', include: ['*.jar'])
//Android support libraries
- compile 'com.android.support:support-v4:26.1.0'
- compile 'com.android.support:appcompat-v7:26.1.0'
- compile 'com.android.support:recyclerview-v7:26.1.0'
- compile 'com.android.support:cardview-v7:26.1.0'
- compile 'com.android.support:design:26.1.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.recyclerview:recyclerview:1.0.0'
+ implementation 'androidx.cardview:cardview:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
// Add dependency for UI test
- androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
- androidTestCompile 'com.android.support.test:runner:1.0.1'
- androidTestCompile 'com.android.support:support-annotations:26.1.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.annotation:annotation:1.0.0'
- compile 'com.github.konradrenner:kolabnotes-java:3.4.1'
- compile 'jp.wasabeef:richeditor-android:1.2.2'
+ implementation 'com.github.konradrenner:kolabnotes-java:3.4.1'
+ implementation 'jp.wasabeef:richeditor-android:1.2.2'
}
diff --git a/app/src/androidTest/java/org/kore/kolabnotes/android/TestSearchViewUI.java b/app/src/androidTest/java/org/kore/kolabnotes/android/TestSearchViewUI.java
deleted file mode 100644
index 7f06f27..0000000
--- a/app/src/androidTest/java/org/kore/kolabnotes/android/TestSearchViewUI.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.kore.kolabnotes.android;
-
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.view.MenuItem;
-
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static android.support.test.espresso.Espresso.onData;
-
-import static android.support.test.espresso.Espresso.openContextualActionModeOverflowMenu;
-import static android.support.test.espresso.action.ViewActions.click;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.Matchers.allOf;
-
-/**
- * Test Main Activity
- */
-@RunWith(AndroidJUnit4.class)
-public class TestSearchViewUI {
-
- @Rule
- public ActivityTestRule mActivityRule = new ActivityTestRule<>(
- MainActivity.class);
-
- /**
- * Method to use the custom matcher
- * @param title title of the menu item
- * @return return the matcher for the item
- */
- static MenuItemTitleMatcher withTitle(String title) {
- return new MenuItemTitleMatcher(title);
- }
-
- /**
- * Perform the search view clicked UI test
- */
- @Test
- public void testSearchMenuItemClick() {
- openContextualActionModeOverflowMenu();
- final String searchViewTitle = mActivityRule.getActivity().getString(
- R.string.title_dialog_search);
- onData(allOf(instanceOf(MenuItem.class), withTitle(searchViewTitle))).perform(click());
- }
-}
-
-
-/**
- * On View not working with the view inside adapter view need to create this Matcher in order to use
- * with on Data
- *
- * @see
- * StackOverFlow answer
- *
- */
-class MenuItemTitleMatcher extends BaseMatcher