Merge pull request #91 from odaridavid/add-commas-to-population

Add commas to population

Author: odaridavid

app/src/main/kotlin/com/k0d4black/theforce/mappers/DomainToPresentation.kt

@@ -1,14 +1,14 @@
 package com.k0d4black.theforce.mappers
 
+import com.k0d4black.theforce.commons.convertToInches
 import com.k0d4black.theforce.domain.models.Character
 import com.k0d4black.theforce.domain.models.Film
 import com.k0d4black.theforce.domain.models.Planet
 import com.k0d4black.theforce.domain.models.Specie
+import com.k0d4black.theforce.models.CharacterPresentation
 import com.k0d4black.theforce.models.FilmPresentation
 import com.k0d4black.theforce.models.PlanetPresentation
 import com.k0d4black.theforce.models.SpeciePresentation
-import com.k0d4black.theforce.models.CharacterPresentation
-import com.k0d4black.theforce.commons.convertToInches
 
 
 fun Character.toPresentation(): CharacterPresentation {
@@ -22,7 +22,8 @@ fun Character.toPresentation(): CharacterPresentation {
 }
 
 fun Planet.toPresentation(): PlanetPresentation {
-    return PlanetPresentation(this.name, this.population)
+    val populationAsLong = if (this.population.contains("Unknown")) 0L else this.population.toLong()
+    return PlanetPresentation(this.name, populationAsLong)
 }
 
 fun Film.toPresentation(): FilmPresentation {

app/src/main/kotlin/com/k0d4black/theforce/models/PlanetPresentation.kt

@@ -1,3 +1,3 @@
 package com.k0d4black.theforce.models
 
-data class PlanetPresentation(val name: String, val population: String)
+data class PlanetPresentation(val name: String, val population: Long)

app/src/main/res/values/strings.xml

@@ -28,7 +28,7 @@
 
     <!-- Data Binding String Templates -->
     <string name="template_planet_name">Name : %s</string>
-    <string name="template_planet_population">Population : %s</string>
+    <string name="template_planet_population">Population : %,d</string>
     <string name="template_species_name">Name : %s</string>
     <string name="template_height_cm">%s cm</string>
     <string name="template_height_inches">%s inches</string>