mirror of
https://github.com/d4rken-org/capod.git
synced 2026-09-14 18:26:11 -04:00
Refactor: Rename devices package to profiles
This commit renames the `devices` package and its contents to `profiles` for better clarity and consistency. This includes renaming classes, files, and updating import statements and navigation graph references.
This commit is contained in:
@@ -5,7 +5,7 @@ import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.hilt.InstallIn
|
||||
import dagger.hilt.components.SingletonComponent
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfile
|
||||
import javax.inject.Singleton
|
||||
|
||||
@InstallIn(SingletonComponent::class)
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
package eu.darken.capod.devices.core
|
||||
|
||||
typealias ProfileId = String
|
||||
@@ -15,7 +15,7 @@ import eu.darken.capod.common.livedata.SingleLiveEvent
|
||||
import eu.darken.capod.common.permissions.Permission
|
||||
import eu.darken.capod.common.uix.ViewModel3
|
||||
import eu.darken.capod.common.upgrade.UpgradeRepo
|
||||
import eu.darken.capod.devices.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.profiles.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.main.core.GeneralSettings
|
||||
import eu.darken.capod.main.core.MonitorMode
|
||||
import eu.darken.capod.main.core.PermissionTool
|
||||
@@ -41,10 +41,8 @@ import kotlinx.coroutines.flow.flowOf
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import kotlinx.coroutines.isActive
|
||||
import java.time.Duration
|
||||
import java.time.Instant
|
||||
import javax.inject.Inject
|
||||
import kotlin.collections.sortedWith
|
||||
|
||||
@HiltViewModel
|
||||
class OverviewFragmentVM @Inject constructor(
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package eu.darken.capod.main.ui.overview.cards.pods
|
||||
|
||||
import android.graphics.Typeface
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.isGone
|
||||
import androidx.core.view.isInvisible
|
||||
@@ -8,7 +7,6 @@ import androidx.core.view.isVisible
|
||||
import eu.darken.capod.R
|
||||
import eu.darken.capod.common.lists.binding
|
||||
import eu.darken.capod.databinding.OverviewPodsDualItemBinding
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.pods.core.DualPodDevice
|
||||
import eu.darken.capod.pods.core.HasCase
|
||||
import eu.darken.capod.pods.core.HasChargeDetectionDual
|
||||
|
||||
@@ -10,8 +10,6 @@ import eu.darken.capod.main.ui.overview.OverviewAdapter
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
import eu.darken.capod.pods.core.getSignalQuality
|
||||
import java.time.Instant
|
||||
import eu.darken.capod.R
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
|
||||
abstract class PodDeviceVH<D : PodDeviceVH.Item, B : ViewBinding>(
|
||||
@LayoutRes layoutId: Int,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package eu.darken.capod.main.ui.overview.cards.pods
|
||||
|
||||
import android.graphics.Typeface
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.isGone
|
||||
import androidx.core.view.isInvisible
|
||||
@@ -8,7 +7,6 @@ import androidx.core.view.isVisible
|
||||
import eu.darken.capod.R
|
||||
import eu.darken.capod.common.lists.binding
|
||||
import eu.darken.capod.databinding.OverviewPodsSingleItemBinding
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.pods.core.HasChargeDetection
|
||||
import eu.darken.capod.pods.core.HasEarDetection
|
||||
import eu.darken.capod.pods.core.SinglePodDevice
|
||||
|
||||
-2
@@ -1,11 +1,9 @@
|
||||
package eu.darken.capod.main.ui.overview.cards.pods
|
||||
|
||||
import android.graphics.Typeface
|
||||
import android.view.ViewGroup
|
||||
import eu.darken.capod.R
|
||||
import eu.darken.capod.common.lists.binding
|
||||
import eu.darken.capod.databinding.OverviewPodsUnknownItemBinding
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
import eu.darken.capod.pods.core.apple.ApplePods
|
||||
import eu.darken.capod.pods.core.lastSeenFormatted
|
||||
|
||||
@@ -11,7 +11,7 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
|
||||
import eu.darken.capod.common.debug.logging.asLog
|
||||
import eu.darken.capod.common.debug.logging.log
|
||||
import eu.darken.capod.common.debug.logging.logTag
|
||||
import eu.darken.capod.devices.core.ProfileId
|
||||
import eu.darken.capod.profiles.core.ProfileId
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@@ -14,7 +14,7 @@ import eu.darken.capod.common.debug.logging.log
|
||||
import eu.darken.capod.common.debug.logging.logTag
|
||||
import eu.darken.capod.common.flow.replayingShare
|
||||
import eu.darken.capod.common.flow.throttleLatest
|
||||
import eu.darken.capod.devices.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.profiles.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.main.core.GeneralSettings
|
||||
import eu.darken.capod.main.core.PermissionTool
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
|
||||
@@ -9,7 +9,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
|
||||
import eu.darken.capod.common.bluetooth.BluetoothAddress
|
||||
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
|
||||
import eu.darken.capod.common.debug.logging.log
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfile
|
||||
import java.time.Duration
|
||||
import java.time.Instant
|
||||
import java.util.UUID
|
||||
|
||||
@@ -5,8 +5,8 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
|
||||
import eu.darken.capod.common.debug.logging.asLog
|
||||
import eu.darken.capod.common.debug.logging.log
|
||||
import eu.darken.capod.common.debug.logging.logTag
|
||||
import eu.darken.capod.devices.core.AppleDeviceProfile
|
||||
import eu.darken.capod.devices.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.profiles.core.AppleDeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
import eu.darken.capod.pods.core.apple.misc.UnknownAppleDevice
|
||||
import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
|
||||
|
||||
@@ -2,7 +2,7 @@ package eu.darken.capod.pods.core.apple
|
||||
|
||||
import eu.darken.capod.common.lowerNibble
|
||||
import eu.darken.capod.common.upperNibble
|
||||
import eu.darken.capod.devices.core.AppleDeviceProfile
|
||||
import eu.darken.capod.profiles.core.AppleDeviceProfile
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
import eu.darken.capod.pods.core.apple.protocol.ProximityPayload
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.content.Context
|
||||
import eu.darken.capod.R
|
||||
import eu.darken.capod.common.bluetooth.BleScanResult
|
||||
import eu.darken.capod.common.debug.logging.logTag
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfile
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
import java.time.Instant
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.core
|
||||
package eu.darken.capod.profiles.core
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.core
|
||||
package eu.darken.capod.profiles.core
|
||||
|
||||
import android.os.Parcelable
|
||||
import eu.darken.capod.common.serialization.NameBasedPolyJsonAdapterFactory
|
||||
@@ -0,0 +1,3 @@
|
||||
package eu.darken.capod.profiles.core
|
||||
|
||||
typealias ProfileId = String
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.core
|
||||
package eu.darken.capod.profiles.core
|
||||
|
||||
import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
|
||||
import eu.darken.capod.common.debug.logging.log
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.core
|
||||
package eu.darken.capod.profiles.core
|
||||
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import android.view.ViewGroup
|
||||
import androidx.annotation.LayoutRes
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import android.os.Bundle
|
||||
import android.util.TypedValue
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
@@ -8,8 +8,8 @@ import eu.darken.capod.common.coroutine.DispatcherProvider
|
||||
import eu.darken.capod.common.debug.logging.log
|
||||
import eu.darken.capod.common.debug.logging.logTag
|
||||
import eu.darken.capod.common.uix.ViewModel3
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.devices.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.profiles.core.DeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfilesRepo
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.flow.onEach
|
||||
import javax.inject.Inject
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
@@ -10,8 +10,8 @@ import eu.darken.capod.common.coroutine.DispatcherProvider
|
||||
import eu.darken.capod.common.debug.logging.log
|
||||
import eu.darken.capod.common.debug.logging.logTag
|
||||
import eu.darken.capod.common.uix.ViewModel3
|
||||
import eu.darken.capod.devices.core.AppleDeviceProfile
|
||||
import eu.darken.capod.devices.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.profiles.core.AppleDeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfilesRepo
|
||||
import eu.darken.capod.pods.core.PodDevice
|
||||
import eu.darken.capod.pods.core.apple.protocol.IdentityResolvingKey
|
||||
import eu.darken.capod.pods.core.apple.protocol.ProximityEncryptionKey
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import android.view.ViewGroup
|
||||
import eu.darken.capod.R
|
||||
import eu.darken.capod.databinding.DeviceManagerItemBinding
|
||||
import eu.darken.capod.devices.core.DeviceProfile
|
||||
import eu.darken.capod.profiles.core.DeviceProfile
|
||||
|
||||
class DeviceProfileVH(parent: ViewGroup) :
|
||||
DeviceManagerAdapter.BaseVH<DeviceProfileVH.Item, DeviceManagerItemBinding>(
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package eu.darken.capod.devices.ui
|
||||
package eu.darken.capod.profiles.ui
|
||||
|
||||
import android.view.ViewGroup
|
||||
import eu.darken.capod.R
|
||||
@@ -37,12 +37,12 @@
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/deviceManagerFragment"
|
||||
android:name="eu.darken.capod.devices.ui.DeviceManagerFragment"
|
||||
android:name="eu.darken.capod.profiles.ui.DeviceManagerFragment"
|
||||
android:label="DeviceManagerFragment"
|
||||
tools:layout="@layout/device_manager_fragment" />
|
||||
<fragment
|
||||
android:id="@+id/deviceManagerFragment"
|
||||
android:name="eu.darken.capod.devices.ui.DeviceManagerFragment"
|
||||
android:name="eu.darken.capod.profiles.ui.DeviceManagerFragment"
|
||||
android:label="DeviceManagerFragment"
|
||||
tools:layout="@layout/device_manager_fragment">
|
||||
<action
|
||||
@@ -57,7 +57,7 @@
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/deviceProfileCreationFragment"
|
||||
android:name="eu.darken.capod.devices.ui.DeviceProfileCreationFragment"
|
||||
android:name="eu.darken.capod.profiles.ui.DeviceProfileCreationFragment"
|
||||
android:label="DeviceProfileCreationFragment"
|
||||
tools:layout="@layout/device_profile_creation_fragment">
|
||||
<argument
|
||||
|
||||
Reference in New Issue
Block a user