Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ apply plugin: 'org.jetbrains.kotlin.android'

android {
compileSdk 35
namespace 'it.niedermann.owncloud.notes'
namespace = 'it.niedermann.owncloud.notes'

defaultConfig {
applicationId "it.niedermann.owncloud.notes"
Expand All @@ -29,7 +29,7 @@ android {
}

compileOptions {
coreLibraryDesugaringEnabled true
coreLibraryDesugaringEnabled = true
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
Expand All @@ -39,13 +39,13 @@ android {
}

buildFeatures {
viewBinding true
buildConfig true
viewBinding = true
buildConfig = true
}

buildTypes {
debug {
testCoverageEnabled true
testCoverageEnabled = true
}

release {
Expand Down Expand Up @@ -73,17 +73,17 @@ android {

testOptions {
unitTests {
includeAndroidResources true
includeAndroidResources = true
}
}

lintOptions {
abortOnError false
abortOnError = false
disable 'MissingTranslation'
}

androidResources {
generateLocaleConfig true
generateLocaleConfig = true
}

packagingOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.nextcloud.android.sso.helper.SingleAccountHelper;
import com.owncloud.android.lib.common.utils.Log_OC;

import it.niedermann.owncloud.notes.R;
Expand All @@ -42,7 +43,6 @@
import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
import it.niedermann.owncloud.notes.shared.util.DisplayUtils;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;

public class NoteEditFragment extends SearchableBaseNoteFragment {

Expand Down Expand Up @@ -306,7 +306,17 @@ public void applyBrand(int color) {
super.applyBrand(color);

final var util = BrandingUtil.of(color, requireContext());
binding.editContent.setSearchColor(color);

lifecycleScopeIOJob(() -> {
try {
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
binding.editContent.setCurrentSingleSignOnAccount(ssoAccount, color);
} catch (Exception e) {
Log_OC.e(TAG, "applyBrand exception: " + e);
}
return Unit.INSTANCE;
});

binding.editContent.setHighlightColor(util.notes.getTextHighlightBackgroundColor(requireContext(), color, colorPrimary, colorAccent));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,15 @@

import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
import com.nextcloud.android.sso.helper.SingleAccountHelper;
import com.owncloud.android.lib.common.utils.Log_OC;

import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.branding.BrandingUtil;
import it.niedermann.owncloud.notes.databinding.FragmentNotePreviewBinding;
import it.niedermann.owncloud.notes.persistence.entity.Note;
import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
import it.niedermann.owncloud.notes.shared.util.SSOUtil;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;

public class NotePreviewFragment extends SearchableBaseNoteFragment implements OnRefreshListener {

Expand Down Expand Up @@ -233,7 +229,17 @@ public void applyBrand(int color) {
super.applyBrand(color);

final var util = BrandingUtil.of(color, requireContext());
binding.singleNoteContent.setSearchColor(color);

lifecycleScopeIOJob(() -> {
try {
final var ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getContext());
binding.singleNoteContent.setCurrentSingleSignOnAccount(ssoAccount, color);
} catch (Exception e) {
Log_OC.e(TAG, "applyBrand exception: " + e);
}
return Unit.INSTANCE;
});

binding.singleNoteContent.setHighlightColor(util.notes.getTextHighlightBackgroundColor(requireContext(), color, colorPrimary, colorAccent));
}

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.11.1'
classpath 'com.android.tools.build:gradle:8.12.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -34,7 +34,7 @@ allprojects {
repositories {
mavenCentral()
google()
maven { url "https://jitpack.io" }
maven { url = "https://jitpack.io" }
}

}
Expand Down
Loading
Loading