Merge pull request #113 from getditto/rr/update-disk-usage-package

Update Disk Usage package name
getditto · Aug 16, 2024 · d6b9373 · d6b9373
2 parents de868da + 2e86a1c
commit d6b9373
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 29 deletions.
diff --git a/...a/com/example/dittodiskusage/Constants.kt → ...va/live/ditto/dittodiskusage/Constants.kt b/...a/com/example/dittodiskusage/Constants.kt → ...va/live/ditto/dittodiskusage/Constants.kt
@@ -1,4 +1,4 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 const val ROOT_PATH = "rootPath"
 const val TOTAL_SIZE = "totalSize"

diff --git a/...a/com/example/dittodiskusage/DiskUsage.kt → ...va/live/ditto/dittodiskusage/DiskUsage.kt b/...a/com/example/dittodiskusage/DiskUsage.kt → ...va/live/ditto/dittodiskusage/DiskUsage.kt
@@ -1,10 +1,9 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
 import androidx.lifecycle.viewmodel.compose.viewModel
-import androidx.navigation.NavHostController
 
 /**
  * Wrapper composable function for `DiskUsageView`.

diff --git a/.../example/dittodiskusage/DiskUsageState.kt → ...ve/ditto/dittodiskusage/DiskUsageState.kt b/.../example/dittodiskusage/DiskUsageState.kt → ...ve/ditto/dittodiskusage/DiskUsageState.kt
@@ -1,4 +1,4 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 data class DiskUsageState(
     val rootPath: String = "ditto",

diff --git a/...m/example/dittodiskusage/DiskUsageView.kt → ...ive/ditto/dittodiskusage/DiskUsageView.kt b/...m/example/dittodiskusage/DiskUsageView.kt → ...ive/ditto/dittodiskusage/DiskUsageView.kt
@@ -1,4 +1,4 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -32,7 +32,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import live.ditto.Ditto
-import live.ditto.dittodiskusage.R
 import live.ditto.exporter.ExportDialog
 import java.io.File
 

diff --git a/...mple/dittodiskusage/DiskUsageViewModel.kt → ...itto/dittodiskusage/DiskUsageViewModel.kt b/...mple/dittodiskusage/DiskUsageViewModel.kt → ...itto/dittodiskusage/DiskUsageViewModel.kt
@@ -1,7 +1,7 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 import androidx.lifecycle.ViewModel
-import com.example.dittodiskusage.usecase.GetDiskUsageMetrics
+import live.ditto.dittodiskusage.usecase.GetDiskUsageMetrics
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -27,8 +27,8 @@ class DiskUsageViewModel(
     /* Private mutable state */
     private val _uiState = MutableStateFlow(DiskUsageState())
 
