From c5622374795344bae4a05ca137df90572d603972 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 30 Jul 2025 10:43:04 +0200 Subject: [PATCH 1/2] update common lib Signed-off-by: alperozturk [skip ci] --- .../notes/branding/BrandedActivity.java | 2 +- .../notes/branding/BrandedFragment.kt | 4 +- .../notes/exception/ExceptionActivity.java | 2 +- .../importaccount/ImportAccountActivity.java | 2 +- gradle/verification-metadata.xml | 228 +++++++++++++++++- 5 files changed, 232 insertions(+), 6 deletions(-) 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 1b49c3745..7eb17efbc 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 @@ -27,7 +27,7 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand @Override protected void onCreate(@Nullable Bundle savedInstanceState) { - AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this); + AppCompatActivityExtensionsKt.applyEdgeToEdgeWithSystemBarPadding(this); super.onCreate(savedInstanceState); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt index 09333c44c..606681588 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt @@ -15,7 +15,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.view.forEach import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope -import com.nextcloud.android.common.ui.util.extensions.adjustUIForAPILevel35 +import com.nextcloud.android.common.ui.util.extensions.applyEdgeToEdgeWithSystemBarPadding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -43,7 +43,7 @@ abstract class BrandedFragment : Fragment(), Branded { override fun onCreate(savedInstanceState: Bundle?) { if (activity is AppCompatActivity) { val appCompatActivity = activity as AppCompatActivity - appCompatActivity.adjustUIForAPILevel35() + appCompatActivity.applyEdgeToEdgeWithSystemBarPadding() } super.onCreate(savedInstanceState) } 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 281cf368f..39db1badb 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 @@ -32,7 +32,7 @@ public class ExceptionActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { - AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this); + AppCompatActivityExtensionsKt.applyEdgeToEdgeWithSystemBarPadding(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 b28d6bf3c..1d3a8a86b 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 @@ -54,7 +54,7 @@ public class ImportAccountActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { - AppCompatActivityExtensionsKt.adjustUIForAPILevel35(this); + AppCompatActivityExtensionsKt.applyEdgeToEdgeWithSystemBarPadding(this); super.onCreate(savedInstanceState); Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this)); diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c3f1deec2..d032bab7e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -6,7 +6,7 @@ - + @@ -1684,6 +1684,14 @@ + + + + + + + + @@ -1700,6 +1708,14 @@ + + + + + + + + @@ -1716,6 +1732,14 @@ + + + + + + + + @@ -1804,6 +1828,14 @@ + + + + + + + + @@ -1820,6 +1852,14 @@ + + + + + + + + @@ -1833,6 +1873,14 @@ + + + + + + + + @@ -1849,6 +1897,14 @@ + + + + + + + + @@ -1875,6 +1931,14 @@ + + + + + + + + @@ -1891,6 +1955,14 @@ + + + + + + + + @@ -1901,6 +1973,11 @@ + + + + + @@ -1917,6 +1994,14 @@ + + + + + + + + @@ -1933,6 +2018,14 @@ + + + + + + + + @@ -1949,6 +2042,14 @@ + + + + + + + + @@ -1965,6 +2066,14 @@ + + + + + + + + @@ -2002,6 +2111,17 @@ + + + + + + + + + + + @@ -2018,6 +2138,14 @@ + + + + + + + + @@ -2034,6 +2162,14 @@ + + + + + + + + @@ -2055,6 +2191,14 @@ + + + + + + + + @@ -2063,6 +2207,14 @@ + + + + + + + + @@ -2318,6 +2470,14 @@ + + + + + + + + @@ -2326,6 +2486,14 @@ + + + + + + + + @@ -2342,6 +2510,14 @@ + + + + + + + + @@ -8378,6 +8554,14 @@ + + + + + + + + @@ -8443,6 +8627,11 @@ + + + + + @@ -11621,6 +11810,14 @@ + + + + + + + + @@ -11637,6 +11834,14 @@ + + + + + + + + @@ -11652,6 +11857,11 @@ + + + + + @@ -11679,6 +11889,14 @@ + + + + + + + + @@ -11711,6 +11929,14 @@ + + + + + + + + From 3858ae1b631a9b8d9bd17a21e3ca3c3519400462 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 30 Jul 2025 12:48:24 +0200 Subject: [PATCH 2/2] fix build Signed-off-by: alperozturk --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 34 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a6da095b1..4529cb422 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,7 +113,7 @@ dependencies { } // Nextcloud SSO - implementation 'com.github.nextcloud.android-common:ui:48ed8e86d9' + implementation 'com.github.nextcloud.android-common:ui:0.27.1' implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2' implementation "com.github.stefan-niedermann.android-commons:shared-preferences:$androidCommonsVersion" implementation "com.github.stefan-niedermann.android-commons:reactive-livedata:$androidCommonsVersion" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index d032bab7e..88dce88df 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -24,6 +24,7 @@ + @@ -135,6 +136,7 @@ + @@ -160,6 +162,7 @@ + @@ -693,6 +696,11 @@ + + + + + @@ -7463,7 +7471,7 @@ - + @@ -7568,6 +7576,14 @@ + + + + + + + + @@ -7672,6 +7688,14 @@ + + + + + + + + @@ -7780,6 +7804,14 @@ + + + + + + + +