Fix 38: search UI

.gitignore

@@ -1,5 +1,6 @@
 # IntelliJ
 *.iml
+/.idea
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

app/build.gradle.kts

@@ -1,8 +1,11 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.ksp)
+
     id("ru.practicum.android.diploma.plugins.developproperties")
 }
 
@@ -11,6 +14,7 @@ android {
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
+
         applicationId = "ru.practicum.android.diploma"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
@@ -34,6 +38,7 @@ android {
     }
     buildFeatures {
         buildConfig = true
+        compose = true
     }
 }
 
@@ -44,14 +49,59 @@ kotlin {
 }
 
 dependencies {
+    // Core
     implementation(libs.core.ktx)
     implementation(libs.appcompat)
+    implementation(libs.legacy.support.v4)
+    implementation(libs.lifecycle.livedata.ktx)
+    implementation(libs.lifecycle.viewmodel.ktx)
 
     // UI layer libraries
     implementation(libs.material)
     implementation(libs.constraintlayout)
+    implementation(libs.firebase.crashlytics.buildtools)
+
+    implementation(libs.coroutines.core)
+    implementation(libs.coroutines.android)
+
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.coil)
+    implementation("io.coil-kt.coil3:coil-network-okhttp:3.1.0")
+    implementation(libs.coil.svg)
+    implementation(libs.compose.ui)
+    implementation(libs.androidx.viewmodel)
 
     testImplementation(libs.junit4)
+    testImplementation(libs.coroutines.test)
+    androidTestImplementation(libs.junit.ext)
+    androidTestImplementation(libs.espresso.core)
+    implementation(libs.navigation.fragment.ktx)
+    implementation(libs.navigation.ui.ktx)
+    implementation(libs.fragment.ktx)
+    implementation(libs.material.v180)
+
+    implementation(libs.material3)
+    implementation(libs.ui.tooling.preview)
+    debugImplementation(libs.ui.tooling)
+    implementation(libs.activity.compose)
+    implementation(libs.lifecycle.viewmodel.compose)
+
+    // Data layer
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.converter)
+
+    ksp(libs.room.compiler)
+    implementation(libs.room.runtime)
+    implementation(libs.room.ktx)
+
+    // DI
+    implementation(libs.koin)
+
+    // Test
+    testImplementation(libs.junit4)
+    testImplementation(libs.coroutines.test)
+
+    androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation(libs.junit.ext)
     androidTestImplementation(libs.espresso.core)
 }

app/src/main/AndroidManifest.xml

@@ -2,7 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
+        android:name=".ui.root.App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -11,10 +15,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.PracticumAndroidDiploma"
+        tools:ignore="LockedOrientationActivity"
         tools:targetApi="31">
         <activity
             android:name=".ui.root.RootActivity"
-            android:exported="true">
+            android:exported="true"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -23,4 +29,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/ru/practicum/android/diploma/data/NetworkClient.kt

@@ -0,0 +1,7 @@
+package ru.practicum.android.diploma.data
+
+import ru.practicum.android.diploma.data.dto.Response
+
+interface NetworkClient {
+    suspend fun doRequest(dto: Any): Response<out Any>
+}

app/src/main/java/ru/practicum/android/diploma/data/UserDataRepositoryImpl.kt

@@ -0,0 +1,9 @@
+package ru.practicum.android.diploma.data
+
+import ru.practicum.android.diploma.BuildConfig
+import ru.practicum.android.diploma.domain.api.UserDataRepository
+
+class UserDataRepositoryImpl : UserDataRepository {
+
+    override fun getAuthToken(): String = BuildConfig.API_ACCESS_TOKEN
+}

app/src/main/java/ru/practicum/android/diploma/data/VacanciesRepositoryImpl.kt

@@ -0,0 +1,33 @@
+package ru.practicum.android.diploma.data
+
+import ru.practicum.android.diploma.data.dto.VacanciesResponse
+import ru.practicum.android.diploma.data.network.VacanciesRequest
+import ru.practicum.android.diploma.domain.api.VacanciesRepository
+import ru.practicum.android.diploma.domain.models.SearchVacanciesOutcome
+
+class VacanciesRepositoryImpl(
+    private val networkClient: NetworkClient,
+) : VacanciesRepository {
+
+    override suspend fun searchVacancies(searchText: String, page: Int): SearchVacanciesOutcome {
+        val response = networkClient.doRequest(
+            VacanciesRequest(searchText = searchText, page = page),
+        )
+        val data = response.data as? VacanciesResponse
+        return when {
+            response.resultCode != HTTP_OK || data == null -> SearchVacanciesOutcome.Error
+            else -> {
+                val domainResult = data.toDomain()
+                if (domainResult.vacancies.isEmpty()) {
+                    SearchVacanciesOutcome.Empty
+                } else {
+                    SearchVacanciesOutcome.Success(domainResult)
+                }
+            }
+        }
+    }
+
+    private companion object {
+        const val HTTP_OK = 200
+    }
+}

app/src/main/java/ru/practicum/android/diploma/data/VacancyMapper.kt

