Skip to content

Commit

Permalink
Restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
@w2sv
w2sv committed Jul 20, 2023
1 parent 5292375 commit 2442382
Show file tree
Hide file tree
Showing 24 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/w2sv/wifiwidget/ui/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.w2sv.androidutils.generic.getIntExtraOrNull
import com.w2sv.androidutils.lifecycle.SelfManagingLocalBroadcastReceiver
import com.w2sv.common.enums.Theme
import com.w2sv.common.data.sources.Theme
import com.w2sv.widget.WidgetDataRefreshWorker
import com.w2sv.wifiwidget.ui.screens.home.HomeScreen
import com.w2sv.wifiwidget.ui.screens.home.HomeScreenViewModel
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/w2sv/wifiwidget/ui/components/ThemeSelection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.w2sv.common.enums.Theme
import com.w2sv.common.data.sources.Theme
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.theme.AppTheme
import com.w2sv.wifiwidget.ui.utils.toEasing
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/w2sv/wifiwidget/ui/components/navigationdrawer/NavigationDrawer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import com.w2sv.androidutils.coroutines.launchDelayed
import com.w2sv.androidutils.generic.appPlayStoreUrl
import com.w2sv.androidutils.notifying.showToast
import com.w2sv.androidutils.ui.PreferencesDataStoreBackedUnconfirmedStatesViewModel
import com.w2sv.common.data.repositories.PreferencesRepository
import com.w2sv.common.data.storage.PreferencesRepository
import com.w2sv.common.extensions.openUrlWithActivityNotFoundHandling
import com.w2sv.wifiwidget.BuildConfig
import com.w2sv.wifiwidget.R
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/kotlin/com/w2sv/wifiwidget/ui/components/navigationdrawer/ThemeSelectionDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.w2sv.common.enums.Theme
import com.w2sv.common.data.sources.Theme
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.DialogButton
import com.w2sv.wifiwidget.ui.components.JostText
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/HomeScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.w2sv.androidutils.coroutines.reset
import com.w2sv.common.data.repositories.PreferencesRepository
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.storage.PreferencesRepository
import com.w2sv.common.data.sources.WifiProperty
import com.w2sv.widget.WidgetProvider
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.AppTopBar
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/w2sv/wifiwidget/ui/screens/home/HomeScreenViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import com.w2sv.androidutils.notifying.showToast
import com.w2sv.androidutils.permissions.hasPermission
import com.w2sv.androidutils.services.isLocationEnabled
import com.w2sv.androidutils.ui.resources.getLong
import com.w2sv.common.data.repositories.PreferencesRepository
import com.w2sv.common.data.repositories.WidgetConfigurationRepository
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.storage.PreferencesRepository
import com.w2sv.common.data.storage.WidgetConfigurationRepository
import com.w2sv.common.data.sources.WifiProperty
import com.w2sv.widget.WidgetProvider
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.screens.home.components.locationaccesspermission.LocationAccessPermissionRequestTrigger
Expand Down
2 changes: 1 addition & 1 deletion ...et/ui/screens/home/components/locationaccesspermission/LocationAccessPermissionRequest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.rememberMultiplePermissionsState
import com.w2sv.androidutils.coroutines.reset
import com.w2sv.androidutils.notifying.showToast
import com.w2sv.common.data.repositories.PreferencesRepository
import com.w2sv.common.data.storage.PreferencesRepository
import com.w2sv.common.extensions.launchingSuppressed
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.screens.home.HomeScreenViewModel
Expand Down
6 changes: 3 additions & 3 deletions ...wifiwidget/ui/screens/home/components/widgetconfiguration/WidgetConfigurationViewModel.kt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.w2sv.wifiwidget.ui.screens.home.components.widgetconfiguration

