Merge pull request #30 from BIDMCDigitalPsychiatry/bug_fixes

Bug fixes
BIDMCDigitalPsychiatry · Oct 18, 2023 · a7afaac · a7afaac
2 parents 4f6c657 + f893450
commit a7afaac
Show file tree

Hide file tree

Showing 11 changed files with 241 additions and 172 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "digital.lamp.lamp_kotlin_test"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -24,26 +24,26 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 }
 
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    implementation "com.squareup.retrofit2:converter-gson:2.8.1"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
 
 
     implementation project(path: ':lamp_kotlin')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.LampKotlinTest">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/digital/lamp/lamp_kotlin_test/MainActivity.kt b/app/src/main/java/digital/lamp/lamp_kotlin_test/MainActivity.kt
@@ -19,11 +19,11 @@ class MainActivity : AppCompatActivity() {
 
         TelephonySensor.setSensorObserver(object :TelephonySensor.TelephonyListener{
 
-            override fun onIncomingCallEnded(callDuration: Int?) {
+            override fun onIncomingCallEnded(callDuration: Long?) {
                 TODO("Not yet implemented")
             }
 
-            override fun onOutgoingCallEnded(callDuration: Int?) {
+            override fun onOutgoingCallEnded(callDuration: Long?) {
                 TODO("Not yet implemented")
             }
 
@@ -37,7 +37,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun invokeSensorSpecData(){
 
-            val basic = "Basic ${Utils.toBase64(
+         /*   val basic = "Basic ${Utils.toBase64(
                     "[email protected]:U3039047323")}"
 
             Thread {
@@ -46,7 +46,7 @@ class MainActivity : AppCompatActivity() {
                 val activityResponse = Gson().fromJson(activityString.toString(), ActivityResponse::class.java)
 
                 Log.e("KOK", " Lamp Core Response -  ${activityResponse.data[0].schedule?.get(0)?.notification_ids?.size.toString()}")
-            }.start()
+            }.start()*/
 
 
 

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.21"
+    ext.kotlin_version = "1.7.21"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.1"
+        classpath "com.android.tools.build:gradle:4.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Jan 12 10:36:59 IST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip