Starter project

kozmi55 · kozmi55 · commit 388cc185ced4 · 2017-07-28T10:21:17.000+02:00
diff --git a/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/di/modules/ApplicationModule.kt b/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/di/modules/ApplicationModule.kt
@@ -2,7 +2,6 @@ package com.example.tamaskozmer.kotlinrxexample.di.modules
 
 import com.example.tamaskozmer.kotlinrxexample.CustomApplication
 import com.example.tamaskozmer.kotlinrxexample.model.UserRepository
-import com.example.tamaskozmer.kotlinrxexample.model.services.QuestionService
 import com.example.tamaskozmer.kotlinrxexample.model.services.UserService
 import com.google.gson.Gson
 import dagger.Module
@@ -31,6 +30,5 @@ class ApplicationModule(val application: CustomApplication) {
     @Singleton
     fun provideUserRepository(retrofit: Retrofit) =
             UserRepository(
-                    retrofit.create(UserService::class.java),
-                    retrofit.create(QuestionService::class.java))
+                    retrofit.create(UserService::class.java))
 }
diff --git a/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/model/UserRepository.kt b/app/src/main/java/com/example/tamaskozmer/kotlinrxexample/model/UserRepository.kt
@@ -1,67 +1,22 @@
 package com.example.tamaskozmer.kotlinrxexample.model
 
-import com.example.tamaskozmer.kotlinrxexample.model.entities.*
-import com.example.tamaskozmer.kotlinrxexample.model.services.QuestionService
+import com.example.tamaskozmer.kotlinrxexample.model.entities.DetailsModel
 import com.example.tamaskozmer.kotlinrxexample.model.services.UserService
 import io.reactivex.Single
-import io.reactivex.functions.Function3
 
 /**
  * Created by Tamas_Kozmer on 7/4/2017.
  */
 class UserRepository(
-        private val userService: UserService,
-        private val questionService: QuestionService) {
+        private val userService: UserService) {
 
     fun getUsers(page: Int) = userService.getUsers(page)
 
     fun getDetails(userId: Long) : Single<DetailsModel> {
-        return Single.zip(
-                userService.getQuestionsByUser(userId),
-                getTitlesForAnswers(userId),
-                userService.getFavoritesByUser(userId),
-                Function3<QuestionListModel, List<AnswerViewModel>, QuestionListModel, DetailsModel>
-                { questions, answers, favorites ->
-                    createDetailsModel(questions, answers, favorites) })
-    }
-
-    private fun getTitlesForAnswers(userId: Long) : Single<List<AnswerViewModel>> {
-        return userService.getAnswersByUser(userId)
-                .flatMap { answerListModel: AnswerListModel? ->
-                    mapAnswersToAnswersWithTitle(answerListModel?.items ?: emptyList()) }
-    }
-
-    private fun mapAnswersToAnswersWithTitle(answers: List<Answer>): Single<List<AnswerViewModel>> {
-        val processedAnswers = answers
-                .filter { it.accepted }
-                .take(3)
-
-        val ids = processedAnswers
-                .map { it.questionId.toString() }
-                .joinToString(separator = ";")
-
-        val questionsListModel = questionService.getQuestionById(ids)
-
-        return questionsListModel
-                .flatMap { questionListModel: QuestionListModel? -> Single.just(questionListModel?.items) }
-                .map { questions: List<Question>? -> addTitlesToAnswers(processedAnswers, questions?: emptyList()) }
-    }
-
-    private fun addTitlesToAnswers(answers: List<Answer>, questions: List<Question>) : List<AnswerViewModel> {
-        return answers.map { (answerId, questionId, score, accepted) ->
-            val question = questions.find { it.questionId == questionId }
-            AnswerViewModel(answerId, score, accepted, question?.title ?: "Unknown")
+        // TODO
+        return Single.create { emitter ->
+            val detailsModel = DetailsModel(emptyList(), emptyList(), emptyList())
+            emitter.onSuccess(detailsModel)
         }
     }
-
-    private fun createDetailsModel(questionsModel: QuestionListModel?, answers: List<AnswerViewModel>,
-                                   favoritesModel: QuestionListModel?): DetailsModel {
-        val questions = (questionsModel?.items ?: emptyList())
-                .take(3)
-
-        val favorites = (favoritesModel?.items ?: emptyList())
-                .take(3)
-
-        return DetailsModel(questions, answers, favorites)
-    }
 }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha5'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.0.0-alpha5'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.0.0-alpha8'`
`11`	`11`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`