diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..a12cdf47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,33 @@
+## Stores user specific settings ##
+.gradle
+.idea/
+.settings/
+.idea
+*.iml
+
+## could be located in different module directories ##
+*.iml
+
+## generated content ##
+bin/
+out/
+gen/
+build/
+
+## local machine properties ##
+local.properties
+
+## folder that contains all test reports ##
+test-reports/
+
+## Test server created by calabash ##
+test_servers/
+
+## Misc ##
+AndroidManifest.out.xml
+com_crashlytics_export_strings.xml
+crashlytics-build.properties
+screenshot_*
+.DS_Store
+Thumbs.db
+desktop.ini
\ No newline at end of file
diff --git a/README.md b/README.md
index e9e90833..ed736499 100755
--- a/README.md
+++ b/README.md
@@ -1,116 +1,40 @@
-## Introduction
+## Heartstone Android by Niels Masdorp
-Hsiao here at Splendo is a very enthusiastic casual Hearthstone player. He is also a user of the KLM houses apps ([iOS](https://itunes.apple.com/nl/app/klm-houses/id371664245?l=en&mt=8) / [Android](https://play.google.com/store/apps/details?id=com.klm.mobile.houses&hl=en))
+### Architecture
+This app is separated in 2 modules:
-He wants you to build a web app that has similar UI/UX. Similar way to go from the grid view to detail view, and also being able to scroll through the detail views like a carousel (hint: download the Houses app and have a look at how it works) but he wants the app to show Hearthstone card images.
+- app: Android module that is responsible for showing the actual app, it uses the MVP architecture for the presentation layer.
+This module also contains the data providers
+- domain: This is where all the business logic is located, it is a pure Java module with no Android related dependencies
-We have supplied you with a json file (`cards.json`) containing all the Heartstone cards currently available.
+In order to create a clear separation of concerns and to separate low level components (UI) from the high level components
+(Entities and Use Cases) I have used the [Clean Architecture](https://8thlight.com/blog/uncle-bob/2012/08/13/the-clean-architecture.html)
+proposed by Uncle Bob.
-Hsiao is especially interested in the app showing `Legendary` cards with the `Deathrattle Mechanic`, below are examples of such a cards :
+### Third party libraries
-```json
-{
- "cardId": "FP1_014",
- "name": "Stalagg",
- "cardSet": "Naxxramas",
- "type": "Minion",
- "rarity": "Legendary",
- "cost": 5,
- "attack": 7,
- "health": 4,
- "text": "Deathrattle: If Feugen also died this game, summon Thaddius.",
- "flavor": "Stalagg want to write own flavor text. \"STALAGG AWESOME!\"",
- "artist": "Dany Orizio",
- "collectible": true,
- "elite": true,
- "playerClass": "Neutral",
- "howToGet": "Unlocked in The Construct Quarter, in the Naxxramas adventure.",
- "howToGetGold": "Crafting unlocked in The Construct Quarter, in the Naxxramas adventure.",
- "img": "http://wow.zamimg.com/images/hearthstone/cards/enus/original/FP1_014.png",
- "imgGold": "http://wow.zamimg.com/images/hearthstone/cards/enus/animated/FP1_014_premium.gif",
- "locale": "enUS",
- "mechanics": [
- {
- "name": "Deathrattle"
- }
- ]
-}
-```
+In order to have proper dependency injection to tie all these components together I have chosen to use the
+well known and community supported Dagger 2 library. For image loading I have chosen to use Glide, which is just a preference
+over something like Picasso.
-and
+For logging I have used Jake Wharton's Timber. And lastly to create asynchronous streams I have used RxJava 2. For this project
+I could have gone without since there is not a lot of data flowing through the application, but I chose to include it
+to show that I am comfortable using it.
-```json
-{
- "cardId": "CFM_902",
- "name": "Aya Blackpaw",
- "cardSet": "Mean Streets of Gadgetzan",
- "type": "Minion",
- "rarity": "Legendary",
- "cost": 6,
- "attack": 5,
- "health": 3,
- "text": " Battlecry and Deathrattle: Summon a Jade Golem.",
- "flavor": "Though young, Aya took over as the leader of Jade Lotus through her charisma and strategic acumen when her predecessor was accidentally crushed by a jade golem.",
- "artist": "Glenn Rane",
- "collectible": true,
- "elite": true,
- "playerClass": "Neutral",
- "multiClassGroup": "Jade Lotus",
- "classes": [
- "Druid",
- "Rogue",
- "Shaman"
- ],
- "img": "http://media.services.zam.com/v1/media/byName/hs/cards/enus/CFM_902.png",
- "imgGold": "http://media.services.zam.com/v1/media/byName/hs/cards/enus/animated/CFM_902_premium.gif",
- "locale": "enUS",
- "mechanics": [
- {
- "name": "Jade Golem"
- },
- {
- "name": "Battlecry"
- },
- {
- "name": "Deathrattle"
- }
- ]
-}
-```
+### Data
-## Assignment
+Cards: I have not chosen to host any data on a backend. I stored the JSON file in /assets and loaded it into memory.
-You are free to choose the patterns and architectures to create this web app, the requirements are :
+Favorites: Are stored in Shared Preferences
-### Backend
+Both data storage solutions are easily interchangeable with other solutions due to the architecture (e.g. implement storage interface
+and bind new implementation in Dagger module)
-* Create an API using a Java (plain java or Groovy/Cotlin) backend allowing you to get card information for at least legendary deathrattle cards
-* The API should also support filtering based on relevant request parameters. Ideally, the API should enable the following, listed from easy to hard:
- * filter by least the following fields: `type`, `rarity`, `classes`, and `mechanics`
- * return sorted results (for example, alphabetically sorted), supporting both ascending and descending
- * (optional) return the results by pages (based on a page size request parameter), iterating over the pages are maintained by a cursor which is included in the response, this cursor is used in the subsequent request
+### Filtering
-### Web Application
+Data repository accepts a request model with criteria for cards and is being used to query legendary cards with a certain
+mechanic, this can of course be extended to support more criteria as well.
-* Create the web app using JavaScript. You can use either plain JavaScript or a Framework of your choice
-* Show the card images in a grid like the houses app
-* when user click on a grid item , navigate to the card detail view where you can display more information regarding the card ( what you would like to show and how is up to you ), when in detail view the navigation to the next and previous card should be the same as the Houses App
-* The user should be able to set a card as favourite and this info should be persisted when the app closes, how to show cards that are tagged as favourites and how to persist that information is up to you
+### Sorting
-
-## What we would like to see
-
-* Proper handling of asynchonous calls
-* Clean code
-* Relevant design patterns
-* Javascript best practices
-* UI should remain responsive during content loading
-* Should you use 3rd party libraries and frameworks please motivate your choice
-* Unit tests
-* Writing the backend using Google AppEngine is a plus, but feel free to use Amazon AWS, Tomcat or anything you prefer for handling your API calls
-
-## Finally
-
-To submit your result, fork this repository. When you are satisfied with your result, create a Pull Request. Make sure your backend is up and running somewhere for the duration of the review and tell us in the comments where to find it.
-
-Good Luck!
+The request model also supports a sorting strategy (asc and desc), currently, this sorts the list by the name of the card
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 00000000..796b96d1
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 00000000..9754b17c
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,108 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+ext {
+ VERSION_NAME = "1.0.0"
+ VERSION_CODE = 1
+}
+
+androidExtensions {
+ experimental = true
+}
+
+android {
+ compileSdkVersion 27
+ defaultConfig {
+ applicationId "com.nielsmasdorp.heartstone"
+ minSdkVersion 21
+ targetSdkVersion 27
+ versionCode VERSION_CODE
+ versionName VERSION_NAME
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ debug {
+ minifyEnabled false
+
+ versionNameSuffix "-debug"
+ applicationIdSuffix ".debug"
+ }
+ acceptance {
+ signingConfig signingConfigs.debug
+ initWith buildTypes.debug
+
+ versionNameSuffix "-acceptance"
+ applicationIdSuffix ".acceptance"
+
+ minifyEnabled true
+ useProguard true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+ matchingFallbacks = ['release']
+ }
+ release {
+ minifyEnabled true
+ useProguard true
+
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ packagingOptions {
+ exclude 'META-INF/DEPENDENCIES'
+ exclude 'META-INF/NOTICE'
+ exclude 'META-INF/LICENSE'
+ exclude 'META-INF/LICENSE.txt'
+ exclude 'META-INF/NOTICE.txt'
+ exclude 'META-INF/rxjava.properties'
+ exclude 'META-INF/rxkotlin.properties'
+ exclude 'META-INF/rxkotlin_main.kotlin_module'
+ }
+}
+
+dependencies {
+ implementation project(':domain')
+
+ implementation "com.android.support:appcompat-v7:$android_support_version"
+ implementation "com.android.support:recyclerview-v7:$android_support_version"
+ implementation "com.android.support:design:$android_support_version"
+ implementation "com.android.support:cardview-v7:$android_support_version"
+ api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+ // Gson
+ implementation 'com.google.code.gson:gson:2.8.4'
+
+ //Dagger
+ api "com.google.dagger:dagger:$dagger_version"
+ kapt "com.google.dagger:dagger-compiler:$dagger_version"
+ kapt "com.google.dagger:dagger-android-processor:$dagger_version"
+ api("com.google.dagger:dagger-android-support:$dagger_version", {
+ exclude group: 'com.google.code.findbugs'
+ })
+
+ // Jake
+ api 'com.jakewharton.timber:timber:4.5.1'
+
+ // Glide
+ implementation 'com.github.bumptech.glide:glide:4.7.1'
+ kapt 'com.github.bumptech.glide:compiler:4.7.1'
+
+ // ReactiveX
+ api 'io.reactivex.rxjava2:rxandroid:2.0.1'
+ api "io.reactivex.rxjava2:rxjava:$reactive_x_version"
+ api "io.reactivex.rxjava2:rxkotlin:$reactive_x_version"
+ api 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.0.0'
+ testApi 'io.reactivex.rxjava2:rxandroid:2.0.1'
+ testApi "io.reactivex.rxjava2:rxjava:$reactive_x_version"
+ testApi "io.reactivex.rxjava2:rxkotlin:$reactive_x_version"
+
+ testApi 'junit:junit:4.12'
+ testApi 'org.mockito:mockito-core:2.11.0'
+ testApi 'com.nhaarman:mockito-kotlin-kt1.1:1.5.0'
+
+ androidTestApi('com.android.support.test.espresso:espresso-core:2.2.2', {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ })
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 00000000..f1b42451
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/app/src/androidTest/java/com/nielsmasdorp/heartstone/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/nielsmasdorp/heartstone/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..edfcdd7b
--- /dev/null
+++ b/app/src/androidTest/java/com/nielsmasdorp/heartstone/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.nielsmasdorp.heartstone
+
+import android.support.test.InstrumentationRegistry
+import android.support.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getTargetContext()
+ assertEquals("com.nielsmasdorp.flightapp", appContext.packageName)
+ }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..3831d4eb
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cards.json b/app/src/main/assets/cards.json
similarity index 100%
rename from cards.json
rename to app/src/main/assets/cards.json
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneApp.kt b/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneApp.kt
new file mode 100644
index 00000000..17defbb8
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneApp.kt
@@ -0,0 +1,25 @@
+package com.nielsmasdorp.heartstone
+
+import dagger.android.AndroidInjector
+import dagger.android.DaggerApplication
+import timber.log.Timber
+
+class HeartstoneApp : DaggerApplication() {
+
+ override fun onCreate() {
+ super.onCreate()
+ setupTimber()
+ }
+
+ override fun applicationInjector(): AndroidInjector {
+ return DaggerHeartstoneAppComponent.builder()
+ .heartstoneAppModule(HeartstoneAppModule())
+ .create(this)
+ }
+
+ private fun setupTimber() {
+ if (BuildConfig.DEBUG) {
+ Timber.plant(Timber.DebugTree())
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneAppComponent.kt b/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneAppComponent.kt
new file mode 100644
index 00000000..b12a8867
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneAppComponent.kt
@@ -0,0 +1,21 @@
+package com.nielsmasdorp.heartstone
+
+import com.nielsmasdorp.heartstone.presentation.card.CardsActivityModule
+import dagger.Component
+import dagger.android.AndroidInjector
+import dagger.android.support.AndroidSupportInjectionModule
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [
+ AndroidSupportInjectionModule::class,
+ HeartstoneAppModule::class,
+ CardsActivityModule::class])
+interface HeartstoneAppComponent : AndroidInjector {
+
+ @Component.Builder
+ abstract class Builder : AndroidInjector.Builder() {
+
+ abstract fun heartstoneAppModule(heartstoneAppModule: HeartstoneAppModule): Builder
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneAppModule.kt b/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneAppModule.kt
new file mode 100644
index 00000000..69299882
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/HeartstoneAppModule.kt
@@ -0,0 +1,18 @@
+package com.nielsmasdorp.heartstone
+
+import android.app.Application
+import android.content.Context
+import com.nielsmasdorp.heartstone.generic.dagger.AppContext
+import dagger.Module
+import dagger.Provides
+
+@Module
+class HeartstoneAppModule {
+
+ @Provides
+ @AppContext
+ fun provideApplicationContext(application: HeartstoneApp): Context = application
+
+ @Provides
+ fun provideApplication(application: HeartstoneApp): Application = application
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/data/card/JSONCardRepository.kt b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/JSONCardRepository.kt
new file mode 100644
index 00000000..bee2b983
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/JSONCardRepository.kt
@@ -0,0 +1,83 @@
+package com.nielsmasdorp.heartstone.data.card
+
+import android.app.Application
+import com.google.gson.Gson
+import com.nielsmasdorp.domain.card.data.CardRepository
+import com.nielsmasdorp.domain.card.entity.Card
+import com.nielsmasdorp.domain.card.entity.CardRequest
+import com.nielsmasdorp.heartstone.data.card.model.JSONCard
+import com.nielsmasdorp.heartstone.data.card.model.JSONCardSets
+import io.reactivex.Single
+import javax.inject.Inject
+
+/**
+ * [CardRepository] implementation that fetches cards from a JSON file in /assets
+ */
+class JSONCardRepository @Inject constructor(private val application: Application) : CardRepository {
+
+ override fun getCards(cardRequest: CardRequest): Single> {
+ val json = application.assets.open(CARDS_JSON_FILE_NAME).bufferedReader().use {
+ it.readText()
+ }
+ val cardSets = Gson().fromJson(json, JSONCardSets::class.java)
+ return Single.just(getAllCards(cardSets)
+ .map { mapToCard(it) }
+ .filter { card ->
+ cardRequest.requestedType?.let { card.type == it } ?: true &&
+ cardRequest.requestedRarity?.let { card.rarity == it } ?: true &&
+ cardRequest.requestedClass?.let { card.classes.contains(it) } ?: true &&
+ cardRequest.requestedMechanic?.let { card.mechanics.contains(it) } ?: true
+ }
+ .let { cards ->
+ when (cardRequest.sortingStrategy) {
+ CardRequest.Sort.ASCENDING -> cards.sortedBy { it.name }
+ CardRequest.Sort.DESCENDING -> cards.sortedByDescending { it.name }
+ CardRequest.Sort.NONE -> cards
+ }
+ }
+ )
+ }
+
+ private fun getAllCards(cardSets: JSONCardSets): List {
+ return listOf(
+ cardSets.basicCards,
+ cardSets.blackRockMountainCards,
+ cardSets.classicCards,
+ cardSets.creditsCards,
+ cardSets.gadgetzanCards,
+ cardSets.goblinsVsGnomesCards,
+ cardSets.grandTournamentCards,
+ cardSets.hallOfFameCards,
+ cardSets.heroSkinsCards,
+ cardSets.journeyUnGoroCards,
+ cardSets.karazhanCards,
+ cardSets.leagueOfExplorersCards
+ ).flatten()
+ }
+
+ private fun mapToCard(jsonCard: JSONCard): Card {
+ return Card(
+ id = jsonCard.cardId,
+ name = jsonCard.name,
+ imgUrl = jsonCard.img,
+ cardSet = jsonCard.cardSet,
+ type = jsonCard.type,
+ rarity = jsonCard.rarity,
+ cost = jsonCard.cost,
+ attack = jsonCard.attack,
+ health = jsonCard.health,
+ text = jsonCard.htmlText,
+ flavor = jsonCard.flavour,
+ classes = jsonCard.classes,
+ mechanics = jsonCard.mechanics?.map { it.name }
+ )
+ }
+
+ private fun List?.contains(value: String): Boolean {
+ return this != null && this.contains(value)
+ }
+
+ companion object {
+ private const val CARDS_JSON_FILE_NAME = "cards.json"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/data/card/SharedPrefsFavoritesCardRepository.kt b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/SharedPrefsFavoritesCardRepository.kt
new file mode 100644
index 00000000..044f8396
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/SharedPrefsFavoritesCardRepository.kt
@@ -0,0 +1,41 @@
+package com.nielsmasdorp.heartstone.data.card
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.nielsmasdorp.domain.card.data.FavoriteCardsRepository
+import com.nielsmasdorp.heartstone.generic.dagger.AppContext
+import javax.inject.Inject
+
+/**
+ * [FavoriteCardsRepository] implementation that stores the favorite ids in Shared Preferences
+ */
+class SharedPrefsFavoritesCardRepository @Inject constructor(@AppContext context: Context) : FavoriteCardsRepository {
+
+ private val sharedPrefs: SharedPreferences by lazy {
+ context.getSharedPreferences(CARD_FAVORITES_STORAGE, Context.MODE_PRIVATE)
+ }
+
+ override fun addToFavorites(cardId: String) {
+ sharedPrefs.getStringSet(CARD_FAVORITES_KEY, mutableSetOf()).apply {
+ add(cardId)
+ sharedPrefs.edit().putStringSet(CARD_FAVORITES_KEY, this).apply()
+ }
+ }
+
+ override fun removeFromFavorites(cardId: String) {
+ sharedPrefs.getStringSet(CARD_FAVORITES_KEY, mutableSetOf()).apply {
+ remove(cardId)
+ sharedPrefs.edit().putStringSet(CARD_FAVORITES_KEY, this).apply()
+ }
+ }
+
+ override fun isAddedToFavorites(cardId: String): Boolean {
+ return sharedPrefs.getStringSet(CARD_FAVORITES_KEY, emptySet()).contains(cardId)
+ }
+
+ private companion object {
+
+ private const val CARD_FAVORITES_STORAGE = "CARD_FAVORITES_STORAGE"
+ private const val CARD_FAVORITES_KEY = "CARD_FAVORITES"
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCard.kt b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCard.kt
new file mode 100644
index 00000000..39f77007
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCard.kt
@@ -0,0 +1,27 @@
+package com.nielsmasdorp.heartstone.data.card.model
+
+/**
+ * model for a card in the JSON in /assets
+ */
+data class JSONCard(
+ val cardId: String,
+ val name: String?,
+ val cardSet: String?,
+ val type: String?,
+ val rarity: String?,
+ val cost: Int?,
+ val attack: Int?,
+ val health: Int?,
+ val htmlText: String?,
+ val flavour: String?,
+ val artist: String?,
+ val collectible: String?,
+ val elite: Boolean?,
+ val playerClass: String?,
+ val multiClassGroup: String?,
+ val classes: List?,
+ val img: String?,
+ val imgGold: String?,
+ val locale: String?,
+ val mechanics: List?
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCardMechanic.kt b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCardMechanic.kt
new file mode 100644
index 00000000..90273610
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCardMechanic.kt
@@ -0,0 +1,8 @@
+package com.nielsmasdorp.heartstone.data.card.model
+
+/**
+ * Model for the mechanic value of a [JSONCard]
+ */
+data class JSONCardMechanic(
+ val name: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCardSets.kt b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCardSets.kt
new file mode 100644
index 00000000..ce67c447
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/data/card/model/JSONCardSets.kt
@@ -0,0 +1,57 @@
+package com.nielsmasdorp.heartstone.data.card.model
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Model for all sets of [JSONCard]s in the JSON file in /assets
+ */
+data class JSONCardSets(
+
+ @SerializedName("Basic")
+ val basicCards: List,
+
+ @SerializedName("Classic")
+ val classicCards: List,
+
+ @SerializedName("Hall of Fame")
+ val hallOfFameCards: List,
+
+ @SerializedName("Naxxramas")
+ val naxxramasCards: List,
+
+ @SerializedName("Goblins vs Gnomes")
+ val goblinsVsGnomesCards: List,
+
+ @SerializedName("Blackrock Mountain")
+ val blackRockMountainCards: List,
+
+ @SerializedName("The Grand Tournament")
+ val grandTournamentCards: List,
+
+ @SerializedName("The League of Explorers")
+ val leagueOfExplorersCards: List,
+
+ @SerializedName("Whispers of the Old Gods")
+ val whispersOfTheOldGodsCards: List,
+
+ @SerializedName("One Night in Karazhan")
+ val karazhanCards: List,
+
+ @SerializedName("Mean Streets of Gadgetzan")
+ val gadgetzanCards: List,
+
+ @SerializedName("Journey to Un'Goro")
+ val journeyUnGoroCards: List,
+
+ @SerializedName("Tavern Brawl")
+ val tavernBrawlCards: List,
+
+ @SerializedName("Hero Skins")
+ val heroSkinsCards: List,
+
+ @SerializedName("Missions")
+ val missionsCards: List,
+
+ @SerializedName("Credits")
+ val creditsCards: List
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/generic/dagger/AppContext.kt b/app/src/main/java/com/nielsmasdorp/heartstone/generic/dagger/AppContext.kt
new file mode 100644
index 00000000..bf816395
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/generic/dagger/AppContext.kt
@@ -0,0 +1,11 @@
+package com.nielsmasdorp.heartstone.generic.dagger
+
+import android.content.Context
+import javax.inject.Qualifier
+
+/**
+ * Annotation used to mark Application [Context] instances
+ */
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class AppContext
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardViewModel.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardViewModel.kt
new file mode 100644
index 00000000..053fd031
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardViewModel.kt
@@ -0,0 +1,19 @@
+package com.nielsmasdorp.heartstone.presentation.card
+
+import android.annotation.SuppressLint
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+/**
+ * View model for a single card in Heartstone
+ */
+@SuppressLint("ParcelCreator")
+@Parcelize
+data class CardViewModel(
+ val id: String,
+ val name: String,
+ val imgUrl: String,
+ val cardSet: String,
+ val type: String,
+ val rarity: String,
+ val text: String) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardsActivity.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardsActivity.kt
new file mode 100644
index 00000000..5d1000a5
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardsActivity.kt
@@ -0,0 +1,52 @@
+package com.nielsmasdorp.heartstone.presentation.card
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v7.app.AppCompatActivity
+import com.nielsmasdorp.heartstone.R
+import com.nielsmasdorp.heartstone.presentation.card.grid.CardGridFragment
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
+import javax.inject.Inject
+
+/**
+ * Main activity for the cards feature in the Heartstone app
+ */
+class CardsActivity : AppCompatActivity(), HasSupportFragmentInjector {
+
+ @Inject
+ lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ AndroidInjection.inject(this)
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_cards)
+
+ if (savedInstanceState != null) {
+ CURRENT_POSITION = savedInstanceState.getInt(KEY_CURRENT_POSITION, 0)
+ return
+ }
+ supportFragmentManager
+ .beginTransaction()
+ .add(R.id.fragmentContainer, CardGridFragment(), CardGridFragment::class.java.simpleName)
+ .commit()
+ }
+
+ @Override
+ override fun onSaveInstanceState(outState: Bundle) {
+ super.onSaveInstanceState(outState)
+ outState.putInt(KEY_CURRENT_POSITION, CURRENT_POSITION)
+ }
+
+ override fun supportFragmentInjector(): AndroidInjector = fragmentDispatchingAndroidInjector
+
+ companion object {
+
+ private const val KEY_CURRENT_POSITION = "KEY_CURRENT_POSITION"
+
+ /** Current clicked card position in the chosen set of cards */
+ var CURRENT_POSITION = 0
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardsActivityModule.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardsActivityModule.kt
new file mode 100644
index 00000000..1867c5d0
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/CardsActivityModule.kt
@@ -0,0 +1,17 @@
+package com.nielsmasdorp.heartstone.presentation.card
+
+import com.nielsmasdorp.heartstone.presentation.card.carousel.dagger.CardCarouselFragmentModule
+import com.nielsmasdorp.heartstone.presentation.card.detail.dagger.CardDetailFragmentModule
+import com.nielsmasdorp.heartstone.presentation.card.grid.dagger.CardGridFragmentModule
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class CardsActivityModule {
+
+ @ContributesAndroidInjector(modules = [
+ CardGridFragmentModule::class,
+ CardCarouselFragmentModule::class,
+ CardDetailFragmentModule::class])
+ abstract fun cardsActivity(): CardsActivity
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarousel.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarousel.kt
new file mode 100644
index 00000000..3b2e4a15
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarousel.kt
@@ -0,0 +1,24 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel
+
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+
+/**
+ * Contract for the card carousel feature
+ */
+interface CardCarousel {
+
+ interface View {
+
+ var cards: List
+ }
+
+ interface Presenter {
+
+ fun startPresenting()
+ }
+
+ interface CardsProvider {
+
+ val cards: List?
+ }
+}
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselFragment.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselFragment.kt
new file mode 100644
index 00000000..fab8b91d
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselFragment.kt
@@ -0,0 +1,108 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel
+
+import android.content.Context
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.nielsmasdorp.heartstone.R
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import dagger.android.support.AndroidSupportInjection
+import javax.inject.Inject
+import android.support.transition.TransitionInflater
+import android.support.v4.app.SharedElementCallback
+import android.support.v4.view.ViewPager
+import com.nielsmasdorp.heartstone.presentation.card.CardsActivity
+import kotlinx.android.synthetic.main.fragment_card_detail.view.*
+import kotlinx.android.synthetic.main.fragment_cards_carousel.*
+
+class CardCarouselFragment : Fragment(), CardCarousel.View {
+
+ @Inject
+ lateinit var presenter: CardCarousel.Presenter
+
+ override var cards: List = emptyList()
+ set(value) {
+ field = value
+ carouselAdapter.cards = value
+ cardsCarouselViewPager.currentItem = CardsActivity.CURRENT_POSITION
+ }
+
+ private val carouselAdapter: CardCarouselPagerAdapter by lazy {
+ CardCarouselPagerAdapter(this)
+ }
+
+ override fun onAttach(context: Context) {
+ AndroidSupportInjection.inject(this)
+ super.onAttach(context)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ return inflater.inflate(R.layout.fragment_cards_carousel, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initPager()
+
+ prepareSharedElementTransition()
+
+ if (savedInstanceState == null) {
+ postponeEnterTransition()
+ }
+ presenter.startPresenting()
+ }
+
+ private fun prepareSharedElementTransition() {
+ sharedElementEnterTransition = TransitionInflater.from(context)
+ .inflateTransition(R.transition.image_shared_element_transition).apply {
+ duration = resources.getInteger(R.integer.default_animation_length_ms).toLong()
+ }
+ setEnterSharedElementCallback(
+ object : SharedElementCallback() {
+ override fun onMapSharedElements(names: List, sharedElements: MutableMap) {
+ val currentFragment = cardsCarouselViewPager.adapter?.instantiateItem(cardsCarouselViewPager, CardsActivity.CURRENT_POSITION) as Fragment
+ val view = currentFragment.view ?: return
+
+ sharedElements.put(names[0], view.cardDetailImage)
+ }
+ })
+ }
+
+ private fun initPager() {
+ cardsCarouselViewPager.apply {
+ addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+ override fun onPageScrollStateChanged(state: Int) {
+ // no op
+ }
+
+ override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+ // no op
+ }
+
+ override fun onPageSelected(position: Int) {
+ CardsActivity.CURRENT_POSITION = position
+ }
+ })
+ adapter = carouselAdapter
+ }
+ }
+
+ companion object {
+
+ const val CARDS_KEY = "CARDS_KEY"
+
+ /**
+ * Create a new instance of this fragment
+ * @param cards [ArrayList] of [CardViewModel]s that need to be shown in the carousel
+ */
+ fun newInstance(cards: ArrayList): CardCarouselFragment {
+ return CardCarouselFragment().apply {
+ arguments = Bundle().apply {
+ putParcelableArrayList(CARDS_KEY, cards)
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselPagerAdapter.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselPagerAdapter.kt
new file mode 100644
index 00000000..d5bf12ae
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselPagerAdapter.kt
@@ -0,0 +1,24 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel
+
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentStatePagerAdapter
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import com.nielsmasdorp.heartstone.presentation.card.detail.CardDetailFragment
+
+/**
+ * Adapter class for the card carousel
+ */
+class CardCarouselPagerAdapter(fragment: Fragment) : FragmentStatePagerAdapter(fragment.childFragmentManager) {
+
+ var cards: List = emptyList()
+ set(value) {
+ field = value
+ notifyDataSetChanged()
+ }
+
+ override fun getCount(): Int = cards.count()
+
+ override fun getItem(position: Int): Fragment {
+ return CardDetailFragment.newInstance(cards[position])
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselPresenter.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselPresenter.kt
new file mode 100644
index 00000000..e3417857
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardCarouselPresenter.kt
@@ -0,0 +1,14 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel
+
+import javax.inject.Inject
+
+/**
+ * Presenter that presents data for the card carousel view
+ */
+class CardCarouselPresenter @Inject constructor(private val view: CardCarousel.View,
+ private val cardsProvider: CardCarousel.CardsProvider) : CardCarousel.Presenter {
+
+ override fun startPresenting() {
+ view.cards = cardsProvider.cards ?: emptyList()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardsProvider.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardsProvider.kt
new file mode 100644
index 00000000..f20038c7
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/CardsProvider.kt
@@ -0,0 +1,14 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel
+
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardCarouselFragment.Companion.CARDS_KEY
+import javax.inject.Inject
+
+/**
+ * [CardCarousel.CardsProvider] implementation that provides the cards through fragment arguments
+ */
+class CardsProvider @Inject constructor(private val cardCarouselFragment: CardCarouselFragment) : CardCarousel.CardsProvider {
+
+ override val cards: List?
+ get() = cardCarouselFragment.arguments?.getParcelableArrayList(CARDS_KEY)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/dagger/CardCarouselFragmentModule.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/dagger/CardCarouselFragmentModule.kt
new file mode 100644
index 00000000..9e4d7267
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/dagger/CardCarouselFragmentModule.kt
@@ -0,0 +1,30 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel.dagger
+
+import android.support.v4.app.Fragment
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardCarousel
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardCarouselFragment
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardCarouselPresenter
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardsProvider
+import dagger.Binds
+import dagger.Module
+import dagger.android.AndroidInjector
+import dagger.android.support.FragmentKey
+import dagger.multibindings.IntoMap
+
+@Module(subcomponents = [CardCarouselSubcomponent::class])
+abstract class CardCarouselFragmentModule {
+
+ @Binds
+ @IntoMap
+ @FragmentKey(CardCarouselFragment::class)
+ internal abstract fun bindCardCarouselFragmentInjectorFactory(builder: CardCarouselSubcomponent.Builder): AndroidInjector.Factory
+
+ @Binds
+ abstract fun bindCardCarouselView(cardCarouselFragment: CardCarouselFragment): CardCarousel.View
+
+ @Binds
+ abstract fun bindCardCarouselPresenter(cardCarouselPresenter: CardCarouselPresenter): CardCarousel.Presenter
+
+ @Binds
+ abstract fun bindCardsProvider(cardsProvider: CardsProvider): CardCarousel.CardsProvider
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/dagger/CardCarouselSubcomponent.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/dagger/CardCarouselSubcomponent.kt
new file mode 100644
index 00000000..c6992718
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/carousel/dagger/CardCarouselSubcomponent.kt
@@ -0,0 +1,12 @@
+package com.nielsmasdorp.heartstone.presentation.card.carousel.dagger
+
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardCarouselFragment
+import dagger.Subcomponent
+import dagger.android.AndroidInjector
+
+@Subcomponent
+interface CardCarouselSubcomponent : AndroidInjector {
+
+ @Subcomponent.Builder
+ abstract class Builder : AndroidInjector.Builder()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetail.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetail.kt
new file mode 100644
index 00000000..fc2aedc5
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetail.kt
@@ -0,0 +1,27 @@
+package com.nielsmasdorp.heartstone.presentation.card.detail
+
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+
+/**
+ * Contract for the card details feature
+ */
+interface CardDetail {
+
+ interface View {
+
+ var card: CardViewModel?
+ fun showCardAsFavorite(notifyUser: Boolean = true)
+ fun showCardNotFavorite()
+ }
+
+ interface Presenter {
+
+ fun startPresenting()
+ fun onAddToFavoritesClicked()
+ }
+
+ interface CardProvider {
+
+ val card: CardViewModel?
+ }
+}
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetailFragment.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetailFragment.kt
new file mode 100644
index 00000000..899d568f
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetailFragment.kt
@@ -0,0 +1,112 @@
+package com.nielsmasdorp.heartstone.presentation.card.detail
+
+import android.content.Context
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.nielsmasdorp.heartstone.R
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.fragment_card_detail.*
+import javax.inject.Inject
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.text.Html
+import android.text.Spanned
+import android.widget.ArrayAdapter
+import android.widget.Toast
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.request.RequestOptions
+import com.bumptech.glide.request.target.Target
+
+class CardDetailFragment : Fragment(), CardDetail.View {
+
+ @Inject
+ lateinit var presenter: CardDetail.Presenter
+
+ override var card: CardViewModel? = null
+ set(value) {
+ field = value
+ value?.let {
+ showCard(it)
+ }
+ }
+
+ override fun onAttach(context: Context) {
+ AndroidSupportInjection.inject(this)
+ super.onAttach(context)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ return inflater.inflate(R.layout.fragment_card_detail, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ cardDetailFavoritesIcon.setOnClickListener { presenter.onAddToFavoritesClicked() }
+ presenter.startPresenting()
+ }
+
+ override fun showCardAsFavorite(notifyUser: Boolean) {
+ cardDetailFavoritesIcon.setImageResource(R.drawable.ic_favorites_filled_24dp)
+ if (notifyUser) Toast.makeText(context, getString(R.string.card_details_added_favorites_message), Toast.LENGTH_SHORT).show()
+ }
+
+ override fun showCardNotFavorite() {
+ cardDetailFavoritesIcon.setImageResource(R.drawable.ic_favorites_empty_24dp)
+ Toast.makeText(context, getString(R.string.card_details_removed_favorites_message), Toast.LENGTH_SHORT).show()
+ }
+
+ private fun showCard(card: CardViewModel) {
+ cardDetailImage.transitionName = card.name
+ Glide.with(this)
+ .load(card.imgUrl)
+ .listener(object : RequestListener {
+ override fun onLoadFailed(exception: GlideException?, model: Any, target: Target, isFirstResource: Boolean): Boolean {
+ parentFragment?.startPostponedEnterTransition()
+ return false
+ }
+
+ override fun onResourceReady(resource: Drawable, model: Any, target: Target, dataSource: DataSource, isFirstResource: Boolean): Boolean {
+ parentFragment?.startPostponedEnterTransition()
+ return false
+ }
+ })
+ .into(cardDetailImage)
+ cardDetailName.text = card.name
+ cardDetailSet.text = card.cardSet
+ cardDetailType.text = card.type
+ cardDetailRarity.text = card.rarity
+ cardDetailDescription.text = getTextAsHtml(card.text)
+ }
+
+ private fun getTextAsHtml(html: String): Spanned {
+ return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY)
+ } else {
+ Html.fromHtml(html)
+ }
+ }
+
+ companion object {
+
+ const val CARD_KEY = "CARD_KEY"
+
+ /**
+ * Create a new instance of this fragment
+ * @param card [CardViewModel] that needs to be shown in this fragment
+ */
+ fun newInstance(card: CardViewModel): CardDetailFragment {
+ return CardDetailFragment().apply {
+ arguments = Bundle().apply {
+ putParcelable(CARD_KEY, card)
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetailPresenter.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetailPresenter.kt
new file mode 100644
index 00000000..0f8a18cb
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardDetailPresenter.kt
@@ -0,0 +1,35 @@
+package com.nielsmasdorp.heartstone.presentation.card.detail
+
+import com.nielsmasdorp.domain.card.AddCardToFavorites
+import com.nielsmasdorp.domain.card.IsCardAddedToFavorites
+import com.nielsmasdorp.domain.card.RemoveCardFromFavorites
+import javax.inject.Inject
+
+/**
+ * Presenter that presents data to the view in the card details
+ */
+class CardDetailPresenter @Inject constructor(private val view: CardDetail.View,
+ private val cardProvider: CardDetail.CardProvider,
+ private val isCardAddedToFavorites: IsCardAddedToFavorites,
+ private val removeCardFromFavorites: RemoveCardFromFavorites,
+ private val addCardToFavorites: AddCardToFavorites) : CardDetail.Presenter {
+
+ override fun startPresenting() {
+ cardProvider.card?.let {
+ view.card = it
+ if (isCardAddedToFavorites.execute(it.id)) view.showCardAsFavorite(notifyUser = false)
+ }
+ }
+
+ override fun onAddToFavoritesClicked() {
+ view.card?.let {
+ if (isCardAddedToFavorites.execute(it.id)) {
+ removeCardFromFavorites.execute(it.id)
+ view.showCardNotFavorite()
+ } else {
+ addCardToFavorites.execute(it.id)
+ view.showCardAsFavorite()
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardProvider.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardProvider.kt
new file mode 100644
index 00000000..c31dd649
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/CardProvider.kt
@@ -0,0 +1,13 @@
+package com.nielsmasdorp.heartstone.presentation.card.detail
+
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import javax.inject.Inject
+
+/**
+ * [CardDetail.CardProvider] implementation that provides a single card through fragment arguments
+ */
+class CardProvider @Inject constructor(private val cardDetailFragment: CardDetailFragment) : CardDetail.CardProvider {
+
+ override val card: CardViewModel?
+ get() = cardDetailFragment.arguments?.getParcelable(CardDetailFragment.CARD_KEY)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/dagger/CardDetailFragmentModule.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/dagger/CardDetailFragmentModule.kt
new file mode 100644
index 00000000..353dd905
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/dagger/CardDetailFragmentModule.kt
@@ -0,0 +1,35 @@
+package com.nielsmasdorp.heartstone.presentation.card.detail.dagger
+
+import android.support.v4.app.Fragment
+import com.nielsmasdorp.domain.card.data.FavoriteCardsRepository
+import com.nielsmasdorp.heartstone.data.card.SharedPrefsFavoritesCardRepository
+import com.nielsmasdorp.heartstone.presentation.card.detail.CardDetail
+import com.nielsmasdorp.heartstone.presentation.card.detail.CardDetailFragment
+import com.nielsmasdorp.heartstone.presentation.card.detail.CardDetailPresenter
+import com.nielsmasdorp.heartstone.presentation.card.detail.CardProvider
+import dagger.Binds
+import dagger.Module
+import dagger.android.AndroidInjector
+import dagger.android.support.FragmentKey
+import dagger.multibindings.IntoMap
+
+@Module(subcomponents = [CardDetailSubcomponent::class])
+abstract class CardDetailFragmentModule {
+
+ @Binds
+ @IntoMap
+ @FragmentKey(CardDetailFragment::class)
+ internal abstract fun bindCardDetailFragmentInjectorFactory(builder: CardDetailSubcomponent.Builder): AndroidInjector.Factory
+
+ @Binds
+ abstract fun bindCardDetailView(cardDetailFragment: CardDetailFragment): CardDetail.View
+
+ @Binds
+ abstract fun bindCardDetailPresenter(cardDetailPresenter: CardDetailPresenter): CardDetail.Presenter
+
+ @Binds
+ abstract fun bindCardProvider(cardProvider: CardProvider): CardDetail.CardProvider
+
+ @Binds
+ abstract fun bindFavoritesRepository(sharedPrefsFavoritesCardRepository: SharedPrefsFavoritesCardRepository): FavoriteCardsRepository
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/dagger/CardDetailSubcomponent.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/dagger/CardDetailSubcomponent.kt
new file mode 100644
index 00000000..0aa01c9d
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/detail/dagger/CardDetailSubcomponent.kt
@@ -0,0 +1,12 @@
+package com.nielsmasdorp.heartstone.presentation.card.detail.dagger
+
+import com.nielsmasdorp.heartstone.presentation.card.detail.CardDetailFragment
+import dagger.Subcomponent
+import dagger.android.AndroidInjector
+
+@Subcomponent
+interface CardDetailSubcomponent : AndroidInjector {
+
+ @Subcomponent.Builder
+ abstract class Builder : AndroidInjector.Builder()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGrid.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGrid.kt
new file mode 100644
index 00000000..e744dc1f
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGrid.kt
@@ -0,0 +1,31 @@
+package com.nielsmasdorp.heartstone.presentation.card.grid
+
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+
+/**
+ * Contract for the card grid feature
+ */
+interface CardGrid {
+
+ interface View {
+
+ var cards: List
+ }
+
+ interface Presenter {
+
+ fun startPresenting()
+ fun stopPresenting()
+ fun openCardDetails(cardViewModel: CardViewModel)
+ }
+
+ interface Navigator {
+
+ fun openCardDetails(cardViewModel: CardViewModel)
+ }
+
+ interface StringProvider {
+
+ fun getUnknownAttributeString(): String
+ }
+}
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridAdapter.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridAdapter.kt
new file mode 100644
index 00000000..69dd8b6c
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridAdapter.kt
@@ -0,0 +1,81 @@
+package com.nielsmasdorp.heartstone.presentation.card.grid
+
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.nielsmasdorp.heartstone.R
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import android.graphics.drawable.Drawable
+import android.support.v4.app.Fragment
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.RequestManager
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.engine.GlideException
+import com.bumptech.glide.request.RequestListener
+import com.bumptech.glide.request.target.Target
+import com.nielsmasdorp.heartstone.presentation.card.CardsActivity
+import kotlinx.android.synthetic.main.grid_item_card.view.*
+
+/**
+ * Adapter that shows the list of cards used in the card grid
+ */
+class CardGridAdapter(fragment: Fragment) : RecyclerView.Adapter() {
+
+ private var requestManager: RequestManager = Glide.with(fragment)
+
+ var onCardClickedListener: ((CardViewModel) -> Unit)? = null
+
+ var onClickedImageLoaded: (() -> Unit)? = null
+
+ var cards: List = emptyList()
+ set(value) {
+ field = value
+ notifyDataSetChanged()
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CardViewHolder {
+ return CardViewHolder(LayoutInflater.from(parent.context)
+ .inflate(R.layout.grid_item_card, parent, false),
+ requestManager
+ )
+ }
+
+ override fun onBindViewHolder(holder: CardViewHolder, position: Int) = holder.bind()
+
+ override fun getItemCount(): Int = cards.size
+
+ fun getPositionForViewModel(clickedViewModel: CardViewModel): Int {
+ return cards.indexOf(clickedViewModel)
+ }
+
+ inner class CardViewHolder(itemView: View, private val requestManager: RequestManager) : RecyclerView.ViewHolder(itemView) {
+
+ fun bind() {
+ itemView.apply {
+ cardGridImage.transitionName = cards[adapterPosition].name
+ requestManager
+ .load(cards[adapterPosition].imgUrl)
+ .listener(object : RequestListener {
+ override fun onLoadFailed(e: GlideException?, model: Any,
+ target: Target, isFirstResource: Boolean): Boolean {
+ if (CardsActivity.CURRENT_POSITION == adapterPosition) {
+ onClickedImageLoaded?.invoke()
+ }
+ return false
+ }
+
+ override fun onResourceReady(resource: Drawable, model: Any, target: Target, dataSource: DataSource, isFirstResource: Boolean): Boolean {
+ if (CardsActivity.CURRENT_POSITION == adapterPosition) {
+ onClickedImageLoaded?.invoke()
+ }
+ return false
+ }
+ })
+ .into(cardGridImage)
+ setOnClickListener { onCardClickedListener?.invoke(cards[adapterPosition]) }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridFragment.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridFragment.kt
new file mode 100644
index 00000000..ddc3fd64
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridFragment.kt
@@ -0,0 +1,127 @@
+package com.nielsmasdorp.heartstone.presentation.card.grid
+
+import android.content.Context
+import android.os.Bundle
+import android.support.transition.TransitionInflater
+import android.support.transition.TransitionSet
+import android.support.v4.app.Fragment
+import android.support.v4.app.SharedElementCallback
+import android.support.v4.content.ContextCompat
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.nielsmasdorp.heartstone.R
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import dagger.android.support.AndroidSupportInjection
+import javax.inject.Inject
+import android.view.View.OnLayoutChangeListener
+import com.nielsmasdorp.heartstone.presentation.card.CardsActivity
+import com.nielsmasdorp.heartstone.presentation.card.carousel.CardCarouselFragment
+import kotlinx.android.synthetic.main.grid_item_card.view.*
+
+/**
+ * Fragment used to display a grid of cards
+ */
+class CardGridFragment : Fragment(), CardGrid.View, CardGrid.Navigator, CardGrid.StringProvider {
+
+ @Inject
+ lateinit var presenter: CardGrid.Presenter
+
+ override var cards: List = emptyList()
+ set(value) {
+ field = value
+ cardGridAdapter.cards = value
+ scrollToPosition()
+ }
+
+ private lateinit var cardGridAdapter: CardGridAdapter
+
+ lateinit var recyclerView: RecyclerView
+
+ override fun onAttach(context: Context) {
+ AndroidSupportInjection.inject(this)
+ super.onAttach(context)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ recyclerView = inflater.inflate(R.layout.fragment_cards_grid, container, false) as RecyclerView
+ cardGridAdapter = CardGridAdapter(this).apply {
+ onCardClickedListener = ::onCardClicked
+ onClickedImageLoaded = { startPostponedEnterTransition() }
+ }
+ recyclerView.adapter = cardGridAdapter
+
+ prepareTransitions()
+ postponeEnterTransition()
+
+ return recyclerView
+ }
+
+ override fun onStart() {
+ super.onStart()
+ presenter.startPresenting()
+ }
+
+ override fun onStop() {
+ presenter.stopPresenting()
+ super.onStop()
+ }
+
+ override fun openCardDetails(cardViewModel: CardViewModel) {
+ val clickedPosition = cardGridAdapter.getPositionForViewModel(cardViewModel)
+ CardsActivity.CURRENT_POSITION = clickedPosition
+ val sharedTransitionView = recyclerView.layoutManager.findViewByPosition(clickedPosition)
+ (exitTransition as TransitionSet).excludeTarget(sharedTransitionView, true)
+ fragmentManager?.apply {
+ beginTransaction()
+ .setReorderingAllowed(true)
+ .addSharedElement(sharedTransitionView.cardGridImage, sharedTransitionView.cardGridImage.transitionName)
+ .replace(R.id.fragmentContainer, CardCarouselFragment.newInstance(cards as ArrayList), CardCarouselFragment::class.java.simpleName)
+ .addToBackStack(null)
+ .commit()
+ }
+ }
+
+ override fun getUnknownAttributeString(): String = resources.getString(R.string.unknown)
+
+ private fun onCardClicked(clickedViewModel: CardViewModel) {
+ presenter.openCardDetails(clickedViewModel)
+ }
+
+ private fun scrollToPosition() {
+ recyclerView.addOnLayoutChangeListener(object : OnLayoutChangeListener {
+ override fun onLayoutChange(v: View,
+ left: Int,
+ top: Int,
+ right: Int,
+ bottom: Int,
+ oldLeft: Int,
+ oldTop: Int,
+ oldRight: Int,
+ oldBottom: Int) {
+ recyclerView.removeOnLayoutChangeListener(this)
+ val layoutManager = recyclerView.layoutManager
+ val viewAtPosition = layoutManager.findViewByPosition(CardsActivity.CURRENT_POSITION)
+ if (viewAtPosition == null || layoutManager
+ .isViewPartiallyVisible(viewAtPosition, false, true)) {
+ recyclerView.post({ layoutManager.scrollToPosition(CardsActivity.CURRENT_POSITION) })
+ }
+ }
+ })
+ }
+
+ private fun prepareTransitions() {
+ exitTransition = TransitionInflater.from(context).inflateTransition(R.transition.grid_exit_transition).apply {
+ duration = resources.getInteger(R.integer.default_animation_length_ms).toLong()
+ }
+ setExitSharedElementCallback(
+ object : SharedElementCallback() {
+ override fun onMapSharedElements(names: List, sharedElements: MutableMap) {
+ recyclerView.findViewHolderForAdapterPosition(CardsActivity.CURRENT_POSITION)?.let {
+ sharedElements.put(names[0], it.itemView.cardGridImage)
+ }
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridPresenter.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridPresenter.kt
new file mode 100644
index 00000000..c74744da
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/CardGridPresenter.kt
@@ -0,0 +1,70 @@
+package com.nielsmasdorp.heartstone.presentation.card.grid
+
+import com.nielsmasdorp.domain.card.GetCards
+import com.nielsmasdorp.domain.card.entity.Card
+import com.nielsmasdorp.domain.card.entity.CardRequest
+import com.nielsmasdorp.domain.card.entity.CardRequest.Companion.DEATHRATTLE_MECHANIC
+import com.nielsmasdorp.domain.card.entity.CardRequest.Companion.LEGENDARY_RARITY
+import com.nielsmasdorp.heartstone.presentation.card.CardViewModel
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.Disposable
+import io.reactivex.schedulers.Schedulers
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * Presenter that presents data for the card grid view
+ */
+class CardGridPresenter @Inject constructor(private val view: CardGrid.View,
+ private val navigator: CardGrid.Navigator,
+ private val stringProvider: CardGrid.StringProvider,
+ private val getCards: GetCards) : CardGrid.Presenter {
+
+ private var disposable: Disposable? = null
+
+ override fun startPresenting() {
+ fetchCards()
+ }
+
+ override fun stopPresenting() {
+ disposable?.dispose()
+ }
+
+ override fun openCardDetails(cardViewModel: CardViewModel) {
+ navigator.openCardDetails(cardViewModel)
+ }
+
+ private fun fetchCards() {
+ val request = CardRequest(
+ requestedRarity = LEGENDARY_RARITY,
+ requestedMechanic = DEATHRATTLE_MECHANIC,
+ sortingStrategy = CardRequest.Sort.DESCENDING
+ )
+ disposable = getCards.execute(request)
+ .map { it.map { mapToViewModel(it) } }
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(::onCards, ::onCardsError)
+ }
+
+ private fun mapToViewModel(card: Card): CardViewModel {
+ val unknown: String = stringProvider.getUnknownAttributeString()
+ return CardViewModel(
+ id = card.id,
+ name = card.name ?: unknown,
+ imgUrl = card.imgUrl ?: "",
+ cardSet = card.cardSet ?: unknown,
+ type = card.type ?: unknown,
+ rarity = card.rarity ?: unknown,
+ text = card.text ?: unknown
+ )
+ }
+
+ private fun onCards(cards: List) {
+ view.cards = cards
+ }
+
+ private fun onCardsError(error: Throwable) {
+ Timber.e("error fetching cards", error)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/dagger/CardGridFragmentModule.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/dagger/CardGridFragmentModule.kt
new file mode 100644
index 00000000..835e3009
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/dagger/CardGridFragmentModule.kt
@@ -0,0 +1,37 @@
+package com.nielsmasdorp.heartstone.presentation.card.grid.dagger
+
+import android.support.v4.app.Fragment
+import com.nielsmasdorp.domain.card.data.CardRepository
+import com.nielsmasdorp.heartstone.data.card.JSONCardRepository
+import com.nielsmasdorp.heartstone.presentation.card.grid.CardGrid
+import com.nielsmasdorp.heartstone.presentation.card.grid.CardGridFragment
+import com.nielsmasdorp.heartstone.presentation.card.grid.CardGridPresenter
+import dagger.Binds
+import dagger.Module
+import dagger.android.AndroidInjector
+import dagger.android.support.FragmentKey
+import dagger.multibindings.IntoMap
+
+@Module(subcomponents = [CardGridSubcomponent::class])
+abstract class CardGridFragmentModule {
+
+ @Binds
+ @IntoMap
+ @FragmentKey(CardGridFragment::class)
+ internal abstract fun bindCardGridFragmentInjectorFactory(builder: CardGridSubcomponent.Builder): AndroidInjector.Factory
+
+ @Binds
+ abstract fun bindCardGridView(cardGridFragment: CardGridFragment): CardGrid.View
+
+ @Binds
+ abstract fun bindCardGridPresenter(cardGridPresenter: CardGridPresenter): CardGrid.Presenter
+
+ @Binds
+ abstract fun bindCardGridNavigator(cardGridFragment: CardGridFragment): CardGrid.Navigator
+
+ @Binds
+ abstract fun bindCardGridStringProvider(cardGridFragment: CardGridFragment): CardGrid.StringProvider
+
+ @Binds
+ abstract fun bindCardRepository(memoryCardRepository: JSONCardRepository): CardRepository
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/dagger/CardGridSubcomponent.kt b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/dagger/CardGridSubcomponent.kt
new file mode 100644
index 00000000..56c08b17
--- /dev/null
+++ b/app/src/main/java/com/nielsmasdorp/heartstone/presentation/card/grid/dagger/CardGridSubcomponent.kt
@@ -0,0 +1,12 @@
+package com.nielsmasdorp.heartstone.presentation.card.grid.dagger
+
+import com.nielsmasdorp.heartstone.presentation.card.grid.CardGridFragment
+import dagger.Subcomponent
+import dagger.android.AndroidInjector
+
+@Subcomponent
+interface CardGridSubcomponent : AndroidInjector {
+
+ @Subcomponent.Builder
+ abstract class Builder : AndroidInjector.Builder()
+}
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 00000000..c7bd21db
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+
+
+
+
+