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

Commit 4214737e 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 b4bb4714 39e15cef

README.md

+9 −3
Original line number Diff line number Diff line
@@ -8,9 +8,15 @@ An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/) 


## :arrow_forward: Access



[![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)

[<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)

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



## :eyes: Screenshots

app/build.gradle

+6 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application' 


android {

    compileSdkVersion 28

    buildToolsVersion '28.0.3'

    buildToolsVersion '29.0.1'



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8
@@ -13,8 +13,8 @@ android { 
        applicationId "it.niedermann.owncloud.notes"

        minSdkVersion 14

        targetSdkVersion 28

        versionCode 40

        versionName "0.24.0"

        versionCode 47

        versionName "0.27.1"

    }

    buildTypes {

        release {
@@ -36,10 +36,10 @@ dependencies { 
    implementation 'com.yydcdut:markdown-processor:0.1.3'

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



    implementation 'com.jakewharton:butterknife:10.0.0'

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

    implementation 'com.jakewharton:butterknife:10.2.0'

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



    implementation "androidx.appcompat:appcompat:1.0.2"

    implementation "androidx.appcompat:appcompat:1.1.0"

    implementation "androidx.recyclerview:recyclerview:1.0.0"

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

app/release/app-release.apk

deleted100644 → 0
−3 MiB

File deleted.

View file

app/release/output.json

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"0.22.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
 
 No newline at end of file

app/src/main/AndroidManifest.xml

+5 −1
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
        android:allowBackup="true"

        android:fullBackupContent="true"

        android:icon="@mipmap/ic_launcher"

        android:roundIcon="@mipmap/ic_launcher_round"

        android:label="@string/app_name"

        android:networkSecurityConfig="@xml/network_security_config"

        android:roundIcon="@mipmap/ic_launcher_round"

        android:supportsRtl="true"

        android:theme="@style/AppTheme">
@@ -98,6 +98,10 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name=".android.activity.ExceptionActivity"

            android:process=":error_activity" />



        <receiver

            android:name=".android.appwidget.CreateNoteWidget"

            android:label="@string/widget_create_note">