Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix System Bars Appearance for SDK 35 #2580

Merged
merged 5 commits into from
Feb 26, 2025
Merged

Fix System Bars Appearance for SDK 35 #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2361fdb
adjustUIForAPILevel35
alperozturk96 Feb 11, 2025
9f613f8
use common.ui
alperozturk96 Feb 20, 2025
693a8af
solve git conflict
alperozturk96 Feb 20, 2025
677f6c7
solve git conflict
alperozturk96 Feb 21, 2025
ef1e6d2
ci(checksums): Add meta data
AndyScherzinger Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/drawer_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

<androidx.core.widget.NestedScrollView
android:id="@+id/scrollView"
Expand Down
25 changes: 25 additions & 0 deletions gradle/verification-keyring.keys
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,31 @@ JI97g3GZQ2CHkQwJ3+WcPw==
=OasT
-----END PGP PUBLIC KEY BLOCK-----

pub BAC30622339994C4
sub FC9BDC25FB378008
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQENBFlMExYBCACmdTDSXPwSJeYbfYvHoDl5C7vx/0+LOTunDGJN38pNQHYQAZnv
Gyoc9ZmChrhLoim7z4ILqmNo8eegknepQ3dGdUij4NVIhR+m+8irayTbsNHvo3UG
9y7eM5tTSjyNYkyk5fAVuT7OhzIzMA+qtc3GRVxNYRKnaHajt+pOSqr+uoDtMG3n
6eAMHCAnhgh5Nd+dCFcNT+syl3zCwolA1wrzGxxOaif+xi5wwXjmF/lAt4PDIuDT
etA2/AqPM4zAC0BtC0iqVgVypjFV3EAexm/g0LNMiG/M/krzwjPq5gf1DY/57jU0
02FpKd79HmR7bHdc4e2olEf9NlHxfbPXDDsHABEBAAG5AQ0EWUwTFgEIANmMpV3N
K8aLrLgQTyh5++det8C3D3T5tkEdljHOuN31/qdKNge8H6uKH8zXRZsj5pd8adpW
kD4TzIMvzIwzizsGw34O9hf1E2XPoDqvQr39p1sovX3PeDvRJY/7JFNt9DsphVc3
xWQfNkC7JdMPa6JRiFHd3ynfbQ+wplf4tfaDVn1JXAWp0NSGgMtXfn5i19hHQWjm
RNAKNQLdVn8UczI8XdVM7bS4giDpQMukSyjsjgAo466iRK2+8f8BwIRe1JRvF37B
dnbvTg/dzoi1/E4ukwVJD6YE2LlDwzdGno9KxPlRsuY3nnheVgjbrGJ2XKRJkIk8
7cMGh41VKw6L4usAEQEAAYkBHwQYAQIACQUCWUwTFgIbDAAKCRC6wwYiM5mUxEiH
CACQViGOHi0BoZ78ZJz6L48YNMx8fSdSv3YJ83Ih1n5DWCJgrDV5S3/edYinkoVI
0Lusy3MdftRg6OWaYOuOTf6MYcddO/mY363jiMByf9Uh3Dqq4sKqVLRnZbAqgD1o
dRoj2NkEQfgEH/H4JRVrxquzAKoWwJh3MhY+kajYJRJyWfc1/Bm3Bj1tcMGlGeIQ
fgWheeMg3kxrxJ9TXPqVi6VVPaPKIU5i8l46S+Wg3uvMs8vC3XzOIvhY6cwguJv9
UkjZwGDSI952wLqnREMy0gFZ+OAB0qJpYM3nDEekWZP38G80kojnN61tZjRThu9I
i8/b+PwSW+nW3EpQZdLqZtOU
=2H2i
-----END PGP PUBLIC KEY BLOCK-----

pub BCF4173966770193
uid IntelliJ IDEA Sign Key <[email protected]>

Expand Down
Loading
Loading