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

Commit 5f143d59 authored by Niedermann IT-Dienstleistungen's avatar Niedermann IT-Dienstleistungen Committed by Daniel Bailey
Browse files

Update dependencies and enable Java 1.8 compatibility

parent 21a97823

Android-SingleSignOn @ b14f9265

Original line number Diff line number Diff line 
Subproject commit b14f926519affeb52c3cc82ede5f06f63256f206

app/build.gradle

+11 −7
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ android { 
    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
@@ -31,13 +36,12 @@ dependencies { 
    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:9.0.0-rc3'

    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc3'



    implementation "androidx.appcompat:appcompat:1.0.2"

    implementation "androidx.recyclerview:recyclerview:1.0.0"

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



    implementation 'androidx.appcompat:appcompat:1.0.0'

    implementation 'com.google.android.material:material:1.1.0-alpha01'

    implementation 'androidx.recyclerview:recyclerview:1.0.0'

    // needed for cert4android (conflict resolution)

    implementation 'androidx.cardview:cardview:1.0.0'

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

}

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap 
        final MenuItem item = menu.findItem(R.id.search);

        searchView = (SearchView) item.getActionView();



        final LinearLayout searchEditFrame = searchView.findViewById(androidx.appcompat.appcompat.R.id

        final LinearLayout searchEditFrame = searchView.findViewById(R.id

                .search_edit_frame);



        searchEditFrame.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {