Changed package name

VivoKey · Aug 25, 2024 · 5819151 · 5819151
1 parent ff026c5
commit 5819151
Show file tree

Hide file tree

Showing 25 changed files with 58 additions and 99 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.hoker.intra_example"
         minSdk = 28
         targetSdk = 34
-        versionCode = 26
-        versionName = "1.1.8"
+        versionCode = 125
+        versionName = "1.2.5"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/src/androidTest/java/com/carbidecowboy/intra/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/carbidecowboy/intra/ExampleInstrumentedTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,13 +8,13 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".IntraExampleApplication"
+        android:name="com.hoker.intra_example.IntraExampleApplication"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Intra"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.IntraExampleActivity"
+            android:name="com.hoker.intra_example.presentation.IntraExampleActivity"
             android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"

diff --git a/.../intra_example/IntraExampleApplication.kt → .../intra_example/IntraExampleApplication.kt b/.../intra_example/IntraExampleApplication.kt → .../intra_example/IntraExampleApplication.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra_example
+package com.hoker.intra_example
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

diff --git a/...mple/presentation/IntraExampleActivity.kt → ...mple/presentation/IntraExampleActivity.kt b/...mple/presentation/IntraExampleActivity.kt → ...mple/presentation/IntraExampleActivity.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra_example.presentation
+package com.hoker.intra_example.presentation
 
 import android.os.Bundle
 import android.os.PersistableBundle
@@ -8,7 +8,7 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.carbidecowboy.intra.domain.NfcActivity
+import com.hoker.intra.domain.NfcActivity
 import com.carbidecowboy.supra.presentation.scaffolds.SupraGyroScaffold
 import dagger.hilt.android.AndroidEntryPoint
 

diff --git a/app/src/test/java/com/carbidecowboy/intra/ExampleUnitTest.kt b/app/src/test/java/com/carbidecowboy/intra/ExampleUnitTest.kt
diff --git a/intra/build.gradle.kts b/intra/build.gradle.kts
@@ -61,7 +61,7 @@ afterEvaluate {
                 from(components["release"])
                 groupId = "com.github.CarbideCowboy"
                 artifactId = "Intra"
-                version = "1.2.3"
+                version = "1.2.5"
             }
         }
     }

diff --git a/...cowboy/intra/data/IsodepControllerImpl.kt → .../hoker/intra/data/IsodepControllerImpl.kt b/...cowboy/intra/data/IsodepControllerImpl.kt → .../hoker/intra/data/IsodepControllerImpl.kt
@@ -1,18 +1,18 @@
-package com.carbidecowboy.intra.data
+package com.hoker.intra.data
 
 import android.nfc.NdefMessage
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
 import android.nfc.tech.Ndef
 import android.util.Log
-import com.carbidecowboy.intra.di.IntraAuthApiService
-import com.carbidecowboy.intra.domain.ApduUtils
-import com.carbidecowboy.intra.domain.AuthApiService
-import com.carbidecowboy.intra.domain.NfcController
-import com.carbidecowboy.intra.domain.OperationResult
-import com.carbidecowboy.intra.domain.Timer
-import com.carbidecowboy.intra.domain.request.ChallengeRequest
-import com.carbidecowboy.intra.domain.request.SessionRequest
+import com.hoker.intra.di.IntraAuthApiService
+import com.hoker.intra.domain.ApduUtils
+import com.hoker.intra.domain.AuthApiService
+import com.hoker.intra.domain.NfcController
+import com.hoker.intra.domain.OperationResult
+import com.hoker.intra.domain.Timer
+import com.hoker.intra.domain.request.ChallengeRequest
+import com.hoker.intra.domain.request.SessionRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async

diff --git a/...decowboy/intra/data/NfcAControllerImpl.kt → ...om/hoker/intra/data/NfcAControllerImpl.kt b/...decowboy/intra/data/NfcAControllerImpl.kt → ...om/hoker/intra/data/NfcAControllerImpl.kt
@@ -1,14 +1,14 @@
-package com.carbidecowboy.intra.data
+package com.hoker.intra.data
 
 import android.nfc.NdefMessage
 import android.nfc.Tag
 import android.nfc.tech.Ndef
 import android.nfc.tech.NfcA
 import android.util.Log
