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

Commit 941e5439 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge branch 'master' into 831-room 

# Conflicts:
#	app/build.gradle
parents e9fc505a 8997e975

app/build.gradle

+4 −4
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ android { 
        applicationId "it.niedermann.owncloud.notes"

        minSdkVersion 21

        targetSdkVersion 29

        versionCode 3002005

        versionName "3.2.5"

        versionCode 3003000

        versionName "3.3.0"

        multiDexEnabled true

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        javaCompileOptions {
@@ -35,7 +35,7 @@ android { 
        }



        release {

            minifyEnabled false

            minifyEnabled true

            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        }

    }
@@ -89,7 +89,7 @@ dependencies { 
    implementation "androidx.appcompat:appcompat:1.2.0"

    implementation "androidx.fragment:fragment:1.3.2"

    implementation "androidx.preference:preference:1.1.1"

    implementation "androidx.recyclerview:recyclerview:1.1.0"

    implementation "androidx.recyclerview:recyclerview:1.2.0"

    implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'

    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

    implementation 'androidx.work:work-runtime:2.5.0'

app/src/main/res/drawable/note_list_widget_preview.png

deleted100644 → 0
−244 KiB
Loading image diff...

app/src/main/res/drawable/note_list_widget_preview.webp

0 → 100644
+189 KiB
Loading image diff...

app/src/main/res/drawable/single_note_widget.png

deleted100644 → 0
−259 KiB
Loading image diff...

app/src/main/res/drawable/single_note_widget.webp

0 → 100644
+200 KiB
Loading image diff...