Skip to content

Commit e1abe07

Browse files
T8RINT8RIN
committed
move modules
1 parent ee11885 commit e1abe07

File tree

201 files changed

+112
-31244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+112
-31244
lines changed

‎app/build.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ kotlin {
4242

4343
dependencies {
4444
implementation(libs.androidxCore)
45-
implementation(libs.androidx.lifecycle.runtime.ktx)
4645
implementation(libs.androidx.activity.compose)
4746
implementation(libs.compose.ui)
4847
implementation(libs.compose.ui.graphics)
@@ -59,14 +58,11 @@ dependencies {
5958
implementation(projects.libs.ucrop)
6059
implementation(projects.libs.jhlabs)
6160

62-
implementation(projects.libs.cropper)
6361
implementation(projects.libs.avif)
6462
coreLibraryDesugaring(libs.desugaring)
6563
implementation(libs.coil)
6664
implementation(libs.coil.svg)
6765
implementation(libs.coil.compose)
68-
implementation(projects.libs.zoomable)
69-
implementation(projects.libs.colordetector)
7066
}
7167

7268
val Project.javaVersion: JavaVersion

‎app/src/main/java/com/t8rin/imagetoolbox/app/MainActivity.kt‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.t8rin.imagetoolbox.app
33
import android.graphics.Bitmap
44
import android.net.Uri
55
import android.os.Bundle
6-
import android.util.Log
76
import androidx.activity.ComponentActivity
87
import androidx.activity.compose.setContent
98
import androidx.activity.enableEdgeToEdge
@@ -19,16 +18,12 @@ import androidx.compose.ui.Modifier
1918
import androidx.compose.ui.graphics.Color
2019
import androidx.compose.ui.keepScreenOn
2120
import androidx.lifecycle.ViewModel
22-
import androidx.lifecycle.lifecycleScope
2321
import coil3.SingletonImageLoader
2422
import coil3.annotation.DelicateCoilApi
2523
import coil3.imageLoader
2624
import coil3.svg.SvgDecoder
2725
import coil3.util.DebugLogger
28-
import com.smarttoolfactory.colordetector.parser.ColorNameParser
29-
import com.smarttoolfactory.colordetector.util.ColorUtil
3026
import com.t8rin.imagetoolbox.app.ui.theme.ImageToolboxLibsTheme
31-
import kotlinx.coroutines.launch
3227

3328
class MainActivity : ComponentActivity() {
3429

@@ -55,15 +50,15 @@ class MainActivity : ComponentActivity() {
5550
@OptIn(DelicateCoilApi::class, ExperimentalStdlibApi::class)
5651
override fun onCreate(savedInstanceState: Bundle?) {
5752
super.onCreate(savedInstanceState)
58-
lifecycleScope.launch {
59-
ColorNameParser.init(application)
60-
61-
Log.d("TEST_COLOR", ColorNameParser.parseColorName(Color(0xFFFFDDEE)))
62-
Log.d(
63-
"TEST_COLOR",
64-
ColorUtil.colorToHex(ColorNameParser.parseColorFromNameSingle("Transparent pink"))
65-
)
66-
}
53+
// lifecycleScope.launch {
54+
// ColorNameParser.init(application)
55+
//
56+
// Log.d("TEST_COLOR", ColorNameParser.parseColorName(Color(0xFFFFDDEE)))
57+
// Log.d(
58+
// "TEST_COLOR",
59+
// ColorUtil.colorToHex(ColorNameParser.parseColorFromNameSingle("Transparent pink"))
60+
// )
61+
// }
6762
enableEdgeToEdge()
6863

6964
// testPalette()

‎app/src/main/java/com/t8rin/imagetoolbox/app/RotationCropHypothesis.kt‎

Lines changed: 103 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
1-
package com.t8rin.imagetoolbox.app
2-
3-
import android.graphics.Bitmap
4-
import android.graphics.BitmapFactory
5-
import androidx.activity.compose.rememberLauncherForActivityResult
6-
import androidx.activity.result.PickVisualMediaRequest
7-
import androidx.activity.result.contract.ActivityResultContracts
8-
import androidx.compose.foundation.layout.Column
9-
import androidx.compose.foundation.layout.Row
10-
import androidx.compose.foundation.layout.fillMaxSize
11-
import androidx.compose.foundation.layout.padding
12-
import androidx.compose.material3.Button
13-
import androidx.compose.material3.Text
14-
import androidx.compose.runtime.Composable
15-
import androidx.compose.runtime.getValue
16-
import androidx.compose.runtime.mutableStateOf
17-
import androidx.compose.runtime.remember
18-
import androidx.compose.runtime.rememberCoroutineScope
19-
import androidx.compose.runtime.setValue
20-
import androidx.compose.ui.Modifier
21-
import androidx.compose.ui.graphics.asAndroidBitmap
22-
import androidx.compose.ui.graphics.asImageBitmap
23-
import androidx.compose.ui.unit.dp
24-
import com.smarttoolfactory.cropper.ImageCropper
25-
import com.smarttoolfactory.cropper.model.AspectRatio
26-
import com.smarttoolfactory.cropper.model.OutlineType
27-
import com.smarttoolfactory.cropper.model.RectCropShape
28-
import com.smarttoolfactory.cropper.settings.CropDefaults
29-
import com.smarttoolfactory.cropper.settings.CropOutlineProperty
30-
import kotlinx.coroutines.launch
31-
32-
@Composable
33-
fun MainActivity.RotationCropHypothesis() {
34-
var bitmap by remember {
35-
mutableStateOf<Bitmap?>(null)
36-
}
37-
val scope = rememberCoroutineScope()
38-
val imagePicker =
39-
rememberLauncherForActivityResult(contract = ActivityResultContracts.PickVisualMedia()) {
40-
scope.launch {
41-
bitmap = BitmapFactory.decodeStream(
42-
it?.let { it1 ->
43-
contentResolver.openInputStream(it1)
44-
}
45-
)
46-
}
47-
}
48-
49-
val pickImage: () -> Unit = {
50-
imagePicker.launch(PickVisualMediaRequest())
51-
}
52-
53-
var crop by remember {
54-
mutableStateOf(false)
55-
}
56-
57-
Column(
58-
modifier = Modifier
59-
.fillMaxSize()
60-
.padding(24.dp)
61-
) {
62-
val img = remember(bitmap) { bitmap?.asImageBitmap() }
63-
img?.let { imageBitmap ->
64-
ImageCropper(
65-
imageBitmap = imageBitmap,
66-
cropProperties = CropDefaults.properties(
67-
cropOutlineProperty = CropOutlineProperty(
68-
OutlineType.Rect,
69-
RectCropShape(
70-
id = 0,
71-
title = OutlineType.Rect.name
72-
)
73-
),
74-
fling = true,
75-
rotatable = true,
76-
aspectRatio = AspectRatio(1 / 2f),
77-
fixedAspectRatio = true
78-
),
79-
crop = crop,
80-
onCropStart = { },
81-
onZoomChange = {},
82-
onCropSuccess = {
83-
bitmap = it.asAndroidBitmap()
84-
crop = false
85-
},
86-
modifier = Modifier.weight(1f)
87-
)
88-
}
89-
90-
Row {
91-
Button(onClick = pickImage) {
92-
Text("Pick")
93-
}
94-
Button(
95-
onClick = {
96-
crop = true
97-
}
98-
) {
99-
Text("Crop")
100-
}
101-
}
102-
}
103-
}
1+
//package com.t8rin.imagetoolbox.app
2+
//
3+
//import android.graphics.Bitmap
4+
//import android.graphics.BitmapFactory
5+
//import androidx.activity.compose.rememberLauncherForActivityResult
6+
//import androidx.activity.result.PickVisualMediaRequest
7+
//import androidx.activity.result.contract.ActivityResultContracts
8+
//import androidx.compose.foundation.layout.Column
9+
//import androidx.compose.foundation.layout.Row
10+
//import androidx.compose.foundation.layout.fillMaxSize
11+
//import androidx.compose.foundation.layout.padding
12+
//import androidx.compose.material3.Button
13+
//import androidx.compose.material3.Text
14+
//import androidx.compose.runtime.Composable
15+
//import androidx.compose.runtime.getValue
16+
//import androidx.compose.runtime.mutableStateOf
17+
//import androidx.compose.runtime.remember
18+
//import androidx.compose.runtime.rememberCoroutineScope
19+
//import androidx.compose.runtime.setValue
20+
//import androidx.compose.ui.Modifier
21+
//import androidx.compose.ui.graphics.asAndroidBitmap
22+
//import androidx.compose.ui.graphics.asImageBitmap
23+
//import androidx.compose.ui.unit.dp
24+
//import com.smarttoolfactory.cropper.ImageCropper
25+
//import com.smarttoolfactory.cropper.model.AspectRatio
26+
//import com.smarttoolfactory.cropper.model.OutlineType
27+
//import com.smarttoolfactory.cropper.model.RectCropShape
28+
//import com.smarttoolfactory.cropper.settings.CropDefaults
29+
//import com.smarttoolfactory.cropper.settings.CropOutlineProperty
30+
//import kotlinx.coroutines.launch
31+
//
32+
//@Composable
33+
//fun MainActivity.RotationCropHypothesis() {
34+
// var bitmap by remember {
35+
// mutableStateOf<Bitmap?>(null)
36+
// }
37+
// val scope = rememberCoroutineScope()
38+
// val imagePicker =
39+
// rememberLauncherForActivityResult(contract = ActivityResultContracts.PickVisualMedia()) {
40+
// scope.launch {
41+
// bitmap = BitmapFactory.decodeStream(
42+
// it?.let { it1 ->
43+
// contentResolver.openInputStream(it1)
44+
// }
45+
// )
46+
// }
47+
// }
48+
//
49+
// val pickImage: () -> Unit = {
50+
// imagePicker.launch(PickVisualMediaRequest())
51+
// }
52+
//
53+
// var crop by remember {
54+
// mutableStateOf(false)
55+
// }
56+
//
57+
// Column(
58+
// modifier = Modifier
59+
// .fillMaxSize()
60+
// .padding(24.dp)
61+
// ) {
62+
// val img = remember(bitmap) { bitmap?.asImageBitmap() }
63+
// img?.let { imageBitmap ->
64+
// ImageCropper(
65+
// imageBitmap = imageBitmap,
66+
// cropProperties = CropDefaults.properties(
67+
// cropOutlineProperty = CropOutlineProperty(
68+
// OutlineType.Rect,
69+
// RectCropShape(
70+
// id = 0,
71+
// title = OutlineType.Rect.name
72+
// )
73+
// ),
74+
// fling = true,
75+
// rotatable = true,
76+
// aspectRatio = AspectRatio(1 / 2f),
77+
// fixedAspectRatio = true
78+
// ),
79+
// crop = crop,
80+
// onCropStart = { },
81+
// onZoomChange = {},
82+
// onCropSuccess = {
83+
// bitmap = it.asAndroidBitmap()
84+
// crop = false
85+
// },
86+
// modifier = Modifier.weight(1f)
87+
// )
88+
// }
89+
//
90+
// Row {
91+
// Button(onClick = pickImage) {
92+
// Text("Pick")
93+
// }
94+
// Button(
95+
// onClick = {
96+
// crop = true
97+
// }
98+
// ) {
99+
// Text("Crop")
100+
// }
101+
// }
102+
// }
103+
//}

‎build-logic/convention/src/main/kotlin/com/t8rin/imagetoolbox/ConfigureCompose.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ internal fun Project.configureCompose(
3434

3535
dependencies {
3636
implementation(libs.androidx.material3)
37-
implementation(libs.androidx.material)
38-
implementation(libs.icons.extended)
3937
}
4038
}
4139

‎gradle/libs.versions.toml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@ detektCompose = "0.5.6"
1616
#noinspection NewerVersionAvailable
1717
composeCharts = "0.1.11"
1818

19-
composeColorfulSliders = "1.2.2"
20-
paletteKtx = "1.0.0"
21-
2219
appCompat = "1.7.1"
2320
androidxCore = "1.18.0"
24-
androidxLifecycle = "2.10.0"
2521
desugaring = "2.1.5"
2622

2723
material3 = "1.5.0-alpha16"
2824
composeVersion = "1.11.0-beta02"
29-
materialIconsExtended = "1.7.8"
3025

3126
okhttp = "5.3.2"
3227
coil = "3.4.0"
@@ -50,35 +45,23 @@ animation-avif = { module = "com.github.penfeizhou.android.animation:avif", vers
5045
transition = { module = "androidx.transition:transition", version.ref = "transition" }
5146
exifinterface = { module = "androidx.exifinterface:exifinterface", version.ref = "exifinterface" }
5247

53-
icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
54-
androidx-material = { module = "androidx.compose.material:material", version.ref = "composeVersion" }
5548
androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
5649
compose-charts = { module = "io.github.ehsannarmani:compose-charts", version.ref = "composeCharts" }
5750
desugaring = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugaring" }
5851
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
5952
detekt-compose = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" }
6053

61-
androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "paletteKtx" }
62-
compose-colorful-sliders = { module = "com.github.SmartToolFactory:Compose-Colorful-Sliders", version.ref = "composeColorfulSliders" }
6354
appCompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompat" }
6455
androidxCore = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
65-
lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidxLifecycle" }
66-
viewModelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" }
6756

6857
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
6958
coil-svg = { module = "io.coil-kt.coil3:coil-svg", version.ref = "coil" }
7059
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
7160
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
7261

73-
compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "composeVersion" }
74-
compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeVersion" }
75-
compose-animation-core = { module = "androidx.compose.animation:animation-core", version.ref = "composeVersion" }
7662
compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "composeVersion" }
7763
compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "composeVersion" }
78-
compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeVersion" }
79-
compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "composeVersion" }
8064

81-
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
8265
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
8366
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "composeVersion" }
8467

‎libs/colordetector/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎libs/colordetector/build.gradle.kts‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎libs/colordetector/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎libs/colordetector/src/main/assets/color_names.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)