import com.w2sv.androidutils.ui.PreferencesDataStoreBackedUnconfirmedStatesViewModel
import com.w2sv.common.data.repositories.WidgetConfigurationRepository
import com.w2sv.common.enums.Theme
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.storage.WidgetConfigurationRepository
import com.w2sv.common.data.sources.Theme
import com.w2sv.common.data.sources.WifiProperty
import com.w2sv.common.extensions.getSynchronousMutableStateMap
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableSharedFlow
Expand Down
6 changes: 3 additions & 3 deletions ...sv/wifiwidget/ui/screens/home/components/widgetconfiguration/configcolumn/ConfigColumn.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.w2sv.common.enums.Theme
import com.w2sv.common.enums.WidgetColor
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.sources.Theme
import com.w2sv.common.data.sources.WidgetColor
import com.w2sv.common.data.sources.WifiProperty
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.ButtonColor
import com.w2sv.wifiwidget.ui.components.JostText
Expand Down
2 changes: 1 addition & 1 deletion .../screens/home/components/widgetconfiguration/configcolumn/components/ColorPickerDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import androidx.compose.ui.unit.dp
import com.smarttoolfactory.colorpicker.model.ColorModel
import com.smarttoolfactory.colorpicker.picker.HSVColorPickerCircularWithSliders
import com.smarttoolfactory.colorpicker.widget.ColorComponentsDisplay
import com.w2sv.common.enums.WidgetColor
import com.w2sv.common.data.sources.WidgetColor
import com.w2sv.wifiwidget.ui.components.CustomDialog
import com.w2sv.wifiwidget.ui.components.DialogButtonRow
import com.w2sv.wifiwidget.ui.theme.AppTheme
Expand Down
2 changes: 1 addition & 1 deletion .../ui/screens/home/components/widgetconfiguration/configcolumn/components/ColorSelection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.w2sv.common.enums.WidgetColor
import com.w2sv.common.data.sources.WidgetColor
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.JostText
import com.w2sv.wifiwidget.ui.components.bulletPointText
Expand Down
2 changes: 1 addition & 1 deletion ...screens/home/components/widgetconfiguration/configcolumn/components/PropertyInfoDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import androidx.compose.ui.res.stringArrayResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.sources.WifiProperty
import com.w2sv.common.extensions.openUrlWithActivityNotFoundHandling
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.DialogButton
Expand Down
2 changes: 1 addition & 1 deletion .../screens/home/components/widgetconfiguration/configcolumn/components/PropertySelection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.sp
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.sources.WifiProperty
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.InfoIconButton
import com.w2sv.wifiwidget.ui.components.JostText
Expand Down
2 changes: 1 addition & 1 deletion ...e/components/widgetconfiguration/configcolumn/components/RefreshingParametersSelection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel
import com.w2sv.common.enums.WidgetRefreshingParameter
import com.w2sv.common.data.sources.WidgetRefreshingParameter
import com.w2sv.wifiwidget.R
import com.w2sv.wifiwidget.ui.components.JostText
import com.w2sv.wifiwidget.ui.components.bulletPointText
Expand Down
2 changes: 1 addition & 1 deletion ...ain/kotlin/com/w2sv/common/enums/Theme.kt → ...lin/com/w2sv/common/data/sources/Theme.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.w2sv.common.enums
package com.w2sv.common.data.sources

