mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 14:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 831-room

Browse source 
# Conflicts:
#	app/build.gradle
This commit is contained in:
Stefan Niedermann 2021-04-20 08:32:18 +02:00
commit e8e350e99c
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -14,9 +14,8 @@ android {
applicationId "it.niedermann.owncloud.notes" applicationId "it.niedermann.owncloud.notes"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 3003000 versionCode 3003001
versionName "3.3.0" versionName "3.3.1"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
@ -35,7 +34,7 @@ android {
} }
release { release {
minifyEnabled true minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
@ -99,7 +98,6 @@ dependencies {
implementation "androidx.room:room-runtime:2.2.6" implementation "androidx.room:room-runtime:2.2.6"
annotationProcessor "androidx.room:room-compiler:2.2.6" annotationProcessor "androidx.room:room-compiler:2.2.6"
implementation 'androidx.multidex:multidex:2.0.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
// Testing // Testing

4
app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java
View file

@ -1,19 +1,19 @@
package it.niedermann.owncloud.notes; package it.niedermann.owncloud.notes;
import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.util.Log; import android.util.Log;
import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.app.AppCompatDelegate;
import androidx.multidex.MultiDexApplication;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import it.niedermann.owncloud.notes.preferences.DarkModeSetting; import it.niedermann.owncloud.notes.preferences.DarkModeSetting;
import static androidx.preference.PreferenceManager.getDefaultSharedPreferences; import static androidx.preference.PreferenceManager.getDefaultSharedPreferences;
public class NotesApplication extends MultiDexApplication { public class NotesApplication extends Application {
private static final String TAG = NotesApplication.class.getSimpleName(); private static final String TAG = NotesApplication.class.getSimpleName();
private static final long LOCK_TIME = 30_000; private static final long LOCK_TIME = 30_000;

2
fastlane/metadata/android/en-US/changelogs/3003001.txt Normal file
View file

@ -0,0 +1,2 @@
- 🔒 Prevent screen capture (#1098)
- 🖼 Convert widget previews to WebP to reduce app size (#1120) by @connyduck

4
markdown/build.gradle
View file

@ -7,12 +7,11 @@ android {
buildToolsVersion "30.0.3" buildToolsVersion "30.0.3"
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro" consumerProguardFiles "consumer-rules.pro"
multiDexEnabled true
} }
compileOptions { compileOptions {
@ -57,7 +56,6 @@ dependencies {
implementation "com.yydcdut:markdown-processor:$rxMarkdownVersion" implementation "com.yydcdut:markdown-processor:$rxMarkdownVersion"
implementation "com.yydcdut:rxmarkdown-wrapper:$rxMarkdownVersion" implementation "com.yydcdut:rxmarkdown-wrapper:$rxMarkdownVersion"
implementation 'androidx.multidex:multidex:2.0.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'