-import com.carbidecowboy.intra.domain.ApduUtils
-import com.carbidecowboy.intra.domain.NfcController
-import com.carbidecowboy.intra.domain.OperationResult
-import com.carbidecowboy.intra.domain.Timer
+import com.hoker.intra.domain.ApduUtils
+import com.hoker.intra.domain.NfcController
+import com.hoker.intra.domain.OperationResult
+import com.hoker.intra.domain.Timer
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

diff --git a/...decowboy/intra/data/NfcVControllerImpl.kt → ...om/hoker/intra/data/NfcVControllerImpl.kt b/...decowboy/intra/data/NfcVControllerImpl.kt → ...om/hoker/intra/data/NfcVControllerImpl.kt
@@ -1,18 +1,18 @@
-package com.carbidecowboy.intra.data
+package com.hoker.intra.data
 
 import android.nfc.NdefMessage
 import android.nfc.Tag
 import android.nfc.tech.Ndef
 import android.nfc.tech.NfcV
 import android.util.Log
-import com.carbidecowboy.intra.di.IntraAuthApiService
-import com.carbidecowboy.intra.domain.ApduUtils
-import com.carbidecowboy.intra.domain.AuthApiService
-import com.carbidecowboy.intra.domain.NfcController
-import com.carbidecowboy.intra.domain.OperationResult
-import com.carbidecowboy.intra.domain.Timer
-import com.carbidecowboy.intra.domain.request.ChallengeRequest
-import com.carbidecowboy.intra.domain.request.SessionRequest
+import com.hoker.intra.di.IntraAuthApiService
+import com.hoker.intra.domain.ApduUtils
+import com.hoker.intra.domain.AuthApiService
+import com.hoker.intra.domain.NfcController
+import com.hoker.intra.domain.OperationResult
+import com.hoker.intra.domain.Timer
+import com.hoker.intra.domain.request.ChallengeRequest
+import com.hoker.intra.domain.request.SessionRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.async

diff --git a/...m/carbidecowboy/intra/di/NetworkModule.kt → .../java/com/hoker/intra/di/NetworkModule.kt b/...m/carbidecowboy/intra/di/NetworkModule.kt → .../java/com/hoker/intra/di/NetworkModule.kt
@@ -1,6 +1,6 @@
-package com.carbidecowboy.intra.di
+package com.hoker.intra.di
 
-import com.carbidecowboy.intra.domain.AuthApiService
+import com.hoker.intra.domain.AuthApiService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

diff --git a/...a/com/carbidecowboy/intra/di/NfcModule.kt → ...main/java/com/hoker/intra/di/NfcModule.kt b/...a/com/carbidecowboy/intra/di/NfcModule.kt → ...main/java/com/hoker/intra/di/NfcModule.kt
@@ -1,17 +1,17 @@
-package com.carbidecowboy.intra.di
+package com.hoker.intra.di
 
 import android.content.Context
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.nfc.tech.IsoDep
 import android.nfc.tech.NfcA
 import android.nfc.tech.NfcV
-import com.carbidecowboy.intra.data.IsodepControllerImpl
-import com.carbidecowboy.intra.data.NfcAControllerImpl
-import com.carbidecowboy.intra.data.NfcVControllerImpl
-import com.carbidecowboy.intra.domain.NfcAdapterController
-import com.carbidecowboy.intra.domain.NfcController
-import com.carbidecowboy.intra.domain.OperationResult
+import com.hoker.intra.data.IsodepControllerImpl
+import com.hoker.intra.data.NfcAControllerImpl
+import com.hoker.intra.data.NfcVControllerImpl
+import com.hoker.intra.domain.NfcAdapterController
+import com.hoker.intra.domain.NfcController
+import com.hoker.intra.domain.OperationResult
 import dagger.Binds
 import dagger.Module
 import dagger.Provides

diff --git a/...m/carbidecowboy/intra/domain/ApduUtils.kt → .../java/com/hoker/intra/domain/ApduUtils.kt b/...m/carbidecowboy/intra/domain/ApduUtils.kt → .../java/com/hoker/intra/domain/ApduUtils.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 import java.io.IOException
 import java.nio.ByteBuffer

