A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
change domain module to java module
+15
-15
+7
core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt
+7
core/src/main/java/com/example/util/simpletimetracker/core/mapper/AppColorMapperImpl.kt
···
1
1
package com.example.util.simpletimetracker.core.mapper
2
2
3
+
import android.graphics.Color
3
4
import androidx.annotation.ColorInt
4
5
import com.example.util.simpletimetracker.core.R
5
6
import com.example.util.simpletimetracker.core.repo.ResourceRepo
···
17
18
} else {
18
19
ColorMapper.getAvailableColors().getOrNull(color.colorId)?.let(resourceRepo::getColor)
19
20
} ?: resourceRepo.getColor(R.color.black)
21
+
}
22
+
23
+
override fun mapToHsv(@ColorInt colorInt: Int): FloatArray {
24
+
val hsv = FloatArray(3)
25
+
Color.colorToHSV(colorInt, hsv)
26
+
return hsv
20
27
}
21
28
}
+5
-11
domain/build.gradle.kts
+5
-11
domain/build.gradle.kts
···
1
-
import com.example.util.simpletimetracker.Base
2
1
import com.example.util.simpletimetracker.Deps
3
2
4
3
plugins {
5
-
id("com.android.library") // TODO java library
6
-
id("kotlin-android")
7
-
id("kotlin-kapt")
4
+
id("java-library")
5
+
id("kotlin")
8
6
}
9
7
10
-
android {
11
-
compileSdkVersion(Base.currentSDK)
12
-
13
-
defaultConfig {
14
-
minSdkVersion(Base.minSDK)
15
-
targetSdkVersion(Base.currentSDK)
16
-
}
8
+
java {
9
+
sourceCompatibility = JavaVersion.VERSION_1_8
10
+
targetCompatibility = JavaVersion.VERSION_1_8
17
11
}
18
12
19
13
dependencies {
-1
domain/src/main/AndroidManifest.xml
-1
domain/src/main/AndroidManifest.xml
···
1
-
<manifest package="com.example.util.simpletimetracker.domain" />
+1
-3
domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RecordTypeInteractor.kt
+1
-3
domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RecordTypeInteractor.kt
···
1
1
package com.example.util.simpletimetracker.domain.interactor
2
2
3
-
import android.graphics.Color
4
3
import com.example.util.simpletimetracker.domain.mapper.AppColorMapper
5
4
import com.example.util.simpletimetracker.domain.model.CardOrder
6
5
import com.example.util.simpletimetracker.domain.model.RecordType
···
96
95
type to appColorMapper.mapToColorInt(color = type.color)
97
96
}
98
97
.map { (type, colorInt) ->
99
-
val hsv = FloatArray(3)
100
-
Color.colorToHSV(colorInt, hsv)
98
+
val hsv = appColorMapper.mapToHsv(colorInt)
101
99
type to hsv
102
100
}
103
101
.sortedWith(