@@ -0,0 +1,30 @@
+package ru.practicum.android.diploma.data
+
+import ru.practicum.android.diploma.data.dto.VacanciesResponse
+import ru.practicum.android.diploma.data.dto.VacancyCardDto
+import ru.practicum.android.diploma.data.dto.VacancyCardSalaryDto
+import ru.practicum.android.diploma.domain.models.Salary
+import ru.practicum.android.diploma.domain.models.VacanciesSearchResult
+import ru.practicum.android.diploma.domain.models.Vacancy
+
+internal fun VacanciesResponse.toDomain(): VacanciesSearchResult = VacanciesSearchResult(
+    found = found,
+    page = page,
+    pages = pages,
+    vacancies = items.map { it.toDomain() },
+)
+
+private fun VacancyCardDto.toDomain(): Vacancy = Vacancy(
+    id = id,
+    name = name,
+    company = company,
+    city = city,
+    salary = salary?.toDomain(),
+    logo = logo,
+)
+
+private fun VacancyCardSalaryDto.toDomain(): Salary = Salary(
+    from = from,
+    to = to,
+    currency = currency,
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/Currency.kt

@@ -0,0 +1,15 @@
+package ru.practicum.android.diploma.data.dto
+
+enum class Currency {
+    RUR,
+    RUB,
+    BYR,
+    USD,
+    EUR,
+    KZT,
+    UAH,
+    AZN,
+    UZS,
+    GEL,
+    KGT
+}

app/src/main/java/ru/practicum/android/diploma/data/dto/FilterAreaDto.kt

@@ -0,0 +1,8 @@
+package ru.practicum.android.diploma.data.dto
+
+data class FilterAreaDto(
+    val id: Int,
+    val name: String,
+    val parentId: Int?,
+    val areas: List<FilterAreaDto>
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/FilterIndustryDto.kt

@@ -0,0 +1,6 @@
+package ru.practicum.android.diploma.data.dto
+
+data class FilterIndustryDto(
+    val id: Int,
+    val name: String
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/Response.kt

@@ -0,0 +1,6 @@
+package ru.practicum.android.diploma.data.dto
+
+data class Response<T>(
+    val data: T?,
+    val resultCode: Int = 0,
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/VacanciesResponse.kt

@@ -0,0 +1,8 @@
+package ru.practicum.android.diploma.data.dto
+
+data class VacanciesResponse(
+    val found: Int,
+    val pages: Int,
+    val page: Int,
+    val items: List<VacancyCardDto>
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/VacancyCardDto.kt

@@ -0,0 +1,10 @@
+package ru.practicum.android.diploma.data.dto
+
+data class VacancyCardDto(
+    val id: String,
+    val name: String,
+    val company: String?,
+    val city: String?,
+    val salary: VacancyCardSalaryDto?,
+    val logo: String?,
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/VacancyCardSalaryDto.kt

@@ -0,0 +1,7 @@
+package ru.practicum.android.diploma.data.dto
+
+data class VacancyCardSalaryDto(
+    val from: Int?,
+    val to: Int?,
+    val currency: String?
+)

app/src/main/java/ru/practicum/android/diploma/data/dto/VacancyDetailDto.kt

@@ -0,0 +1,65 @@
+package ru.practicum.android.diploma.data.dto
+
+data class VacancyDetailDto(
+    val id: String,
+    val name: String,
+    val description: String,
+    val salary: Salary?,
+    val address: Address?,
+    val experience: Experience?,
+    val schedule: Schedule?,
+    val employment: Employment?,
+    val contacts: Contacts?,
+    val employer: Employer,
+    val area: FilterAreaDto,
+    val skills: List<String>?,
+    val url: String,
+    val industry: FilterIndustryDto
+)
+
+data class Salary(
+    val from: Int?,
+    val to: Int?,
+    val currency: String?
+)
+
+data class Address(
+    val id: String,
+    val city: String,
+    val street: String,
+    val building: String,
+    val raw: String
+)
+
+data class Experience(
+    val id: String,
+    val name: String
+)
+
+data class Schedule(
+    val id: String,
+    val name: String
+)
+
+data class Employment(
+    val id: String,
+    val name: String
+)
+
+data class Contacts(
+    val id: String,
+    val name: String,
+    val email: String,
+    val phones: List<Phone>
+)
+
+data class Phone(
+    val comment: String?,
+    val formatted: String
+)
+
+data class Employer(
+    val id: String,
+    val name: String,
+    val logo: String
+)

app/src/main/java/ru/practicum/android/diploma/data/network/ApiService.kt

@@ -0,0 +1,27 @@
+package ru.practicum.android.diploma.data.network
+
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.QueryMap
+import ru.practicum.android.diploma.data.dto.FilterAreaDto
+import ru.practicum.android.diploma.data.dto.FilterIndustryDto
+import ru.practicum.android.diploma.data.dto.VacanciesResponse
+import ru.practicum.android.diploma.data.dto.VacancyDetailDto
+
+interface ApiService {
+    @GET("/areas")
+    suspend fun getAreas(): List<FilterAreaDto>
+
+    @GET("/industries")
+    suspend fun getIndustries(): List<FilterIndustryDto>
+
+    @GET("/vacancies")
+    suspend fun getVacancies(
+        @QueryMap options: Map<String, String>
+    ): VacanciesResponse
+
+    @GET("/vacancies/{id}")
+    suspend fun getVacancyDetails(
+        @Path("id") id: String
+    ): VacancyDetailDto
+}

app/src/main/java/ru/practicum/android/diploma/data/network/AreasRequest.kt

@@ -0,0 +1,3 @@
+package ru.practicum.android.diploma.data.network
+
+object AreasRequest