Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d1de666 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge branch 'master' into weblogin

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/activity/SettingsActivity.java
#	app/src/main/res/values/strings.xml
parents 71bdf782 3d86ba1b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@
/.idea/
*.iml
/projectFilesBackup/
/app/release/
 No newline at end of file
+2 −1
Original line number Diff line number Diff line
@@ -6,10 +6,11 @@ android:
  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
+15 −12
Original line number Diff line number Diff line
@@ -8,34 +8,37 @@ An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/)

## :arrow_forward: Access

[![Download from Google Play](http://www.android.com/images/brand/android_app_on_play_large.png)](https://play.google.com/store/apps/details?id=it.niedermann.owncloud.notes)
[![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.owncloud.notes)
[![Nextcloud Notes App on fdroid.org](https://camo.githubusercontent.com/7df0eafa4433fa4919a56f87c3d99cf81b68d01c/68747470733a2f2f662d64726f69642e6f72672f77696b692f696d616765732f632f63342f462d44726f69642d627574746f6e5f617661696c61626c652d6f6e2e706e67)](https://f-droid.org/repository/browse/?fdid=it.niedermann.owncloud.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)
[![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))
* English, German, Russian, Armenian, French and Serbian UI
* 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
* Tablet layout ([#8](https://github.com/stefan-niedermann/nextcloud-notes/issues/8))
* Simple widget for individual note ([#5](https://github.com/stefan-niedermann/nextcloud-notes/issues/5))
* Make a widget for all notes ([#15](https://github.com/stefan-niedermann/nextcloud-notes/issues/15))
* 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))
* Trashbin ([#238](https://github.com/stefan-niedermann/nextcloud-notes/issues/238))

## :wrench: Contribution
## :family: Join the team
* Test the app with different devices
* Write issues in the [issue tracker](https://github.com/stefan-niedermann/nextcloud-notes/issues)
* Provide pull requests
* Translate this app on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android-notes/)
* Report issues in the [issue tracker](https://github.com/stefan-niedermann/nextcloud-notes/issues)
* [Pick a good first issue](https://github.com/nextcloud/server/labels/good%20first%20issue) :notebook:
* Create a [Pull Request](https://opensource.guide/how-to-contribute/#opening-a-pull-request)
* Help translating this app on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android-notes/) :flags:
* Buy this app on [Google Play Store](https://play.google.com/store/apps/details?id=it.niedermann.owncloud.notes)
* Send me a bottle of your favorite beer :beers: :wink:

+19 −15
Original line number Diff line number Diff line
apply plugin: 'com.android.application'

android {
    compileSdkVersion 27
    buildToolsVersion '27.0.3'
    compileSdkVersion 28
    buildToolsVersion '28.0.3'

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }

    defaultConfig {
        applicationId "it.niedermann.owncloud.notes"
        minSdkVersion 14
        targetSdkVersion 27
        versionCode 30
        versionName "0.18.0"
        targetSdkVersion 28
        versionCode 40
        versionName "0.24.0"
    }
    buildTypes {
        release {
@@ -26,18 +31,17 @@ android {
dependencies {
    implementation project(':cert4android')

    implementation 'com.yydcdut:rxmarkdown:0.1.1-beta'

    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'
    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
    implementation 'com.jakewharton:butterknife:10.0.0'
    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'

    def supportLibVersion = '27.1.1'
    implementation "androidx.appcompat:appcompat:1.0.2"
    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'])
}
+3 MiB

File added.

No diff preview for this file type.

Loading