OPPIA-1369, OPPIA-1384: Migrate model package to Kotlin

AlbertoMoreta · Sep 20, 2023 · a2b45b1 · a2b45b1
1 parent 33fc556
commit a2b45b1
Show file tree

Hide file tree

Showing 87 changed files with 2,322 additions and 3,981 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'com.android.application'
 apply from: '../jacoco.gradle'
 apply from: '../sonarqube.gradle'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 
 repositories {
     maven { url "https://jitpack.io" }
@@ -303,8 +304,8 @@ dependencies {
     implementation "com.google.dagger:dagger:$daggerVersion"
     implementation "com.google.dagger:dagger-android:$daggerVersion"
     implementation "com.google.dagger:dagger-android-support:$daggerVersion"
-    annotationProcessor "com.google.dagger:dagger-android-processor:$daggerVersion"
-    annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
+    kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
+    kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     androidTestImplementation 'com.github.fabioCollini.daggermock:daggermock:0.8.5'
 
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.8.1"

diff --git a/app/src/main/java/org/digitalcampus/oppia/database/DbHelper.java b/app/src/main/java/org/digitalcampus/oppia/database/DbHelper.java
@@ -39,17 +39,21 @@
 import org.digitalcampus.oppia.gamification.Gamification;
 import org.digitalcampus.oppia.gamification.PointsComparator;
 import org.digitalcampus.oppia.model.Activity;
+import org.digitalcampus.oppia.model.BooleanValue;
 import org.digitalcampus.oppia.model.CompleteCourse;
 import org.digitalcampus.oppia.model.Course;
 import org.digitalcampus.oppia.model.CustomField;
 import org.digitalcampus.oppia.model.CustomValue;
+import org.digitalcampus.oppia.model.FloatValue;
 import org.digitalcampus.oppia.model.GamificationEvent;
+import org.digitalcampus.oppia.model.IntValue;
 import org.digitalcampus.oppia.model.Media;
 import org.digitalcampus.oppia.model.Points;
 import org.digitalcampus.oppia.model.QuizAttempt;
 import org.digitalcampus.oppia.model.QuizStats;
 import org.digitalcampus.oppia.model.SearchResult;
 import org.digitalcampus.oppia.model.Section;
+import org.digitalcampus.oppia.model.StringValue;
 import org.digitalcampus.oppia.model.TrackerLog;
 import org.digitalcampus.oppia.model.User;
 import org.digitalcampus.oppia.model.db_model.Leaderboard;
@@ -1617,16 +1621,16 @@ private void fetchUserCustomFields(User u) {
                     if (field.isString() || field.isChoices()) {
                         // Internally, we just save the choices key value as a str
                         String value = c.getString(c.getColumnIndex(CF_VALUE_STR));
-                        u.putCustomField(key, new CustomValue<>(value));
+                        u.putCustomField(key, new CustomValue(new StringValue(value)));
                     } else if (field.isBoolean()) {
                         boolean value = c.getInt(c.getColumnIndex(CF_VALUE_BOOL)) == 1;
-                        u.putCustomField(key, new CustomValue<>(value));
+                        u.putCustomField(key, new CustomValue(new BooleanValue(value)));
                     } else if (field.isInteger()) {
                         int value = c.getInt(c.getColumnIndex(CF_VALUE_INT));
-                        u.putCustomField(key, new CustomValue<>(value));
+                        u.putCustomField(key, new CustomValue(new IntValue(value)));
                     } else if (field.isFloat()) {
                         float value = c.getFloat(c.getColumnIndex(CF_VALUE_FLOAT));
-                        u.putCustomField(key, new CustomValue<>(value));
+                        u.putCustomField(key, new CustomValue(new FloatValue(value)));
                     }
                 }
             }

diff --git a/app/src/main/java/org/digitalcampus/oppia/model/Activity.java b/app/src/main/java/org/digitalcampus/oppia/model/Activity.java