Commit d88818dd by Aleksandr Tamakov

Clean code

parent 97a854e8
......@@ -4,9 +4,6 @@ import com.isidroid.job.data.mapper.transform
import com.isidroid.job.data.source.remote.api.ApiJob
import com.isidroid.job.data.source.remote.api.request.CreateJobRequest
import com.isidroid.job.model.PrintJob
import com.isidroid.network.ProgressEmittingRequestBody
import okhttp3.MultipartBody
import java.io.File
class JobNetworkSource(private val api: ApiJob) {
fun createJob(spotId: String, profileId: String, clientName: String): PrintJob? {
......
......@@ -2,16 +2,9 @@ package com.isidroid.job.data.source.remote.api
import com.isidroid.job.data.source.remote.api.request.CreateJobRequest
import com.isidroid.job.data.source.remote.api.response.CreateJobResponse
import okhttp3.MultipartBody
import okhttp3.ResponseBody
import retrofit2.Call
import retrofit2.http.Body
import retrofit2.http.Header
import retrofit2.http.Multipart
import retrofit2.http.PATCH
import retrofit2.http.POST
import retrofit2.http.Part
import retrofit2.http.Path
interface ApiJob {
@POST("api/job")
......
package com.isidroid.job.data.source.remote.api.response
import com.google.gson.annotations.SerializedName
import java.io.Serial
import java.util.Date
data class CreateJobResponse(
data class CreateJobResponse(
@SerializedName("id") val id: String,
@SerializedName("access_code") val accessCode: String,
@SerializedName("access_token") val accessToken: String,
......
......@@ -4,8 +4,8 @@ import android.content.Context
import com.google.gson.Gson
import com.isidroid.core.DiDebuggableBuild
import com.isidroid.core.DiMock
import com.isidroid.job.data.source.local.JobLocalSource
import com.isidroid.job.data.source.local.JobDao
import com.isidroid.job.data.source.local.JobLocalSource
import com.isidroid.job.data.source.remote.JobNetworkSource
import com.isidroid.job.data.source.remote.MockInterceptor
import com.isidroid.job.data.source.remote.api.ApiJob
......
package com.isidroid.job.repository
import androidx.compose.runtime.produceState
import com.isidroid.job.CreateJobException
import com.isidroid.job.constant.JobStatus
import com.isidroid.job.data.source.local.JobLocalSource
import com.isidroid.job.data.source.remote.JobNetworkSource
import com.isidroid.job.model.PrintJob
import java.io.File
internal class JobRepositoryImpl(
internal class JobRepositoryImpl(
private val jobNetworkSource: JobNetworkSource,
private val jobLocalSource: JobLocalSource,
) : JobRepository {
......
......@@ -4,7 +4,6 @@ import android.content.Context
import com.google.gson.Gson
import com.isidroid.core.DiDebuggableBuild
import com.isidroid.core.DiMock
import com.isidroid.job.data.source.remote.api.ApiJob
import com.isidroid.job.repository.JobRepository
import com.isidroid.job_sender.SendJobEventCollectorFlow
import com.isidroid.job_sender.data.source.local.SendJobDao
......
......@@ -3,14 +3,7 @@ package com.isidroid.job_sender.domain.use_case
import com.isidroid.core.DiMock
import com.isidroid.job.constant.JobStatus
import com.isidroid.job.constant.SendJobStatus
import com.isidroid.job.repository.JobRepository
import com.isidroid.job_sender.SendJobEventCollectorFlow
import com.isidroid.job_sender.data.source.local.SendJobLocalSource
import com.isidroid.job_sender.ext.createRenderItems
import com.isidroid.job_sender.repository.JobSendRepository
import com.isidroid.rendering.repository.RenderRepository
import com.isidroid.spot.repository.SpotRepository
import kotlinx.coroutines.delay
import javax.inject.Inject
import javax.inject.Singleton
......
......@@ -6,16 +6,12 @@ import com.itextpdf.layout.Document
import com.itextpdf.layout.element.Paragraph
import org.apache.poi.hwpf.HWPFDocument
import org.apache.poi.hwpf.extractor.WordExtractor
import org.apache.poi.openxml4j.opc.OPCPackage
import org.apache.poi.xwpf.usermodel.XWPFDocument
import org.apache.poi.xwpf.usermodel.XWPFParagraph
import timber.log.Timber
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
fun convertDocToPdf(docFile: File): File {
val pdfFile = File(docFile.parent, "${docFile.nameWithoutExtension}.pdf")
......
......@@ -6,7 +6,6 @@ import android.graphics.Bitmap
import android.graphics.Bitmap.Config
import android.graphics.BitmapFactory
import android.graphics.Matrix
import androidx.core.graphics.scale
import com.isidroid.rendering.constant.PrintOrientation
import com.isidroid.rendering.constant.PrintSize
import com.isidroid.rendering.model.PrintCanvas
......
package com.isidroid.session.data.source.network
import android.content.Context
import com.isidroid.network.QUERY_MOCK_CODE
import com.isidroid.network.QUERY_MOCK_PARAM
import com.isidroid.network.ext.createMockResponse
import com.isidroid.utils.assetsFileContent
import okhttp3.Interceptor
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.Protocol
import okhttp3.Request
import okhttp3.Response
import okhttp3.ResponseBody.Companion.toResponseBody
class MockInterceptor(private val context: Context, private val isMock: Boolean) : Interceptor {
override fun intercept(chain: Interceptor.Chain): Response {
......
package com.isidroid.spot.data.mapper
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.data.source.remote.response.ProfileResponse
import com.isidroid.spot.model.PrintProfile
internal fun ProfileResponse.transform(spotId: String, index: Int): PrintProfile {
val printWidth = options.paperSize.width - options.paperSize.marginLeft - options.paperSize.marginRight
......
package com.isidroid.spot.data.mapper
import com.isidroid.spot.data.source.remote.response.SpotResponse
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.model.RichSpot
import com.isidroid.spot.model.Spot
import com.isidroid.spot.data.source.remote.response.SpotResponse
internal fun SpotResponse.transform(): Spot = Spot(
id = id,
......
......@@ -5,8 +5,6 @@ import androidx.room.Delete
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.model.RichSpot
import com.isidroid.spot.model.Spot
@Dao
......
package com.isidroid.spot.data.source.local.source
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.data.source.local.dao.PrintProfileDao
import com.isidroid.spot.model.PrintProfile
import javax.inject.Inject
import javax.inject.Singleton
......
package com.isidroid.spot.data.source.local.source
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.model.Spot
import com.isidroid.spot.data.source.local.dao.SpotDao
import com.isidroid.spot.model.Spot
import javax.inject.Inject
import javax.inject.Singleton
......
package com.isidroid.spot.data.source.remote.request
import com.google.gson.annotations.SerializedName
import java.io.Serial
class FindSpotRequest(
@SerializedName("lat") val lat: Double = 0.0,
......
......@@ -2,9 +2,9 @@ package com.isidroid.spot.data.source.remote.source
import com.isidroid.spot.data.mapper.transform
import com.isidroid.spot.data.mapper.transformToRichSpot
import com.isidroid.spot.model.RichSpot
import com.isidroid.spot.data.source.remote.ApiSpot
import com.isidroid.spot.data.source.remote.request.FindSpotRequest
import com.isidroid.spot.model.RichSpot
import timber.log.Timber
import javax.inject.Inject
import javax.inject.Singleton
......
package com.isidroid.spot.repository
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.model.RichSpot
interface ActiveSpotRepository {
......
package com.isidroid.spot.repository
import android.content.SharedPreferences
import com.isidroid.spot.model.PrintProfile
import com.isidroid.spot.model.RichSpot
import com.isidroid.spot.data.source.local.source.PrintProfileLocalSource
import com.isidroid.spot.data.source.local.source.SpotLocalSource
import com.isidroid.spot.model.RichSpot
private const val ACTIVE_SPOT = "ACTIVE_SPOT"
private const val ACTIVE_PRINT_PROFILE = "ACTIVE_PRINT_PROFILE"
......
......@@ -3,10 +3,10 @@ package com.isidroid.spot.repository
import com.isidroid.spot.SpotListException
import com.isidroid.spot.data.mapper.convertToMap
import com.isidroid.spot.data.mapper.transformToRichSpot
import com.isidroid.spot.model.RichSpot
import com.isidroid.spot.data.source.local.source.PrintProfileLocalSource
import com.isidroid.spot.data.source.local.source.SpotLocalSource
import com.isidroid.spot.data.source.remote.source.SpotNetworkSource
import com.isidroid.spot.model.RichSpot
internal class SpotRepositoryImpl(
private val spotNetworkSource: SpotNetworkSource,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment