200 and 500 pages

This commit is contained in:
Ania-Krivs 2025-02-20 13:01:15 +03:00
parent 67bc04bf17
commit 611a917c56
9 changed files with 292 additions and 33 deletions

10
.idea/deploymentTargetSelector.xml generated Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetSelector">
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>
</project>

1
.idea/gradle.xml generated
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>

View File

@ -0,0 +1,57 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
</inspection_tool>
</profile>
</component>

6
.idea/kotlinc.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="2.0.0" />
</component>
</project>

2
.idea/misc.xml generated
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21">
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

6
.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -37,7 +37,9 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.CenterVertically
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
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.IntOffset
@ -53,8 +55,6 @@ class MainActivity : ComponentActivity() {
setContent {
PiiiiiiiiiiigTheme {
LoginScreen()
FindUser()
Profile()
}
}
}
@ -65,6 +65,9 @@ class MainActivity : ComponentActivity() {
fun LoginScreen() {
val cor = rememberCoroutineScope()
Surface {
Text(text = "mini", modifier = Modifier.padding(horizontal = 30.dp))
Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.Center,
@ -76,11 +79,21 @@ fun LoginScreen() {
// modifier = Modifier.padding(bottom = 36.dp)
// )
Image(
painter = painterResource(id = R.drawable.heel),
contentDescription = "",
modifier = Modifier.size(width = 145.dp, height = 100.dp).padding(bottom = 60.dp)
)
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth()
){
// Text(text = "mini", modifier = Modifier.padding(horizontal = 30.dp))
Image(
painter = painterResource(id = R.drawable.heel),
contentDescription = "",
modifier = Modifier.size(width = 145.dp, height = 100.dp).padding(bottom = 50.dp)
)
}
var login by remember { mutableStateOf("") }
var password by remember { mutableStateOf("") }
@ -115,6 +128,7 @@ fun LoginScreen() {
}
Image(
painter = painterResource(id = R.drawable.up_wave),
contentDescription = "",
@ -131,15 +145,14 @@ fun LoginScreen() {
)
}
// Column(
// modifier = Modifier.fillMaxSize(),
// verticalArrangement = Arrangement.Center,
// horizontalAlignment = Alignment.CenterHorizontally,
// ){
// Text(text = "mini", fontSize = 20.sp, modifier = Modifier)
// Spacer(modifier = Modifier.width(65.dp))
// Text(text = "pigs", fontSize = 20.sp)
// }
Column(
modifier = Modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
){
Text(text = "mini", fontSize = 20.sp, modifier = Modifier.padding(top = 270.dp))
Spacer(modifier = Modifier.width(65.dp))
Text(text = "pigs", fontSize = 20.sp)
}
}
@ -206,30 +219,106 @@ fun FindUser() {
}
}
@Composable
fun Profile() {
fun Done() {
val cor = rememberCoroutineScope()
Surface {
Column(
modifier = Modifier.fillMaxSize().background(Color.White),
horizontalAlignment = Alignment.CenterHorizontally
) {
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
){
Box(
modifier = Modifier.fillMaxWidth().height(200.dp)
.background(Color(red = 231, green = 113, blue = 113))
) {
Column(
modifier = Modifier.fillMaxSize().background(Color.White),
horizontalAlignment = Alignment.CenterHorizontally
) {
Box(
modifier = Modifier.size(80.dp).background(Color(red = 231, green = 113, blue = 113))
contentAlignment = Alignment.Center,
content = {}
)
)
}
}
Text(
text = "Done",
fontSize = 32.sp,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(16.dp),
)
Image(
painter = painterResource(id = R.drawable.happy_pig),
contentDescription = "Happy pig",
contentScale = ContentScale.Fit,
modifier = Modifier.size(250.dp).padding(8.dp)
)
}
Image(
painter = painterResource(id = R.drawable.up_wave),
contentDescription = "",
modifier = Modifier.fillMaxWidth()
)
Box(
modifier = Modifier.fillMaxSize()
) {
Image(
painter = painterResource(id = R.drawable.down_wave),
contentDescription = "",
modifier = Modifier.align(Alignment.BottomCenter)
)
}
}
}
@Composable
fun Error() {
val cor = rememberCoroutineScope()
Surface {
Column(
modifier = Modifier.fillMaxSize().background(Color.White),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
){
Box(
contentAlignment = Alignment.Center,
content = {}
)
Text(
text = "Error",
fontSize = 32.sp,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(16.dp),
)
Image(
painter = painterResource(id = R.drawable.scary_pig),
contentDescription = "Scary pig",
contentScale = ContentScale.Fit,
modifier = Modifier.size(250.dp).padding(8.dp)
)
}
Image(
painter = painterResource(id = R.drawable.up_wave),
contentDescription = "",
modifier = Modifier.fillMaxWidth()
)
Box(
modifier = Modifier.fillMaxSize()
) {
Image(
painter = painterResource(id = R.drawable.down_wave),
contentDescription = "",
modifier = Modifier.align(Alignment.BottomCenter)
)
}
}
}

View File

@ -0,0 +1,45 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="275dp"
android:height="233dp"
android:viewportWidth="275"
android:viewportHeight="233">
<path
android:pathData="M141.03,116.5m-116.5,0a116.5,116.5 0,1 1,233 0a116.5,116.5 0,1 1,-233 0"
android:fillColor="#FFEDED"/>
<path
android:pathData="M241.79,113.68V54.35C241.79,31.24 244.29,30.22 256.31,21.54C264.99,15.26 277.38,13.56 273.55,11.89C264.82,8.07 236.89,4.65 195,21.54C153.11,38.42 140.46,50.79 140.46,50.79C118.51,63.88 119.16,94.32 141.66,106.56L190.05,132.88C212.54,145.12 241.79,133.66 241.79,113.68Z"
android:fillColor="#FFEDED"/>
<path
android:pathData="M32.47,113.68V54.35C32.47,31.24 29.98,30.22 17.96,21.54C9.27,15.26 -3.12,13.56 0.72,11.89C9.44,8.07 37.37,4.65 79.27,21.54C121.16,38.42 133.8,50.79 133.8,50.79C155.76,63.88 155.1,94.32 132.61,106.56L84.22,132.88C61.72,145.12 32.47,133.66 32.47,113.68Z"
android:fillColor="#FFEDED"/>
<path
android:pathData="M98,114.25a43,27.25 0,1 0,86 0a43,27.25 0,1 0,-86 0z"
android:fillColor="#FFD0D0"/>
<path
android:pathData="M168.25,114.25C168.25,119.27 164.19,123.34 159.17,123.34C154.15,123.34 150.08,119.27 150.08,114.25C150.08,109.24 154.15,105.17 159.17,105.17C164.19,105.17 168.25,109.24 168.25,114.25Z"
android:fillColor="#E77171"/>
<path
android:pathData="M122.83,114.25m-9.08,0a9.08,9.08 0,1 1,18.17 0a9.08,9.08 0,1 1,-18.17 0"
android:fillColor="#E77171"/>
<path
android:pathData="M140.81,193C170.14,193 190.78,141.18 170.14,154.59C149.5,168 132,166.5 111.48,154.59C90.97,142.68 111.48,193 140.81,193Z"
android:fillColor="#E77171"/>
<path
android:pathData="M92,72.81a13.31,16.81 0,1 0,26.62 0a13.31,16.81 0,1 0,-26.62 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M94,67.25a11.22,11.25 0,1 0,22.44 0a11.22,11.25 0,1 0,-22.44 0z"
android:fillColor="#000000"/>
<path
android:pathData="M105.69,62.21a2.28,2.56 0,1 0,4.56 0a2.28,2.56 0,1 0,-4.56 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M163.38,73a13.31,16.81 0,1 0,26.62 0a13.31,16.81 0,1 0,-26.62 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M166,68.06a11.03,11.06 0,1 0,22.06 0a11.03,11.06 0,1 0,-22.06 0z"
android:fillColor="#000000"/>
<path
android:pathData="M177.07,62.4a2.28,2.56 0,1 0,4.56 0a2.28,2.56 0,1 0,-4.56 0z"
android:fillColor="#ffffff"/>
</vector>

View File

@ -0,0 +1,45 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="275dp"
android:height="233dp"
android:viewportWidth="275"
android:viewportHeight="233">
<path
android:pathData="M141.03,116.5m-116.5,0a116.5,116.5 0,1 1,233 0a116.5,116.5 0,1 1,-233 0"
android:fillColor="#FFEDED"/>
<path
android:pathData="M241.79,113.68V54.35C241.79,31.24 244.29,30.22 256.31,21.54C264.99,15.26 277.38,13.56 273.55,11.89C264.82,8.07 236.89,4.65 195,21.54C153.11,38.42 140.46,50.79 140.46,50.79C118.51,63.88 119.16,94.32 141.66,106.56L190.05,132.88C212.54,145.12 241.79,133.66 241.79,113.68Z"
android:fillColor="#FFEDED"/>
<path
android:pathData="M32.47,113.68V54.35C32.47,31.24 29.98,30.22 17.96,21.54C9.27,15.26 -3.12,13.56 0.72,11.89C9.44,8.07 37.37,4.65 79.27,21.54C121.16,38.42 133.8,50.79 133.8,50.79C155.76,63.88 155.1,94.32 132.61,106.56L84.22,132.88C61.72,145.12 32.47,133.66 32.47,113.68Z"
android:fillColor="#FFEDED"/>
<path
android:pathData="M98,114.25a43,27.25 0,1 0,86 0a43,27.25 0,1 0,-86 0z"
android:fillColor="#FFD0D0"/>
<path
android:pathData="M168.25,114.25C168.25,119.27 164.19,123.34 159.17,123.34C154.15,123.34 150.08,119.27 150.08,114.25C150.08,109.24 154.15,105.17 159.17,105.17C164.19,105.17 168.25,109.24 168.25,114.25Z"
android:fillColor="#E77171"/>
<path
android:pathData="M122.83,114.25m-9.08,0a9.08,9.08 0,1 1,18.17 0a9.08,9.08 0,1 1,-18.17 0"
android:fillColor="#E77171"/>
<path
android:pathData="M141,193.26C148.97,193.26 156.4,191.02 162.7,187.16C182,175.32 163.64,153 141,153C118.36,153 100,175.32 119.3,187.16C125.6,191.02 133.03,193.26 141,193.26Z"
android:fillColor="#E77171"/>
<path
android:pathData="M162.38,69a13.31,16.81 0,1 0,26.62 0a13.31,16.81 0,1 0,-26.62 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M165,64.06a11.03,11.06 0,1 0,22.06 0a11.03,11.06 0,1 0,-22.06 0z"
android:fillColor="#000000"/>
<path
android:pathData="M176.07,58.4a2.28,2.56 0,1 0,4.56 0a2.28,2.56 0,1 0,-4.56 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M91,68.81a13.31,16.81 0,1 0,26.62 0a13.31,16.81 0,1 0,-26.62 0z"
android:fillColor="#ffffff"/>
<path
android:pathData="M93,63.25a11.22,11.25 0,1 0,22.44 0a11.22,11.25 0,1 0,-22.44 0z"
android:fillColor="#000000"/>
<path
android:pathData="M104.69,58.21a2.28,2.56 0,1 0,4.56 0a2.28,2.56 0,1 0,-4.56 0z"
android:fillColor="#ffffff"/>
</vector>