Skip to content

Commit da5e102

Browse files
kirilltkirillt
authored
Package renaming (#86)
* Package renaming * Folder structure changes * Update filepicker
1 parent f1b12c9 commit da5e102

39 files changed

Lines changed: 167 additions & 159 deletions

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
def password = System.getenv("ACRA_PASS") ?: ""
1717
def uri = System.getenv("ACRA_URI") ?: ""
1818

19-
applicationId "space.taran.arkretouch2"
19+
applicationId "dev.arkbuilders.arkretouch2"
2020
minSdk 26
2121
targetSdk 32
2222
versionCode 1
@@ -99,7 +99,7 @@ dependencies {
9999

100100
implementation 'com.godaddy.android.colorpicker:compose-color-picker:0.5.1'
101101

102-
implementation 'com.github.ARK-Builders:ark-filepicker:c6d66141c1'
102+
implementation 'dev.arkbuilders:arkfilepicker:0.1.1'
103103
implementation "androidx.navigation:navigation-compose:2.5.2"
104104

105105
implementation "ch.acra:acra-http:5.9.3"

app/src/androidTest/java/space/taran/arkretouch/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/dev/arkbuilders/arkretouch/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package space.taran.arkretouch
1+
package dev.arkbuilders.arkretouch
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -18,6 +18,6 @@ class ExampleInstrumentedTest {
1818
fun useAppContext() {
1919
// Context of the app under test.
2020
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
21-
assertEquals("space.taran.arkretouch", appContext.packageName)
21+
assertEquals("dev.arkbuilders.arkretouch", appContext.packageName)
2222
}
2323
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
package="space.taran.arkretouch">
4+
package="dev.arkbuilders.arkretouch">
55

66
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
77
<uses-permission
@@ -41,7 +41,7 @@
4141
</activity>
4242
<provider
4343
android:name="androidx.core.content.FileProvider"
44-
android:authorities="space.taran.arkretouch2.fileprovider"
44+
android:authorities="dev.arkbuilders.arkretouch2.fileprovider"
4545
android:exported="false"
4646
android:grantUriPermissions="true"
4747
>

app/src/main/java/space/taran/arkretouch/data/ImageDefaults.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/data/ImageDefaults.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package space.taran.arkretouch.data
1+
package dev.arkbuilders.arkretouch.data
22

33
import androidx.compose.ui.graphics.Color
44
import androidx.compose.ui.unit.IntSize

app/src/main/java/space/taran/arkretouch/data/Preferences.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/data/Preferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package space.taran.arkretouch.data
1+
package dev.arkbuilders.arkretouch.data
22

33
import android.content.Context
44
import androidx.compose.ui.graphics.Color

app/src/main/java/space/taran/arkretouch/di/AppComponent.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/di/AppComponent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package space.taran.arkretouch.di
1+
package dev.arkbuilders.arkretouch.di
22

33
import android.app.Application
44
import android.content.Context
55
import dagger.BindsInstance
66
import dagger.Component
7-
import space.taran.arkretouch.presentation.edit.EditViewModelFactory
7+
import dev.arkbuilders.arkretouch.presentation.edit.EditViewModelFactory
88
import javax.inject.Singleton
99

1010
@Singleton

app/src/main/java/space/taran/arkretouch/di/DIManager.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/di/DIManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package space.taran.arkretouch.di
1+
package dev.arkbuilders.arkretouch.di
22

33
import android.app.Application
44

app/src/main/java/space/taran/arkretouch/presentation/App.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/presentation/App.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package space.taran.arkretouch.presentation
1+
package dev.arkbuilders.arkretouch.presentation
22

33
import android.app.Application
44
import org.acra.config.dialog
55
import org.acra.config.httpSender
66
import org.acra.data.StringFormat
77
import org.acra.ktx.initAcra
88
import org.acra.sender.HttpSender
9-
import space.taran.arkretouch.BuildConfig
10-
import space.taran.arkretouch.R
11-
import space.taran.arkfilepicker.folders.FoldersRepo
12-
import space.taran.arkretouch.di.DIManager
9+
import dev.arkbuilders.arkretouch.BuildConfig
10+
import dev.arkbuilders.arkretouch.R
11+
import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
12+
import dev.arkbuilders.arkretouch.di.DIManager
1313
import timber.log.Timber
1414

1515
class App : Application() {

app/src/main/java/space/taran/arkretouch/presentation/drawing/EditCanvas.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditCanvas.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:OptIn(ExperimentalComposeUiApi::class)
22

3-
package space.taran.arkretouch.presentation.drawing
3+
package dev.arkbuilders.arkretouch.presentation.drawing
44

55
import android.graphics.Matrix
66
import android.graphics.PointF
@@ -35,12 +35,12 @@ import androidx.compose.ui.input.pointer.pointerInput
3535
import androidx.compose.ui.input.pointer.pointerInteropFilter
3636
import androidx.compose.ui.platform.LocalContext
3737
import androidx.compose.ui.unit.toSize
38-
import space.taran.arkretouch.presentation.edit.EditViewModel
39-
import space.taran.arkretouch.presentation.edit.TransparencyChessBoardCanvas
40-
import space.taran.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaX
41-
import space.taran.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaY
42-
import space.taran.arkretouch.presentation.picker.toDp
43-
import space.taran.arkretouch.presentation.utils.calculateRotationFromOneFingerGesture
38+
import dev.arkbuilders.arkretouch.presentation.edit.EditViewModel
39+
import dev.arkbuilders.arkretouch.presentation.edit.TransparencyChessBoardCanvas
40+
import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaX
41+
import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow.Companion.computeDeltaY
42+
import dev.arkbuilders.arkretouch.presentation.picker.toDp
43+
import dev.arkbuilders.arkretouch.presentation.utils.calculateRotationFromOneFingerGesture
4444

4545
@Composable
4646
fun EditCanvas(viewModel: EditViewModel) {

app/src/main/java/space/taran/arkretouch/presentation/drawing/EditManager.kt renamed to app/src/main/java/dev/arkbuilders/arkretouch/presentation/drawing/EditManager.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package space.taran.arkretouch.presentation.drawing
1+
package dev.arkbuilders.arkretouch.presentation.drawing
22

33
import android.graphics.Matrix
44
import androidx.compose.runtime.MutableState
@@ -14,18 +14,18 @@ import androidx.compose.ui.graphics.Path
1414
import androidx.compose.ui.graphics.StrokeCap
1515
import androidx.compose.ui.graphics.StrokeJoin
1616
import androidx.compose.ui.unit.IntSize
17-
import space.taran.arkretouch.data.ImageDefaults
18-
import space.taran.arkretouch.data.Resolution
19-
import space.taran.arkretouch.presentation.edit.ImageViewParams
20-
import space.taran.arkretouch.presentation.edit.Operation
21-
import space.taran.arkretouch.presentation.edit.blur.BlurOperation
22-
import space.taran.arkretouch.presentation.edit.crop.CropOperation
23-
import space.taran.arkretouch.presentation.edit.crop.CropWindow
24-
import space.taran.arkretouch.presentation.edit.draw.DrawOperation
25-
import space.taran.arkretouch.presentation.edit.fitBackground
26-
import space.taran.arkretouch.presentation.edit.fitImage
27-
import space.taran.arkretouch.presentation.edit.resize.ResizeOperation
28-
import space.taran.arkretouch.presentation.edit.rotate.RotateOperation
17+
import dev.arkbuilders.arkretouch.data.ImageDefaults
18+
import dev.arkbuilders.arkretouch.data.Resolution
19+
import dev.arkbuilders.arkretouch.presentation.edit.ImageViewParams
20+
import dev.arkbuilders.arkretouch.presentation.edit.Operation
21+
import dev.arkbuilders.arkretouch.presentation.edit.blur.BlurOperation
22+
import dev.arkbuilders.arkretouch.presentation.edit.crop.CropOperation
23+
import dev.arkbuilders.arkretouch.presentation.edit.crop.CropWindow
24+
import dev.arkbuilders.arkretouch.presentation.edit.draw.DrawOperation
25+
import dev.arkbuilders.arkretouch.presentation.edit.fitBackground
26+
import dev.arkbuilders.arkretouch.presentation.edit.fitImage
27+
import dev.arkbuilders.arkretouch.presentation.edit.resize.ResizeOperation
28+
import dev.arkbuilders.arkretouch.presentation.edit.rotate.RotateOperation
2929
import timber.log.Timber
3030
import java.util.Stack
3131

@@ -429,7 +429,7 @@ class EditManager {
429429

430430
fun addDrawPath(path: Path) {
431431
drawPaths.add(
432-
space.taran.arkretouch.presentation.drawing.DrawPath(
432+
dev.arkbuilders.arkretouch.presentation.drawing.DrawPath(
433433
path,
434434
currentPaint.copy().apply {
435435
strokeWidth = drawPaint.value.strokeWidth

0 commit comments

Comments
 (0)