Skip to content

T
TeamPrinterV2
Commit 165cbcb3 by Aleksandr
Options

clean code

parent c8233083
Showing with 0 additions and 24 deletions
app/src/main/java/com/isidroid/c23/MainActivity.kt
package com.isidroid.c23 package com.isidroid.c23
import android.app.Activity import android.app.Activity
import android.net.Uri
import android.os.Bundle import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.SystemBarStyle import androidx.activity.SystemBarStyle
...@@ -24,11 +23,9 @@ import androidx.navigation.compose.currentBackStackEntryAsState ...@@ -24,11 +23,9 @@ import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import com.isidroid.c23.ext.isEdgeToEdge import com.isidroid.c23.ext.isEdgeToEdge
import com.isidroid.c23.ui.navigation.AppNavHost import com.isidroid.c23.ui.navigation.AppNavHost
import com.isidroid.c23.ui.navigation.PrintJobs
import com.isidroid.c23.ui.navigation.routeHome import com.isidroid.c23.ui.navigation.routeHome
import com.isidroid.c23.ui.theme.AppTheme import com.isidroid.c23.ui.theme.AppTheme
import com.isidroid.core.ext.navigateSingleTopTo import com.isidroid.core.ext.navigateSingleTopTo
import com.isidroid.core.ext.printCurrentDestination
import com.isidroid.core.ext.printNavigationStack import com.isidroid.core.ext.printNavigationStack
import com.isidroid.utils.extractUris import com.isidroid.utils.extractUris
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
......
app/src/main/java/com/isidroid/c23/ui/navigation/AppNavHost.kt
package com.isidroid.c23.ui.navigation package com.isidroid.c23.ui.navigation
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.NavType import androidx.navigation.NavType
...@@ -16,7 +15,6 @@ import com.isidroid.c23.ui.navigation.destinations.JobDetailsDestination ...@@ -16,7 +15,6 @@ import com.isidroid.c23.ui.navigation.destinations.JobDetailsDestination
import com.isidroid.c23.ui.navigation.destinations.MapScreenDestination import com.isidroid.c23.ui.navigation.destinations.MapScreenDestination
import com.isidroid.c23.ui.navigation.destinations.PrintJobsScreenDestination import com.isidroid.c23.ui.navigation.destinations.PrintJobsScreenDestination
import com.isidroid.c23.ui.navigation.destinations.RenderScreenDestination import com.isidroid.c23.ui.navigation.destinations.RenderScreenDestination
import timber.log.Timber
@Composable @Composable
fun AppNavHost( fun AppNavHost(
......
app/src/main/java/com/isidroid/c23/ui/navigation/destinations/HomeScreenDestination.kt
...@@ -11,7 +11,6 @@ import com.isidroid.c23.ui.screen.home.HomeContract ...@@ -11,7 +11,6 @@ import com.isidroid.c23.ui.screen.home.HomeContract
import com.isidroid.c23.ui.screen.home.HomeScreen import com.isidroid.c23.ui.screen.home.HomeScreen
import com.isidroid.c23.ui.screen.home.HomeViewModel import com.isidroid.c23.ui.screen.home.HomeViewModel
import com.isidroid.core.ext.navigateSingleTopTo import com.isidroid.core.ext.navigateSingleTopTo
import timber.log.Timber
@Composable @Composable
fun HomeScreenDestination(navController: NavHostController) { fun HomeScreenDestination(navController: NavHostController) {
......
app/src/main/java/com/isidroid/c23/ui/navigation/destinations/MapScreenDestination.kt
...@@ -3,7 +3,6 @@ package com.isidroid.c23.ui.navigation.destinations ...@@ -3,7 +3,6 @@ package com.isidroid.c23.ui.navigation.destinations
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import com.isidroid.c23.ui.navigation.Home
import com.isidroid.c23.ui.navigation.routeRenderPreview import com.isidroid.c23.ui.navigation.routeRenderPreview
import com.isidroid.c23.ui.navigation.routeSelectContent import com.isidroid.c23.ui.navigation.routeSelectContent
import com.isidroid.c23.ui.screen.map.MapContract import com.isidroid.c23.ui.screen.map.MapContract
......
app/src/main/java/com/isidroid/c23/ui/navigation/destinations/RenderScreenDestination.kt
...@@ -3,7 +3,6 @@ package com.isidroid.c23.ui.navigation.destinations ...@@ -3,7 +3,6 @@ package com.isidroid.c23.ui.navigation.destinations
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavController import androidx.navigation.NavController
import com.isidroid.c23.ui._component.BackCloseComponent
import com.isidroid.c23.ui.navigation.routeJobDetails import com.isidroid.c23.ui.navigation.routeJobDetails
import com.isidroid.c23.ui.navigation.routeMap import com.isidroid.c23.ui.navigation.routeMap
import com.isidroid.c23.ui.navigation.routeSelectContent import com.isidroid.c23.ui.navigation.routeSelectContent
...@@ -11,7 +10,6 @@ import com.isidroid.c23.ui.screen.render_preview.RenderContract ...@@ -11,7 +10,6 @@ import com.isidroid.c23.ui.screen.render_preview.RenderContract
import com.isidroid.c23.ui.screen.render_preview.RenderPreviewScreen import com.isidroid.c23.ui.screen.render_preview.RenderPreviewScreen
import com.isidroid.c23.ui.screen.render_preview.RenderViewModel import com.isidroid.c23.ui.screen.render_preview.RenderViewModel
import com.isidroid.core.ext.navigateSingleTopTo import com.isidroid.core.ext.navigateSingleTopTo
import timber.log.Timber
@Composable @Composable
fun RenderScreenDestination(navController: NavController) { fun RenderScreenDestination(navController: NavController) {
......
app/src/main/java/com/isidroid/c23/ui/screen/content/ContentScreen.kt
...@@ -3,7 +3,6 @@ package com.isidroid.c23.ui.screen.content ...@@ -3,7 +3,6 @@ package com.isidroid.c23.ui.screen.content
import android.Manifest import android.Manifest
import android.os.Build import android.os.Build
import android.widget.Toast import android.widget.Toast
import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
......
app/src/main/java/com/isidroid/c23/ui/screen/details/JobDetailsScreen.kt
...@@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable ...@@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.State import androidx.compose.runtime.State
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import com.isidroid.c23.ui.screen.content.ContentContract
import com.isidroid.c23.ui.screen.details.component.DetailsV2 import com.isidroid.c23.ui.screen.details.component.DetailsV2
import com.isidroid.c23.ui.screen.map._components.RequestLocationPermissionComponent import com.isidroid.c23.ui.screen.map._components.RequestLocationPermissionComponent
import com.isidroid.core.vm.SIDE_EFFECTS_KEY import com.isidroid.core.vm.SIDE_EFFECTS_KEY
......
app/src/main/java/com/isidroid/c23/ui/screen/details/component/v1.kt
...@@ -3,22 +3,17 @@ package com.isidroid.c23.ui.screen.details.component ...@@ -3,22 +3,17 @@ package com.isidroid.c23.ui.screen.details.component
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.State import androidx.compose.runtime.State
...@@ -29,7 +24,6 @@ import androidx.compose.ui.draw.clip ...@@ -29,7 +24,6 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.ConstraintLayout
......
app/src/main/java/com/isidroid/c23/ui/screen/details/component/v2.kt
...@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth ...@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.LinearProgressIndicator import androidx.compose.material.LinearProgressIndicator
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.Card import androidx.compose.material3.Card
...@@ -20,7 +19,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api ...@@ -20,7 +19,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
...@@ -31,7 +29,6 @@ import androidx.compose.ui.draw.clip ...@@ -31,7 +29,6 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
......
app/src/main/java/com/isidroid/c23/ui/screen/map/MapContract.kt
package com.isidroid.c23.ui.screen.map package com.isidroid.c23.ui.screen.map
import com.isidroid.c23.ui.screen.home.HomeContract
import com.isidroid.core.vm.ViewEvent import com.isidroid.core.vm.ViewEvent
import com.isidroid.core.vm.ViewSideEffect import com.isidroid.core.vm.ViewSideEffect
import com.isidroid.core.vm.ViewState import com.isidroid.core.vm.ViewState
......
app/src/main/java/com/isidroid/c23/ui/screen/map/_components/RequestLocationPermissionComponent.kt
...@@ -9,13 +9,11 @@ import androidx.compose.material3.Text ...@@ -9,13 +9,11 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.State
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.isidroid.c23.R import com.isidroid.c23.R
import com.isidroid.c23.ui.screen.map.MapContract
import rememberPermissionState import rememberPermissionState
@Composable @Composable
......
app/src/main/java/com/isidroid/c23/ui/screen/render_preview/RenderPreviewScreen.kt
package com.isidroid.c23.ui.screen.render_preview package com.isidroid.c23.ui.screen.render_preview
import android.util.SparseArray import android.util.SparseArray
import android.widget.Toast
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment