Merge pull request #122 from AdamGuidarini/vc29

Vc29
AdamGuidarini · Oct 22, 2024 · 1fd46fb · 1fd46fb
2 parents 3919fd5 + e25cc73
commit 1fd46fb
Show file tree

Hide file tree

Showing 55 changed files with 1,811 additions and 469 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ MediTrak is an Android application designed to make it easier for users to keep
 
 ## Requirements
 
-- Android 8 Oreo or newer
+- Android 9+
 
 ## Languages
  - English
@@ -56,14 +56,8 @@ This project uses the ````sqlite3.c```` and ````sqlite3.h```` files in its NDK p
 
 ## Installation
 
-<div style="display: flex;">
- <a href="https://github.com/AdamGuidarini/MediTrak/releases">
-  <img src="https://github.com/machiav3lli/oandbackupx/blob/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" height="90" alt="Get it on GitHub"/>
- </a>
- <a href="https://apt.izzysoft.de/fdroid/index/apk/projects.medicationtracker">
-  <img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height=90 alt="Get it on IzzyOnDroid"/>
- </a>
-</div>
+[<img src="https://github.com/machiav3lli/oandbackupx/blob/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png" height="90" alt="Get it on GitHub"/>](https://github.com/AdamGuidarini/MediTrak/releases)
+[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" height=90 alt="Get it on IzzyOnDroid"/>](https://apt.izzysoft.de/fdroid/index/apk/projects.medicationtracker)
 
 ### GitHub
 
@@ -85,9 +79,11 @@ Thanks to [IzzySoft](https://github.com/IzzySoft), this app is available in the
 
 ## Screenshots
 
-<img src="https://github.com/AdamGuidarini/MediTrak/assets/45023561/63f322c3-8006-4ba9-8c2f-fa27cbb7001e" width="15%">
-<img src="https://github.com/AdamGuidarini/MediTrak/assets/45023561/5a8bdc42-ee52-426a-bc2c-6f898fdb825e" width="15%">
-<img src="https://github.com/AdamGuidarini/MediTrak/assets/45023561/e4da8dca-804b-4280-9315-9835f80d9e69" width="15%">
-<img src="https://github.com/AdamGuidarini/MediTrak/assets/45023561/09d363b6-1514-4d92-a1fd-81cdf05b9644" width="15%">
-<img src="https://github.com/AdamGuidarini/MediTrak/assets/45023561/19f32b0c-2ff5-4bff-9e2a-e65c285b247e" width="15%">
-<img src="https://github.com/AdamGuidarini/MediTrak/assets/45023561/a8b4bd89-00a1-411e-ae69-6868ef85247f" width="15%">
+<div style="display: flex;" align="center">
+ <img src="https://github.com/AdamGuidarini/MediTrak/blob/vc29/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png?raw=true" width="15%">
+ <img src="https://github.com/AdamGuidarini/MediTrak/blob/vc29/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png?raw=true" width="15%">
+ <img src="https://github.com/AdamGuidarini/MediTrak/blob/vc29/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png?raw=true" width="15%">
+ <img src="https://github.com/AdamGuidarini/MediTrak/blob/vc29/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png?raw=true" width="15%">
+ <img src="https://github.com/AdamGuidarini/MediTrak/blob/vc29/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png?raw=true" width="15%">
+ <img src="https://github.com/AdamGuidarini/MediTrak/blob/vc29/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png?raw=true" width="15%">
+</div>
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,23 +12,22 @@ android {
 
     defaultConfig {
         applicationId "projects.medicationtracker"
-        minSdkVersion 26
+        minSdkVersion 29
         targetSdkVersion 34
         compileSdk 34
 
-        versionCode 28
-        versionName "0.12.9"
+        versionCode 29
+        versionName "0.13.0"
         resourceConfigurations += ['en', 'de', 'es', 'it', 'tr']
 
-
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
-                arguments'-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE'
+                arguments'-DANDROID_TOOLCHAIN=clang', '-DANDROID_ARM_NEON=TRUE', '-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--build-id=none'
                 cppFlags '-frtti -fexceptions'
             }
         }
@@ -54,13 +53,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.preference:preference:1.2.1'
-    implementation 'androidx.activity:activity:1.9.0'
-    implementation 'androidx.work:work-runtime:2.9.0'
+    implementation 'androidx.activity:activity:1.9.3'
+    implementation 'androidx.work:work-runtime:2.9.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,12 +3,14 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".MediTrak"

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -66,6 +66,7 @@ target_link_libraries( # Specifies the target library.
         DatabaseController
         Medication
         Dose
+        Notification
         DbManager
         # Links the target library to the log library
         # included in the NDK.

diff --git a/app/src/main/cpp/MediTrakCore/CMakeLists.txt b/app/src/main/cpp/MediTrakCore/CMakeLists.txt
@@ -3,5 +3,6 @@ include_directories(DatabaseController Dose Medication)
 add_subdirectory(DatabaseController)
 add_subdirectory(Dose)
 add_subdirectory(Medication)
+add_subdirectory(Notification)
 
 target_link_libraries(DatabaseController Dose Medication)