Exam

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.benjaminledet.pokedex"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -32,6 +32,11 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {

app/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Nov 18 08:37:03 CET 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

app/schemas/com.benjaminledet.pokedex.data.local.PokedexDatabase/1.json

@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "9b2b0d9becf14f0c7303e8256e27d936",
+    "identityHash": "1412e54ba667f64e305b6ddf826f3745",
     "entities": [
       {
         "tableName": "Pokemon",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `iconUrl` TEXT, `weight` REAL, `height` REAL, `types` TEXT, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `iconUrl` TEXT, `moves` TEXT, `weight` REAL, `height` REAL, `types` TEXT, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "id",
@@ -26,6 +26,12 @@
             "affinity": "TEXT",
             "notNull": false
           },
+          {
+            "fieldPath": "detail.moves",
+            "columnName": "moves",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "detail.weight",
             "columnName": "weight",
@@ -185,12 +191,62 @@
             ]
           }
         ]
+      },
+      {
+        "tableName": "Move",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `type` TEXT NOT NULL, `accuracy` INTEGER NOT NULL, `power` INTEGER NOT NULL, `pp` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accuarcy",
+            "columnName": "accuracy",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "power",
+            "columnName": "power",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pp",
+            "columnName": "pp",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
       }
     ],
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9b2b0d9becf14f0c7303e8256e27d936')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1412e54ba667f64e305b6ddf826f3745')"
     ]
   }
 }

app/src/main/AndroidManifest.xml

@@ -26,6 +26,7 @@
         </activity>
 
         <activity android:name=".ui.pokemon.detail.PokemonDetailActivity"/>
+        <meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_fonts"/>
 
     </application>
 

app/src/main/java/com/benjaminledet/pokedex/data/DataModule.kt

@@ -27,6 +27,8 @@ val dataModule = module {
 
     single { get<PokedexDatabase>().pokemonDao() }
 
+    single { get<PokedexDatabase>().moveDao() }
+
     //endregion
 
     //region remote