Merge branch 'upstream_master' into sprint

/.idea/

*.iml

/projectFilesBackup/

/app/release/

 No newline at end of file

  components:

    - tools

    - build-tools-27.0.3

    - android-27

    - android-28

    - extra-android-m2repository

before_install:

    - yes | sdkmanager "platforms;android-27"

    - yes | sdkmanager "platforms;android-28"

script: ./gradlew testDebug

## :arrow_forward: Access

<<<<<<< HEAD

[![Download from Google Play](https://play.google.com/intl/en_us/badges/images/badge_new.png)](https://play.google.com/store/apps/details?id=it.niedermann.notes)

[![Nextcloud Notes App on fdroid.org](https://camo.githubusercontent.com/7df0eafa4433fa4919a56f87c3d99cf81b68d01c/68747470733a2f2f662d64726f69642e6f72672f77696b692f696d616765732f632f63342f462d44726f69642d627574746f6e5f617661696c61626c652d6f6e2e706e67)](https://f-droid.org/repository/browse/?fdid=it.niedermann.notes)

[![Donate with PayPal](https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/master/paypal-donate-button.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=K7HVLE6J7SXXA)

=======

[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"

      alt="Get it on Play Store"

      height="80">](https://play.google.com/store/apps/details?id=it.niedermann.owncloud.notes)

[<img src="https://f-droid.org/badge/get-it-on.png"

      alt="Get it on F-Droid"

      height="80">](https://f-droid.org/repository/browse/?fdid=it.niedermann.owncloud.notes)

[<img src="https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/be5ad29a95ff890faee0b46d702b714b0a04aadc/paypal-donate-button.png"

      alt="Donate with PayPal"

      height="80">](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=K7HVLE6J7SXXA)

>>>>>>> steff_master

[![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/stefan-niedermann/donate)

## :eyes: Screenshots

![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)

![Screenshot of edit view](/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png)

| Navi | List View | Edit Mode |

| :--: | :--: | :--: |

| ![Screenshot of categories in sidebar](/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png) | ![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png) | ![Screenshot of edit view](/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) |

## :rocket: Features

* List, create, edit, share, search and delete notes

* Share text and links as new note into the app

* Mark notes as favorite

* Bulk delete

* In-note search ([#106](https://github.com/stefan-niedermann/nextcloud-notes/issues/106))

* Render MarkDown (using [RxMarkdown](https://github.com/yydcdut/RxMarkdown))

* Translated in many languages on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android-notes/)

* Context based formatting ([#363](https://github.com/stefan-niedermann/nextcloud-notes/issues/363))

## :checkered_flag: Planned features

* In-note search ([#106](https://github.com/stefan-niedermann/nextcloud-notes/issues/106))

* Toggle checkboxes in view mode ([#451](https://github.com/stefan-niedermann/nextcloud-notes/issues/451))

* Context based formatting ([#363](https://github.com/stefan-niedermann/nextcloud-notes/issues/363))

* Trashbin ([#238](https://github.com/stefan-niedermann/nextcloud-notes/issues/238))

## :family: Join the team

# SSO Announcment

The next version of Notes for android will depend on Nextcloud Single-Sign-On.

## What do you need to do?

It is recommended, to perform a full synchronisation with the old version of the Notes app, before you upgrade.

You have likely installed an up-to-date version of the [Files app](https://play.google.com/store/apps/details?id=com.nextcloud.client). In this case, you will have nothing more to do.

In case you do not have it installed yet, you can get it for free from Play Store or F-Droid.

When you upgrade the Notes app, you will be asked to select an account (which you previously configured at the files app).

It is important that you **select** at the first run **the same account which you already were using** in the Notes app. This will make the first run smooth and make sure, that local edited, but not synced notes won't get lost. 

## Benefits for you

- **:lock: Security benefits:** The notes app does no longer have to store a password itself.

- **:electric_plug: Reliability:** The complete network stack could be removed because all network activities are lead through the files app. This allows us to use e. g. the same stack for self signed certificates.

- **:bulb: Comfort:** You won't have to enter a server address, nor a username or a password. Just pick an existing account from the list.

android {

    compileSdkVersion 28

    buildToolsVersion '28.0.3'

    buildToolsVersion '29.0.1'

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

    defaultConfig {

        applicationId "foundation.e.notes"

        minSdkVersion 24

        targetSdkVersion 28

        versionCode 37

        versionName "0.22.3"

        versionCode 49 

        versionName "1.0.1"

    }

    buildTypes {

        release {

        disable 'MissingTranslation'

        abortOnError false

    }

    dataBinding {

        enabled = true

    }

}

dependencies {

    implementation project(':cert4android')

    implementation 'io.reactivex:rxandroid:1.2.0'

    implementation 'io.reactivex:rxjava:1.1.5'

    implementation 'io.reactivex:rxandroid:1.2.1'

    implementation 'io.reactivex:rxjava:1.3.8'

    implementation 'com.yydcdut:markdown-processor:0.1.3'

    implementation 'com.yydcdut:rxmarkdown-wrapper:0.1.3'

    implementation 'com.jakewharton:butterknife:8.8.1'

    implementation 'com.android.support.constraint:constraint-layout:1.1.3'

    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

    def supportLibVersion = '28.0.0'

    implementation 'com.github.bumptech.glide:glide:4.10.0'

    annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'

    implementation 'com.jakewharton:butterknife:10.2.0'

    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'

    implementation "androidx.appcompat:appcompat:1.1.0"

    implementation "androidx.recyclerview:recyclerview:1.0.0"

    implementation "com.google.android.material:material:1.0.0"

    implementation "com.android.support:appcompat-v7:${supportLibVersion}"

    implementation "com.android.support:design:${supportLibVersion}"

    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"

    // needed for cert4android (conflict resolution)

    implementation "com.android.support:cardview-v7:${supportLibVersion}"

    implementation fileTree(dir: 'libs', include: ['*.jar'])

}