From 314112e4f688d28d4ba49474eef3146a1b3ef05d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <87148630+Jean-BaptisteC@users.noreply.github.com>
Date: Sun, 5 May 2024 19:04:25 +0200
Subject: [PATCH 1/2] Add new string (#56)
---
app/src/main/res/layout/custom_barcode_scanner.xml | 4 +++-
app/src/main/res/values-fr/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/src/main/res/layout/custom_barcode_scanner.xml b/app/src/main/res/layout/custom_barcode_scanner.xml
index eebe3fc..029be4c 100644
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -29,7 +29,9 @@
android:layout_marginTop="@dimen/app_bar_height"
android:background="@color/zxing_transparent"
android:fontFamily="sans-serif-black"
- android:text="@string/zxing_msg_default_status"
+ android:layout_marginStart="15dp"
+ android:layout_marginEnd="15dp"
+ android:text="@string/scan_label"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="32sp"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 57a1651..5d66ec2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -22,6 +22,7 @@
Saisir la fin du code CIP 13 ici..
Saisir le code CIP 13
Fermer
+ Visez le code-barres pour le scanner
Bienvenue dans Pilldroid
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 141e876..d1a52b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
Pilldroid_NotificationChannel
PilldroidChannel
Close
+ Aim at the barcode to scan it
Welcome on Pilldroid
From 2ff8ff9e533e2019e201f2f30292083e1c0cdbae Mon Sep 17 00:00:00 2001
From: jacques
Date: Wed, 17 Apr 2024 20:01:13 +0200
Subject: [PATCH 2/2] Change some options in order to make compilation/run in
avd work
---
app/build.gradle | 17 +++++------
.../foucry/pilldroid/DrugListActivity.java | 2 +-
build.gradle | 2 +-
gradle.properties | 28 ++++++++-----------
gradle/wrapper/gradle-wrapper.properties | 2 +-
5 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index b069fa1..c2ae63e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,23 +98,24 @@ sourceSets {
}
}
}
+
dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
- implementation "androidx.room:room-common:2.5.2"
- annotationProcessor "androidx.room:room-compiler:2.5.2"
- implementation "androidx.room:room-testing:2.5.2"
- implementation "androidx.room:room-rxjava3:2.5.2"
- implementation "androidx.room:room-runtime:2.5.2"
+ implementation "androidx.room:room-common:2.6.1"
+ annotationProcessor "androidx.room:room-compiler:2.6.1"
+ implementation "androidx.room:room-testing:2.6.1"
+ implementation "androidx.room:room-rxjava3:2.6.1"
+ implementation "androidx.room:room-runtime:2.6.1"
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.6.1'
- implementation 'androidx.recyclerview:recyclerview:1.3.1'
- implementation 'com.google.android.material:material:1.9.0'
+ implementation 'androidx.recyclerview:recyclerview:1.3.2'
+ implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.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'
}
diff --git a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
index 09bcd71..57cfe8b 100644
--- a/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/DrugListActivity.java
@@ -373,7 +373,7 @@ public class DrugListActivity extends AppCompatActivity {
//alert.getButton(alert.BUTTON_POSITIVE).setEnabled(s.length() == 8);
if (s.length() == 8) {
ok.setEnabled(true);
- ok.setBackground(ContextCompat.getDrawable(editText.getContext(), R.drawable.rounded_btn));
+ ok.setBackground(ContextCompat.getDrawable(editText.getContext(), R.drawable.shadow_bg));
}
}
});
diff --git a/build.gradle b/build.gradle
index 4c96c2e..e12786b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,4 +36,4 @@ tasks.register('clean', Delete) {
delete rootProject.buildDir
}
-dependencies {}
+dependencies {}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 65cd2ad..2146027 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,25 +1,19 @@
-# Project-wide Gradle settings.
-
-# 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
+## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
# Specifies the JVM arguments used for the daemon process.
# 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
-
+#
# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
# org.gradle.parallel=true
+#Wed Apr 17 19:53:26 CEST 2024
android.enableJetifier=false
-android.useAndroidX=true
-org.gradle.unsafe.configuration-cache=true
-org.gradle.warning.mode=none
-org.gradle.unsafe.configuration-cache-problems=warn
+android.nonFinalResIds=true
android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx2048M
+org.gradle.warning.mode=none
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 26d39ec..fd3cb44 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Sep 22 18:17:05 CEST 2023
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists