Merge pull request #11 from ICTrust/dev

Dev
ICTrust · Jun 27, 2023 · f990354 · f990354
2 parents c2e3dcc + 73dddb7
commit f990354
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "ch.ictrust.pobya"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 8
-        versionName "1.5"
+        versionCode 9
+        versionName "1.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         kapt {
@@ -53,6 +53,8 @@ android {
 
 dependencies {
 
+    def room_version = "2.5.1"
+
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
@@ -69,44 +71,26 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-
     implementation 'androidx.multidex:multidex:2.0.1'
 
-    // circleImageView
-    implementation 'de.hdodenhof:circleimageview:2.2.0'
-
     //ActionSheet
     implementation 'com.baoyz.actionsheet:library:1.1.7'
 
-    //Picasso
-    implementation 'com.squareup.picasso:picasso:2.5.2'
-
-    implementation 'com.github.sharish:ShimmerRecyclerView:v1.3'
-
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 
-    //Fancy Toast
-    implementation 'com.github.GrenderG:Toasty:1.4.2'
-
     implementation 'com.github.psinetron:slycalendarview:0.0.9@aar'
     implementation 'com.savvi.datepicker:rangepicker:1.3.0'
     implementation 'com.github.traex.calendarlistview:library:1.2.3'
 
     //lottie
     implementation 'com.airbnb.android:lottie:3.4.0'
 
-
     // ProgressView
     implementation 'com.github.owl-93:DeterminateProgressView:v1.0'
 
-    // floating Action button
-    implementation 'com.github.clans:fab:1.6.4'
-
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
 
-    def room_version = "2.5.1"
-
     implementation("androidx.room:room-runtime:$room_version")
     kapt "androidx.room:room-compiler:$room_version"
     implementation("androidx.room:room-ktx:$room_version")
@@ -115,7 +99,6 @@ dependencies {
 
     // okhttp
     implementation("com.squareup.okhttp3:okhttp:4.10.0")
-
     implementation 'com.google.code.gson:gson:2.8.9'
 
 }

diff --git a/app/src/main/java/ch/ictrust/pobya/service/MalwareScanService.kt b/app/src/main/java/ch/ictrust/pobya/service/MalwareScanService.kt
@@ -86,8 +86,6 @@ class MalwareScanService : Service() {
                     ApplicationPermissionHelper(baseContext, true).getAppCert(app.packageName)
                         .toHex()
                 if (malwarePackageListString.contains(app.packageName)) {
-                    println(app.packageName)
-                    println(hexSignature)
                     if (MalwareCertRepository.getInstance(applicationContext as Application)
                             .getAllMalwareCerts().contains(hexSignature)
                     ) {

diff --git a/app/src/main/res/drawable/pobya_shield.png b/app/src/main/res/drawable/pobya_shield.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -10,9 +10,10 @@
     <color name="subTextColor">#313132</color>
 
     <color name="doneColor">#26a94e</color>
-
     <color name="firstColor">#23bfd4</color>
     <color name="secondColor">#2594df</color>
     <color name="thirdColor">#2435df</color>
 
+    <color name="warningColor">#D0FF9800</color>
+
 </resources>