diff --git a/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt b/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt index 3e8824bf..4ac83953 100644 --- a/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt +++ b/common/src/androidTest/java/com/yogeshpaliyal/common/ExampleInstrumentedTest.kt @@ -1,13 +1,10 @@ package com.yogeshpaliyal.common -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -18,7 +15,5 @@ class ExampleInstrumentedTest { @Test fun useAppContext() { // Context of the app under test. - val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.yogeshpaliyal.common", appContext.packageName) } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/yogeshpaliyal/common/MainActivity.kt b/common/src/main/java/com/yogeshpaliyal/common/MainActivity.kt index 02c78bf0..90a3018a 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/MainActivity.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/MainActivity.kt @@ -1,11 +1,11 @@ package com.yogeshpaliyal.common -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) } -} \ No newline at end of file +} diff --git a/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt b/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt index 4d570fa1..99526c0c 100644 --- a/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt +++ b/common/src/main/java/com/yogeshpaliyal/common/data/AccountModel.kt @@ -56,13 +56,11 @@ open class AccountModel( ) { fun getInitials() = ( - title?.firstOrNull() ?: username?.firstOrNull() ?: site?.firstOrNull() + title?.firstOrNull() ?: username?.firstOrNull() ?: site?.firstOrNull() ?: notes?.firstOrNull() ?: 'K' - ).toString() - + ).toString() fun getOtp() = TOTPHelper.generate(password) fun getTOtpProgress() = TOTPHelper.getProgress().toInt() - } diff --git a/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt b/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt index f346ae56..8f2ace3d 100644 --- a/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt +++ b/common/src/test/java/com/yogeshpaliyal/common/ExampleUnitTest.kt @@ -1,8 +1,7 @@ package com.yogeshpaliyal.common -import org.junit.Test - import org.junit.Assert.* +import org.junit.Test /** * Example local unit test, which will execute on the development machine (host). @@ -14,4 +13,4 @@ class ExampleUnitTest { fun addition_isCorrect() { assertEquals(4, 2 + 2) } -} \ No newline at end of file +} diff --git a/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt b/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt index dad7e96e..74ce5d3e 100644 --- a/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt +++ b/keypasscompose/src/androidTest/java/com/yogeshpaliyal/keypasscompose/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package com.yogeshpaliyal.keypasscompose -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * @@ -21,4 +19,4 @@ class ExampleInstrumentedTest { val appContext = InstrumentationRegistry.getInstrumentation().targetContext assertEquals("com.yogeshpaliyal.keypasscompose", appContext.packageName) } -} \ No newline at end of file +} diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt index e9fd0e4c..9156c16b 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/MainActivity.kt @@ -27,38 +27,40 @@ class MainActivity : ComponentActivity() { KeyPassTheme { // A surface container using the 'background' color from the theme Surface(color = MaterialTheme.colorScheme.background) { - Material3Scaffold(bottomBar = { - Material3BottomAppBar(cutoutShape = RoundedCornerShape(50)) { - IconButton( - onClick = { - /* doSomething() */ + Material3Scaffold( + bottomBar = { + Material3BottomAppBar(cutoutShape = RoundedCornerShape(50)) { + IconButton( + onClick = { + /* doSomething() */ + } + ) { + Icon(Icons.Filled.Menu, "") } - ) { - Icon(Icons.Filled.Menu,"") - } - Spacer(Modifier.weight(1f, true)) - IconButton( - onClick = { - /* doSomething() */ + Spacer(Modifier.weight(1f, true)) + IconButton( + onClick = { + /* doSomething() */ + } + ) { + Icon(Icons.Filled.Star, "") } - ) { - Icon(Icons.Filled.Star,"") } - } - }, floatingActionButton = { - FloatingActionButton( - onClick = { - - }, - contentColor = Color.White, - shape = RoundedCornerShape(50) - ) { - Icon(Icons.Filled.Add,"") - } - }, floatingActionButtonPosition = FabPosition.Center, - isFloatingActionButtonDocked = true) { - + }, + floatingActionButton = { + FloatingActionButton( + onClick = { + }, + contentColor = Color.White, + shape = RoundedCornerShape(50) + ) { + Icon(Icons.Filled.Add, "") + } + }, + floatingActionButtonPosition = FabPosition.Center, + isFloatingActionButtonDocked = true + ) { } Greeting("Android") } @@ -78,4 +80,4 @@ fun DefaultPreview() { KeyPassTheme { Greeting("Android") } -} \ No newline at end of file +} diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Color.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Color.kt index f4855daa..5490a31b 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Color.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Color.kt @@ -5,4 +5,4 @@ import androidx.compose.ui.graphics.Color val Purple200 = Color(0xFFBB86FC) val Purple500 = Color(0xFF6200EE) val Purple700 = Color(0xFF3700B3) -val Teal200 = Color(0xFF03DAC5) \ No newline at end of file +val Teal200 = Color(0xFF03DAC5) diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt index 9bbf780f..fdb36f8d 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Material3Components.kt @@ -12,7 +12,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shape import androidx.compose.ui.unit.Dp - @Composable fun Material3BottomAppBar( modifier: Modifier = Modifier, @@ -35,27 +34,29 @@ fun Material3BottomAppBar( } @Composable -fun Material3Scaffold(modifier: Modifier = Modifier, - scaffoldState: ScaffoldState = rememberScaffoldState(), - topBar: @Composable () -> Unit = {}, - bottomBar: @Composable () -> Unit = {}, - snackbarHost: @Composable (SnackbarHostState) -> Unit = { SnackbarHost(it) }, - floatingActionButton: @Composable () -> Unit = {}, - floatingActionButtonPosition: FabPosition = FabPosition.End, - isFloatingActionButtonDocked: Boolean = false, - drawerContent: @Composable (ColumnScope.() -> Unit)? = null, - drawerGesturesEnabled: Boolean = true, - drawerShape: Shape = androidx.compose.material.MaterialTheme.shapes.large, - drawerElevation: Dp = DrawerDefaults.Elevation, - drawerBackgroundColor: Color = MaterialTheme.colorScheme.surface, - drawerContentColor: Color = contentColorFor( - drawerBackgroundColor - ), - drawerScrimColor: Color = DrawerDefaults.scrimColor, - backgroundColor: Color = MaterialTheme.colorScheme.background, - contentColor: Color = contentColorFor( - backgroundColor - ), - content: @Composable (PaddingValues) -> Unit){ +fun Material3Scaffold( + modifier: Modifier = Modifier, + scaffoldState: ScaffoldState = rememberScaffoldState(), + topBar: @Composable () -> Unit = {}, + bottomBar: @Composable () -> Unit = {}, + snackbarHost: @Composable (SnackbarHostState) -> Unit = { SnackbarHost(it) }, + floatingActionButton: @Composable () -> Unit = {}, + floatingActionButtonPosition: FabPosition = FabPosition.End, + isFloatingActionButtonDocked: Boolean = false, + drawerContent: @Composable (ColumnScope.() -> Unit)? = null, + drawerGesturesEnabled: Boolean = true, + drawerShape: Shape = androidx.compose.material.MaterialTheme.shapes.large, + drawerElevation: Dp = DrawerDefaults.Elevation, + drawerBackgroundColor: Color = MaterialTheme.colorScheme.surface, + drawerContentColor: Color = contentColorFor( + drawerBackgroundColor + ), + drawerScrimColor: Color = DrawerDefaults.scrimColor, + backgroundColor: Color = MaterialTheme.colorScheme.background, + contentColor: Color = contentColorFor( + backgroundColor + ), + content: @Composable (PaddingValues) -> Unit +) { Scaffold(modifier, scaffoldState, topBar, bottomBar, snackbarHost, floatingActionButton, floatingActionButtonPosition, isFloatingActionButtonDocked, drawerContent, drawerGesturesEnabled, drawerShape, drawerElevation, drawerBackgroundColor, drawerContentColor, drawerScrimColor, backgroundColor, contentColor, content) -} \ No newline at end of file +} diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Shape.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Shape.kt index 2610d181..8a765e43 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Shape.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Shape.kt @@ -1,2 +1 @@ package com.yogeshpaliyal.keypasscompose.ui.theme - diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Theme.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Theme.kt index f7e2affd..62879834 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Theme.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Theme.kt @@ -40,4 +40,4 @@ fun KeyPassTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composabl typography = Typography, content = content ) -} \ No newline at end of file +} diff --git a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Type.kt b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Type.kt index 6adab457..b07440d3 100644 --- a/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Type.kt +++ b/keypasscompose/src/main/java/com/yogeshpaliyal/keypasscompose/ui/theme/Type.kt @@ -25,4 +25,4 @@ val Typography = Typography( fontSize = 12.sp ) */ -) \ No newline at end of file +) diff --git a/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt b/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt index 29d02963..5393aaa5 100644 --- a/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt +++ b/keypasscompose/src/test/java/com/yogeshpaliyal/keypasscompose/ExampleUnitTest.kt @@ -1,8 +1,7 @@ package com.yogeshpaliyal.keypasscompose -import org.junit.Test - import org.junit.Assert.* +import org.junit.Test /** * Example local unit test, which will execute on the development machine (host). @@ -14,4 +13,4 @@ class ExampleUnitTest { fun addition_isCorrect() { assertEquals(4, 2 + 2) } -} \ No newline at end of file +}