enum class Theme {
Light,
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/com/w2sv/common/enums/WidgetColor.kt → ...m/w2sv/common/data/sources/WidgetColor.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.w2sv.common.enums
package com.w2sv.common.data.sources

import androidx.annotation.StringRes
import androidx.compose.ui.graphics.Color
Expand Down
2 changes: 1 addition & 1 deletion ...common/enums/WidgetRefreshingParameter.kt → ...data/sources/WidgetRefreshingParameter.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.w2sv.common.enums
package com.w2sv.common.data.sources

import androidx.annotation.StringRes
import androidx.datastore.preferences.core.booleanPreferencesKey
Expand Down
2 changes: 1 addition & 1 deletion ...lin/com/w2sv/common/enums/WifiProperty.kt → .../w2sv/common/data/sources/WifiProperty.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.w2sv.common.enums
package com.w2sv.common.data.sources

import android.net.ConnectivityManager
import android.net.wifi.WifiManager
Expand Down
4 changes: 2 additions & 2 deletions ...ata/repositories/PreferencesRepository.kt → ...mon/data/storage/PreferencesRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.w2sv.common.data.repositories
package com.w2sv.common.data.storage

import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.intPreferencesKey
import com.w2sv.androidutils.datastorage.datastore.preferences.PreferencesDataStoreRepository
import com.w2sv.common.enums.Theme
import com.w2sv.common.data.sources.Theme
import kotlinx.coroutines.flow.Flow
import javax.inject.Inject

Expand Down
10 changes: 5 additions & 5 deletions ...sitories/WidgetConfigurationRepository.kt → .../storage/WidgetConfigurationRepository.kt
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.w2sv.common.data.repositories
package com.w2sv.common.data.storage

import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.floatPreferencesKey
import androidx.datastore.preferences.core.intPreferencesKey
import com.w2sv.androidutils.datastorage.datastore.preferences.PreferencesDataStoreRepository
import com.w2sv.common.enums.Theme
import com.w2sv.common.enums.WidgetColor
import com.w2sv.common.enums.WidgetRefreshingParameter
import com.w2sv.common.enums.WifiProperty
import com.w2sv.common.data.sources.Theme
import com.w2sv.common.data.sources.WidgetColor
import com.w2sv.common.data.sources.WidgetRefreshingParameter
import com.w2sv.common.data.sources.WifiProperty
import kotlinx.coroutines.flow.Flow
import javax.inject.Inject

Expand Down
4 changes: 2 additions & 2 deletions widget/src/main/kotlin/com/w2sv/widget/ColorSetting.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import androidx.core.graphics.ColorUtils
import com.w2sv.androidutils.appwidgets.setBackgroundColor
import com.w2sv.androidutils.appwidgets.setColorFilter
import com.w2sv.androidutils.coroutines.getSynchronousMap
import com.w2sv.common.enums.Theme
import com.w2sv.common.enums.WidgetColor
import com.w2sv.common.data.sources.Theme
import com.w2sv.common.data.sources.WidgetColor
import com.w2sv.common.extensions.isNightModeActiveCompat
import com.w2sv.common.extensions.toRGBChannelInt
import kotlinx.coroutines.flow.Flow
Expand Down
4 changes: 2 additions & 2 deletions widget/src/main/kotlin/com/w2sv/widget/WidgetDataRefreshWorker.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import androidx.work.WorkManager
import androidx.work.Worker
import androidx.work.WorkerParameters
import com.w2sv.androidutils.coroutines.getSynchronousMap
import com.w2sv.common.data.repositories.WidgetConfigurationRepository
import com.w2sv.common.enums.WidgetRefreshingParameter
import com.w2sv.common.data.storage.WidgetConfigurationRepository
import com.w2sv.common.data.sources.WidgetRefreshingParameter
import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
import dagger.hilt.android.EntryPointAccessors
Expand Down
4 changes: 2 additions & 2 deletions widget/src/main/kotlin/com/w2sv/widget/WidgetPopulator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import android.widget.RemoteViews
import com.w2sv.androidutils.appwidgets.crossVisualize
import com.w2sv.androidutils.coroutines.getValueSynchronously
import com.w2sv.common.connectivityManager
import com.w2sv.common.data.repositories.WidgetConfigurationRepository
import com.w2sv.common.enums.WidgetRefreshingParameter
import com.w2sv.common.data.storage.WidgetConfigurationRepository
import com.w2sv.common.data.sources.WidgetRefreshingParameter
import com.w2sv.common.isWifiConnected
import com.w2sv.common.linkProperties
import com.w2sv.common.wifiManager
Expand Down
6 changes: 3 additions & 3 deletions widget/src/main/kotlin/com/w2sv/widget/WifiPropertiesService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import androidx.annotation.IdRes
import com.w2sv.androidutils.coroutines.getSynchronousMap
import com.w2sv.androidutils.coroutines.getValueSynchronously
import com.w2sv.common.connectivityManager
import com.w2sv.common.data.repositories.WidgetConfigurationRepository
import com.w2sv.common.enums.Theme
import com.w2sv.common.enums.WidgetColor
import com.w2sv.common.data.storage.WidgetConfigurationRepository
import com.w2sv.common.data.sources.Theme
import com.w2sv.common.data.sources.WidgetColor
import com.w2sv.common.extensions.isNightModeActiveCompat
import com.w2sv.common.wifiManager
import dagger.hilt.android.AndroidEntryPoint
Expand Down

0 comments on commit 2442382

Please sign in to comment.