diff --git a/...bidecowboy/intra/domain/AuthApiService.kt → .../com/hoker/intra/domain/AuthApiService.kt b/...bidecowboy/intra/domain/AuthApiService.kt → .../com/hoker/intra/domain/AuthApiService.kt
@@ -1,9 +1,9 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
-import com.carbidecowboy.intra.domain.request.ChallengeRequest
-import com.carbidecowboy.intra.domain.request.SessionRequest
-import com.carbidecowboy.intra.domain.response.ChallengeResponse
-import com.carbidecowboy.intra.domain.response.SessionResponse
+import com.hoker.intra.domain.request.ChallengeRequest
+import com.hoker.intra.domain.request.SessionRequest
+import com.hoker.intra.domain.response.ChallengeResponse
+import com.hoker.intra.domain.response.SessionResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST

diff --git a/.../com/carbidecowboy/intra/domain/Consts.kt → ...ain/java/com/hoker/intra/domain/Consts.kt b/.../com/carbidecowboy/intra/domain/Consts.kt → ...ain/java/com/hoker/intra/domain/Consts.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 object Consts {
     const val SUCCESS_RESPONSE = "9000"

diff --git a/...carbidecowboy/intra/domain/NfcActivity.kt → ...ava/com/hoker/intra/domain/NfcActivity.kt b/...carbidecowboy/intra/domain/NfcActivity.kt → ...ava/com/hoker/intra/domain/NfcActivity.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 import android.os.Bundle
 import android.os.PersistableBundle

diff --git a/...wboy/intra/domain/NfcAdapterController.kt → ...oker/intra/domain/NfcAdapterController.kt b/...wboy/intra/domain/NfcAdapterController.kt → ...oker/intra/domain/NfcAdapterController.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 import android.app.Activity
 import android.nfc.NfcAdapter

diff --git a/...rbidecowboy/intra/domain/NfcController.kt → ...a/com/hoker/intra/domain/NfcController.kt b/...rbidecowboy/intra/domain/NfcController.kt → ...a/com/hoker/intra/domain/NfcController.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 import android.nfc.NdefMessage
 import android.nfc.Tag

diff --git a/...arbidecowboy/intra/domain/NfcViewModel.kt → ...va/com/hoker/intra/domain/NfcViewModel.kt b/...arbidecowboy/intra/domain/NfcViewModel.kt → ...va/com/hoker/intra/domain/NfcViewModel.kt
@@ -1,8 +1,8 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 import android.nfc.Tag
 import androidx.lifecycle.ViewModel
-import com.carbidecowboy.intra.di.NfcModule
+import com.hoker.intra.di.NfcModule
 import java.util.UUID
 
 abstract class NfcViewModel(

diff --git a/...idecowboy/intra/domain/OperationResult.kt → ...com/hoker/intra/domain/OperationResult.kt b/...idecowboy/intra/domain/OperationResult.kt → ...com/hoker/intra/domain/OperationResult.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 sealed class OperationResult<out T> {
     data class Success<out T>(val data: T) : OperationResult<T>()

diff --git a/...a/com/carbidecowboy/intra/domain/Timer.kt → ...main/java/com/hoker/intra/domain/Timer.kt b/...a/com/carbidecowboy/intra/domain/Timer.kt → ...main/java/com/hoker/intra/domain/Timer.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain
+package com.hoker.intra.domain
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

diff --git a/.../intra/domain/request/ChallengeRequest.kt → .../intra/domain/request/ChallengeRequest.kt b/.../intra/domain/request/ChallengeRequest.kt → .../intra/domain/request/ChallengeRequest.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain.request
+package com.hoker.intra.domain.request
 
 data class ChallengeRequest(
     val scheme: Int,

diff --git a/...oy/intra/domain/request/SessionRequest.kt → ...er/intra/domain/request/SessionRequest.kt b/...oy/intra/domain/request/SessionRequest.kt → ...er/intra/domain/request/SessionRequest.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain.request
+package com.hoker.intra.domain.request
 
 data class SessionRequest(
     val uid: String,

diff --git a/...ntra/domain/response/ChallengeResponse.kt → ...ntra/domain/response/ChallengeResponse.kt b/...ntra/domain/response/ChallengeResponse.kt → ...ntra/domain/response/ChallengeResponse.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain.response
+package com.hoker.intra.domain.response
 
 data class ChallengeResponse(
     val payload: String,

diff --git a/.../intra/domain/response/SessionResponse.kt → .../intra/domain/response/SessionResponse.kt b/.../intra/domain/response/SessionResponse.kt → .../intra/domain/response/SessionResponse.kt
@@ -1,4 +1,4 @@
-package com.carbidecowboy.intra.domain.response
+package com.hoker.intra.domain.response
 
 data class SessionResponse (
     val token: String