-    /// The size over which disk usage is considered unhealthy when used as a `HealthMetric` with the heartbeat tool (this only considers `ditto_store` and `ditto_replication`). Defaults to 500MB
-    var unhealthySizeInBytes: Int = FIVE_HUNDRED_MEGABYTES_IN_BYTES
+    // The size over which disk usage is considered unhealthy when used as a `HealthMetric` with the heartbeat tool (this only considers `ditto_store` and `ditto_replication`). Defaults to 500MB
+    private var unhealthySizeInBytes: Int = FIVE_HUNDRED_MEGABYTES_IN_BYTES
         set(value) {
             field = value
             getDiskUsageMetrics.unhealthySizeInBytes = value

diff --git a/.../example/dittodiskusage/DittoDiskUsage.kt → ...ve/ditto/dittodiskusage/DittoDiskUsage.kt b/.../example/dittodiskusage/DittoDiskUsage.kt → ...ve/ditto/dittodiskusage/DittoDiskUsage.kt
@@ -1,9 +1,8 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController

diff --git a/...om/example/dittodiskusage/DittoHandler.kt → ...live/ditto/dittodiskusage/DittoHandler.kt b/...om/example/dittodiskusage/DittoHandler.kt → ...live/ditto/dittodiskusage/DittoHandler.kt
@@ -1,4 +1,4 @@
-package com.example.dittodiskusage
+package live.ditto.dittodiskusage
 
 import android.app.Application
 import live.ditto.Ditto

diff --git a/...odiskusage/usecase/GetDiskUsageMetrics.kt → ...odiskusage/usecase/GetDiskUsageMetrics.kt b/...odiskusage/usecase/GetDiskUsageMetrics.kt → ...odiskusage/usecase/GetDiskUsageMetrics.kt
@@ -1,12 +1,12 @@
-package com.example.dittodiskusage.usecase
-
-import com.example.dittodiskusage.DITTO_REPLICATION
-import com.example.dittodiskusage.DITTO_STORE
-import com.example.dittodiskusage.DiskUsageState
-import com.example.dittodiskusage.METRIC_NAME
-import com.example.dittodiskusage.ROOT_PATH
-import com.example.dittodiskusage.TOTAL_SIZE
-import com.example.dittodiskusage.FIVE_HUNDRED_MEGABYTES_IN_BYTES
+package live.ditto.dittodiskusage.usecase
+
+import live.ditto.dittodiskusage.DITTO_REPLICATION
+import live.ditto.dittodiskusage.DITTO_STORE
+import live.ditto.dittodiskusage.DiskUsageState
+import live.ditto.dittodiskusage.METRIC_NAME
+import live.ditto.dittodiskusage.ROOT_PATH
+import live.ditto.dittodiskusage.TOTAL_SIZE
+import live.ditto.dittodiskusage.FIVE_HUNDRED_MEGABYTES_IN_BYTES
 import live.ditto.healthmetrics.HealthMetric
 
 class GetDiskUsageMetrics() {

diff --git a/...tionReporter/src/main/java/live/ditto/presencedegradationreporter/components/PeersForm.kt b/...tionReporter/src/main/java/live/ditto/presencedegradationreporter/components/PeersForm.kt
@@ -9,12 +9,12 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Checkbox
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -27,14 +27,13 @@ import androidx.compose.ui.unit.dp
 import live.ditto.presencedegradationreporter.R
 import live.ditto.presencedegradationreporter.theme.PresenceDegradationReporterTheme
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun PeersForm(
     expectedPeers: Int,
     reportApiEnabled: Boolean,
     onSave: (expectedPeers: Int, reportApiEnabled: Boolean) -> Unit
 ) {
-    var peers by remember(expectedPeers) { mutableStateOf(expectedPeers) }
+    var peers by remember(expectedPeers) { mutableIntStateOf(expectedPeers) }
     var apiEnabled by remember(reportApiEnabled) { mutableStateOf(reportApiEnabled) }
     var isError by remember { mutableStateOf(false) }
 
@@ -96,7 +95,7 @@ private fun PeersFormPreview() {
         PeersForm(
             expectedPeers = 1,
             reportApiEnabled = true,
-            onSave = { a, b -> }
+            onSave = { _, _ -> }
         )
     }
 }

diff --git a/DittoToolsViewer/src/main/java/live/ditto/dittotoolsviewer/presentation/DittoToolsViewer.kt b/DittoToolsViewer/src/main/java/live/ditto/dittotoolsviewer/presentation/DittoToolsViewer.kt
diff --git a/app/src/main/java/live/ditto/dittotoolsapp/HeartbeatView.kt b/app/src/main/java/live/ditto/dittotoolsapp/HeartbeatView.kt
@@ -10,11 +10,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.example.dittodiskusage.DiskUsageViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import live.ditto.Ditto
+import live.ditto.dittodiskusage.DiskUsageViewModel
 import live.ditto.healthmetrics.HealthMetricProvider
 import live.ditto.dittoheartbeat.DittoHeartbeatConfig
 import live.ditto.dittoheartbeat.DittoHeartbeatInfo

diff --git a/app/src/main/java/live/ditto/dittotoolsapp/MainActivity.kt b/app/src/main/java/live/ditto/dittotoolsapp/MainActivity.kt
@@ -27,7 +27,6 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.example.dittodiskusage.DittoDiskUsage
 import ditto.live.dittopresenceviewer.DittoPresenceViewer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -37,6 +36,7 @@ import live.ditto.DittoLogLevel
 import live.ditto.DittoLogger
 import live.ditto.android.DefaultAndroidDittoDependencies
 import live.ditto.dittodatabrowser.DittoDataBrowser
+import live.ditto.dittodiskusage.DittoDiskUsage
 import live.ditto.dittotoolsapp.ui.theme.DittoToolsAppTheme
 import live.ditto.health.HealthScreen
 import live.ditto.presencedegradationreporter.PresenceDegradationReporterScreen

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@
 android-gradle-plugin = "7.3.0"
 androidx-activity = "1.7.1"
 androidx-appcompat = "1.6.1"
-androidx-compose = "2023.03.00"
+androidx-compose = "2024.06.00"
 androidx-navigation = "2.5.3"
 androidx-test-ext = "1.1.5"
 androidx-webkit = "1.7.0"