lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-09 23:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change some options in order to make compilation/run in avd work

Browse source
This commit is contained in:
jacques 2024-04-17 20:01:13 +02:00
parent 314112e4f6
commit 2ff8ff9e53
5 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/build.gradle
View file

@ -98,23 +98,24 @@ sourceSets {
} }
} }
} }
dependencies { dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.room:room-common:2.5.2" implementation "androidx.room:room-common:2.6.1"
annotationProcessor "androidx.room:room-compiler:2.5.2" annotationProcessor "androidx.room:room-compiler:2.6.1"
implementation "androidx.room:room-testing:2.5.2" implementation "androidx.room:room-testing:2.6.1"
implementation "androidx.room:room-rxjava3:2.5.2" implementation "androidx.room:room-rxjava3:2.6.1"
implementation "androidx.room:room-runtime:2.5.2" implementation "androidx.room:room-runtime:2.6.1"
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'com.google.android.material:material:1.9.0' implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.journeyapps:zxing-android-embedded:4.3.0' implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
implementation 'androidx.core:core:1.9.0' implementation 'androidx.core:core:1.12.0'
//coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0' //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0'
} }

2
app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
View file

@ -373,7 +373,7 @@ public class DrugListActivity extends AppCompatActivity {
//alert.getButton(alert.BUTTON_POSITIVE).setEnabled(s.length() == 8); //alert.getButton(alert.BUTTON_POSITIVE).setEnabled(s.length() == 8);
if (s.length() == 8) { if (s.length() == 8) {
ok.setEnabled(true); ok.setEnabled(true);
ok.setBackground(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn)); ok.setBackground(ContextCompat.getDrawable(editText.getContext(), R.drawable.shadow_bg));
} }
} }
}); });

2
build.gradle
View file

@ -36,4 +36,4 @@ tasks.register('clean', Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
dependencies {} dependencies {}

28
gradle.properties
View file

@ -1,25 +1,19 @@
# Project-wide Gradle settings. ## For more details on how to configure your build environment visit
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. For more details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true # org.gradle.parallel=true
#Wed Apr 17 19:53:26 CEST 2024
android.enableJetifier=false android.enableJetifier=false
android.useAndroidX=true android.nonFinalResIds=true
org.gradle.unsafe.configuration-cache=true
org.gradle.warning.mode=none
org.gradle.unsafe.configuration-cache-problems=warn
android.nonTransitiveRClass=false android.nonTransitiveRClass=false
android.nonFinalResIds=false android.useAndroidX=true
org.gradle.jvmargs=-Xmx2048M
org.gradle.warning.mode=none

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Sep 22 18:17:05 CEST 2023 #Fri Sep 22 18:17:05 CEST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists