load images by category #288

kdiakonidze · 2022-12-18T20:46:38Z

added unsplash Api for searching images associated to category

# Conflicts: # testomania/src/main/java/com/earth/testomania/home_screen/presentation/HomeScreenViewModel.kt

Nodrex · 2022-12-21T20:04:18Z

testomania/build.gradle.kts

@@ -23,6 +23,7 @@ android {
        vectorDrawables {
            useSupportLibrary = true
        }
+        buildConfigField("String", "UNSPLASH_ACCESS_KEY", "\"G81G0y0nGVostWCSStr1yTiB6tWUsIWi-ZQYja9td5I\"")


Will it be visible in the request?

yes, it will

Nodrex · 2022-12-21T20:10:36Z

testomania/src/main/java/com/earth/testomania/common/unsplash/UnsplashApi.kt

+import retrofit2.http.Headers
+import retrofit2.http.Query
+
+interface UnsplashApi {


Please pull my changes and let's put Apis together.
I created an image folder under apis folder, pleas put this API there, similarly to Quiz API

Nodrex · 2022-12-21T20:13:37Z

testomania/src/main/java/com/earth/testomania/common/unsplash/UnsplashRepo.kt

+import javax.inject.Inject
+
+
+class UnsplashRepo @Inject constructor(private val api: UnsplashApi) {


Please create interface as we do for clean architecture

Nodrex · 2022-12-21T20:18:46Z

testomania/src/main/java/com/earth/testomania/quiz_categories/DestinationViewModel.kt

+    }
+
+    private fun getIllustration(categoryName: String) = viewModelScope.launch {
+        val catPrefix = "Entertainment: "


No need. If you pull my changes, I am removing this "Entertainment: " string in convertation prosses

Nodrex · 2022-12-21T20:22:38Z

testomania/src/main/java/com/earth/testomania/quiz_categories/DestinationViewModel.kt

@@ -49,6 +64,7 @@ abstract class DestinationViewModel(
                when (it) {
                    is DataState.Success -> it.payload?.apply {
                        _data.addAll(this)
+                        getIllustration(this.first().quiz.category)


I guess we need iteration and we need to get image for every quiz

Nodrex · 2022-12-21T20:27:12Z

testomania/src/main/java/com/earth/testomania/quiz_categories/AnimalsDestination.kt

 ) : DestinationViewModel(
    useCase,
-    dispatcher
+    dispatcher,
+    unsplashRepo


Since unsplashRepo is the same for every destination (category) can't we inject it directly into DestinationViewModel instead of sending it as a parameter and duplicating it numerous times?
I am not sure that we can, but maybe you know some solutions guys.
What do you think?
@kdiakonidze @shalva97 @Vazhapp

# Conflicts: # testomania/src/main/java/com/earth/testomania/apis/opentdb/data/source/OpenTdbQuizApi.kt # testomania/src/main/java/com/earth/testomania/apis/opentdb/data/source/remote/dto/OpenTdbQuizDTO.kt # testomania/src/main/java/com/earth/testomania/apis/opentdb/data/source/remote/dto/ResultDto.kt # testomania/src/main/java/com/earth/testomania/apis/opentdb/di/openTDBModule.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/opentdb/data/source/OpenTdbQuizApi.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/opentdb/data/source/remote/dto/OpenTdbQuizDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/opentdb/data/source/remote/dto/ResultDto.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/data/repository/QuizRepositoryImpl.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/data/source/QuizApi.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/data/source/remote/dto/AnswersDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/data/source/remote/dto/CorrectAnswersDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/data/source/remote/dto/TagDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/data/source/remote/dto/TechQuizDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/di/QuizApiModule.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/domain/model/AnswerKey.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/domain/model/QuizApiCategory.kt # testomania/src/main/java/com/earth/testomania/apis/quiz/quizapi/domain/model/TechCategory.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/data/repository/QuizRepositoryImpl.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/data/source/QuizApi.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/data/source/remote/dto/AnswersDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/data/source/remote/dto/CorrectAnswersDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/data/source/remote/dto/TagDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/data/source/remote/dto/TechQuizDTO.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/di/QuizApiModule.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/domain/model/AnswerKey.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/domain/model/QuizApiCategory.kt # testomania/src/main/java/com/earth/testomania/apis/quizapi/domain/model/TechCategory.kt # testomania/src/main/java/com/earth/testomania/home_screen/presentation/HomeScreen.kt # testomania/src/main/java/com/earth/testomania/home_screen/presentation/HomeScreenViewModel.kt # testomania/src/main/java/com/earth/testomania/opentdb/OpenTdbQuizApi.kt # testomania/src/main/java/com/earth/testomania/opentdb/models/OpenTdbQuizDTO.kt # testomania/src/main/java/com/earth/testomania/opentdb/models/ResultDto.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/AnimalsDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/ArtDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/BoardGamesDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/BookDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/CelebritiesDestina.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/ComicsDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/DestinationViewModel.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/DevOpsDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/DockerDestination .kt # testomania/src/main/java/com/earth/testomania/quiz_categories/GadgetsDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/GeographyDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/HTMLDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/HistoryDestinatio.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/InformationalTechnologiesDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/LinuxDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/MathDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/MoviesDestination .kt # testomania/src/main/java/com/earth/testomania/quiz_categories/MusicDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/MySqlDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/MythDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/NatureDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/PHPDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/PoliticsDestinatio.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/ProgramingDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/SQLDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/SportsDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/TVDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/VehiclesDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/VideoGamesDestination.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/usecase/GetQuizUseCase.kt # testomania/src/main/java/com/earth/testomania/quiz_categories/viewmodel/DestinationViewModel.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/CategoryIllustration.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ErrorScreen.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/LoadingScreen.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/MainQuizScreen.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/QuizAnswerUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/QuizExplanationUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/QuizOverallProgressUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/QuizUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/CategoryIllustration.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/ErrorScreen.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/LoadingScreen.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/QuizAnswerUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/QuizExplanationUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/QuizOverallProgressUI.kt # testomania/src/main/java/com/earth/testomania/quiz_screen/ui_components/QuizUI.kt # testomania/src/main/java/com/earth/testomania/technical/data/repository/QuizRepositoryImpl.kt # testomania/src/main/java/com/earth/testomania/technical/data/source/remote/QuizApi.kt # testomania/src/main/java/com/earth/testomania/technical/data/source/remote/dto/AnswersDTO.kt # testomania/src/main/java/com/earth/testomania/technical/data/source/remote/dto/CorrectAnswersDTO.kt # testomania/src/main/java/com/earth/testomania/technical/data/source/remote/dto/TagDTO.kt # testomania/src/main/java/com/earth/testomania/technical/data/source/remote/dto/TechQuizDTO.kt # testomania/src/main/java/com/earth/testomania/technical/di/TechnicalTestsModule.kt # testomania/src/main/java/com/earth/testomania/technical/domain/model/AnswerKey.kt # testomania/src/main/java/com/earth/testomania/technical/domain/model/QuizCategory.kt # testomania/src/main/java/com/earth/testomania/technical/domain/model/TechCategory.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/QuizViewModel.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/CategoryIllustration.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/ErrorScreen.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/LoadingScreen.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/QuizAnswerUI.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/QuizExplanationUI.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/QuizOverallProgressUI.kt # testomania/src/main/java/com/earth/testomania/technical/presentation/ui_parts/QuizUI.kt # testomania/src/main/res/values/strings.xml

shalva97 and others added 23 commits December 11, 2022 17:55

added example screen

7f420ff

replaced viewmodel inside TechnicalTestsScreen

33806d4

working on generic screen

4a37ba5

fix request not being send properly

cefde4d

also map correct answers

a381182

cleanup

53f6b6e

Big refactoring

d3a95f3

Mini bug fixes

00f79fb

Added music category

fa1727d

Adding categories

e16f8c5

More categories

3b1e7ef

Reformatted code

dada14c

Merge branch 'main' into new_categories

f3f3b50

Manual merge

2bee0f0

Huge refactoring

94cf6f5

Auto reformat

0b36a1b

Fixed lint problem

e4a1a8d

Added 2 more categories and some refactoring

3f8fa3b

Added all categories

89ae105

Removed unused code/comments

ce3b9d2

added unsplash api for retrieving category photos

23b88ad

Merge branch 'new_categories' into unsplash-images-api

3021601

# Conflicts: # testomania/src/main/java/com/earth/testomania/home_screen/presentation/HomeScreenViewModel.kt

load images by category name

d51298b

Nodrex requested review from Nodrex, shalva97 and Vazhapp and removed request for Nodrex and shalva97 December 19, 2022 07:28

Nodrex requested review from likaGlonti, nmgalo and tkhat December 19, 2022 07:28

Nodrex reviewed Dec 21, 2022

View reviewed changes

Nodrex requested changes Dec 21, 2022

View reviewed changes

Base automatically changed from new_categories to main January 15, 2023 14:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

load images by category #288

load images by category #288

kdiakonidze commented Dec 18, 2022

Nodrex Dec 21, 2022

kdiakonidze Jan 24, 2023

Nodrex Jan 25, 2023

Nodrex Dec 21, 2022

Nodrex Dec 21, 2022

Nodrex Dec 21, 2022

Nodrex Dec 21, 2022

Nodrex Dec 21, 2022

		import javax.inject.Inject


		class UnsplashRepo @Inject constructor(private val api: UnsplashApi) {

load images by category #288

Are you sure you want to change the base?

load images by category #288

Conversation

kdiakonidze commented Dec 18, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment