diff --git a/app/build.gradle b/app/build.gradle index cfa29fdc2..2233a9fb4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -96,7 +96,7 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5' // Nextcloud SSO - implementation 'com.github.nextcloud.android-common:ui:0.24.0' + implementation 'com.github.nextcloud.android-common:ui:48ed8e86d9' implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2' implementation 'com.github.stefan-niedermann:android-commons:1.0.4' implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion" diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java index 15d9a177d..1b49c3745 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java @@ -8,19 +8,29 @@ import static it.niedermann.owncloud.notes.branding.BrandingUtil.readBrandMainColorLiveData; +import android.os.Bundle; import android.util.TypedValue; import android.view.Menu; import androidx.annotation.ColorInt; +import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import com.google.android.material.R; +import com.nextcloud.android.common.ui.util.extensions.AppCompatActivityExtensionsKt; + public abstract class BrandedActivity extends AppCompatActivity implements Branded { @ColorInt protected int colorAccent; + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this); + super.onCreate(savedInstanceState); + } + @Override protected void onStart() { super.onStart(); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java index 4401d0b3a..281cf368f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java @@ -14,6 +14,8 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import com.nextcloud.android.common.ui.util.extensions.AppCompatActivityExtensionsKt; + import java.util.Collections; import it.niedermann.android.util.ClipboardUtil; @@ -30,6 +32,7 @@ public class ExceptionActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this); super.onCreate(savedInstanceState); final var binding = ActivityExceptionBinding.inflate(getLayoutInflater()); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java index cb0757437..3dc9eb185 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java @@ -17,6 +17,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.preference.PreferenceManager; +import com.nextcloud.android.common.ui.util.extensions.AppCompatActivityExtensionsKt; import com.nextcloud.android.sso.AccountImporter; import com.nextcloud.android.sso.exceptions.AccountImportCancelledException; import com.nextcloud.android.sso.exceptions.AndroidGetAccountsPermissionNotGranted; @@ -53,6 +54,7 @@ public class ImportAccountActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this); super.onCreate(savedInstanceState); Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this)); diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml index 62730a183..44929adfd 100644 --- a/app/src/main/res/layout/drawer_layout.xml +++ b/app/src/main/res/layout/drawer_layout.xml @@ -23,8 +23,7 @@ android:id="@+id/navigation_view" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="start" - android:fitsSystemWindows="true"> + android:layout_gravity="start"> diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5c6cef27e..d2120b780 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4,7 +4,7 @@ true true - + @@ -21,6 +21,7 @@ + @@ -65,6 +66,7 @@ + @@ -125,6 +127,7 @@ + @@ -138,12 +141,12 @@ - + - + @@ -499,6 +502,11 @@ + + + + + @@ -509,6 +517,11 @@ + + + + + @@ -540,6 +553,11 @@ + + + + + @@ -588,11 +606,21 @@ + + + + + + + + + + @@ -601,11 +629,24 @@ + + + + + + + + + + + + + @@ -614,11 +655,24 @@ + + + + + + + + + + + + + @@ -627,11 +681,24 @@ + + + + + + + + + + + + + @@ -640,11 +707,24 @@ + + + + + + + + + + + + + @@ -653,11 +733,24 @@ + + + + + + + + + + + + + @@ -666,6 +759,14 @@ + + + + + + + + @@ -684,6 +785,11 @@ + + + + + @@ -692,11 +798,24 @@ + + + + + + + + + + + + + @@ -705,11 +824,24 @@ + + + + + + + + + + + + + @@ -718,11 +850,24 @@ + + + + + + + + + + + + + @@ -731,11 +876,24 @@ + + + + + + + + + + + + + @@ -744,11 +902,24 @@ + + + + + + + + + + + + + @@ -757,11 +928,24 @@ + + + + + + + + + + + + + @@ -770,11 +954,24 @@ + + + + + + + + + + + + + @@ -783,6 +980,14 @@ + + + + + + + + @@ -861,6 +1066,9 @@ + + + @@ -875,6 +1083,14 @@ + + + + + + + + @@ -1221,7 +1437,7 @@ - + @@ -1239,10 +1455,10 @@ - + - + @@ -1567,6 +1783,9 @@ + + + @@ -1793,6 +2012,22 @@ + + + + + + + + + + + + + + + + @@ -1889,6 +2124,14 @@ + + + + + + + + @@ -2425,14 +2668,6 @@ - - - - - - - - @@ -2921,6 +3156,14 @@ + + + + + + + + @@ -3841,14 +4084,6 @@ - - - - - - - - @@ -3905,14 +4140,6 @@ - - - - - - - - @@ -3969,14 +4196,6 @@ - - - - - - - - @@ -4097,14 +4316,6 @@ - - - - - - - - @@ -4161,14 +4372,6 @@ - - - - - - - - @@ -4225,14 +4428,6 @@ - - - - - - - - @@ -4289,14 +4484,6 @@ - - - - - - - - @@ -5679,12 +5866,12 @@ - - - + + + - - + + @@ -5783,12 +5970,12 @@ - - - + + + - - + + @@ -5881,18 +6068,18 @@ - + - - - + + + - - + + @@ -6391,6 +6578,14 @@ + + + + + + + + @@ -6576,11 +6771,6 @@ - - - - - @@ -8471,6 +8661,14 @@ + + + + + + + + @@ -8701,10 +8899,15 @@ - - - + + + + + + + +