commit df6d85786ba7ad51a564f7896c69553c78aa9bcf Author: Michael Kits <55844847+SeanGTX@users.noreply.github.com> Date: Fri Jan 6 01:30:07 2023 +0300 Определена стркутура проекта, верстка основных компонентов diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..22833d8 --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..8e6d21a --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..875a112 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,23 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..e546720 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..e57da6e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,69 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + compileSdk 32 + + defaultConfig { + applicationId "ru.megboyzz.dnevnik" + minSdk 21 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion compose_version + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation "androidx.compose.ui:ui:$compose_version" + implementation "androidx.compose.material:material:$compose_version" + implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' + implementation 'androidx.activity:activity-compose:1.3.1' + implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" + debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" + + implementation "androidx.navigation:navigation-compose:2.5.3" + + implementation "androidx.compose.runtime:runtime-livedata:$compose_version" + implementation "androidx.compose.material:material-icons-extended:$compose_version" + implementation "com.google.accompanist:accompanist-swiperefresh:0.23.0" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/ru/megboyzz/dnevnik/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ru/megboyzz/dnevnik/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..c887a2b --- /dev/null +++ b/app/src/androidTest/java/ru/megboyzz/dnevnik/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package ru.megboyzz.dnevnik + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("ru.megboyzz.dnevnik", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8ee636c --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt b/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt new file mode 100644 index 0000000..205b6e9 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt @@ -0,0 +1,24 @@ +package ru.megboyzz.dnevnik + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.* +import androidx.compose.material.* +import androidx.compose.ui.Modifier +import ru.megboyzz.dnevnik.navigation.AppNavHost +import ru.megboyzz.dnevnik.ui.theme.* + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + Surface( + modifier = Modifier.fillMaxSize(), + color = lightGray + ) { + AppNavHost() + } + } + } +} diff --git a/app/src/main/java/ru/megboyzz/dnevnik/Utils.kt b/app/src/main/java/ru/megboyzz/dnevnik/Utils.kt new file mode 100644 index 0000000..ef4d717 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/Utils.kt @@ -0,0 +1,29 @@ +package ru.megboyzz.dnevnik + + +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.width +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.unit.Dp + +@Composable +fun Int.AsPainter() = painterResource(this) + +@Composable +fun Int.AsString() = stringResource(this) + +@Composable +fun SpacerWidth(width: Dp) = Spacer(Modifier.width(width)) + +@Composable +fun SpacerHeight(height: Dp) = Spacer(Modifier.height(height)) + + +@Composable +fun Int.AsImageVector() = ImageVector.vectorResource(this) \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/navigation/AppNavHost.kt b/app/src/main/java/ru/megboyzz/dnevnik/navigation/AppNavHost.kt new file mode 100644 index 0000000..591cc08 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/navigation/AppNavHost.kt @@ -0,0 +1,43 @@ +package ru.megboyzz.dnevnik.navigation + +import android.window.SplashScreen +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController + + +sealed class AppNavRoute(val route: String){ + + object Splash : AppNavRoute("splash_screen") + + object Login: AppNavRoute("login_screen") + object Marks: AppNavRoute("marks_screen") + object Schedule: AppNavRoute("schedule_screen") + object HomeWorks: AppNavRoute("hw_screen") + object Settings: AppNavRoute("settings_screen") +} + +@Composable +fun AppNavHost(){ + val navController = rememberNavController() + + /*val activity = LocalContext.current as MainActivity + + val application = activity.application as App + + val viewModel: AppViewModel = viewModel(factory = AppViewModelFactory(application))*/ + + NavHost( + navController = navController, + startDestination = AppNavRoute.Splash.route + ){ + composable(AppNavRoute.Splash.route) { } + composable(AppNavRoute.Marks.route) { } + composable(AppNavRoute.Schedule.route) { } + composable(AppNavRoute.HomeWorks.route) { } + composable(AppNavRoute.Settings.route) { } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/navigation/SubScreenNavHost.kt b/app/src/main/java/ru/megboyzz/dnevnik/navigation/SubScreenNavHost.kt new file mode 100644 index 0000000..64363f5 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/navigation/SubScreenNavHost.kt @@ -0,0 +1,2 @@ +package ru.megboyzz.dnevnik.navigation + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/Components.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/Components.kt new file mode 100644 index 0000000..9631619 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/Components.kt @@ -0,0 +1,494 @@ +package ru.megboyzz.dnevnik.screens + +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.tween +import androidx.compose.animation.expandHorizontally +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInHorizontally +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff +import androidx.compose.runtime.* +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.RoundRect +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Outline +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.* +import androidx.constraintlayout.compose.Visibility +import kotlinx.coroutines.launch +import ru.megboyzz.dnevnik.* +import ru.megboyzz.dnevnik.R +import ru.megboyzz.dnevnik.ui.theme.* + +@Composable +fun MainScaffold( + icon: Painter, + title: String, + /* TODO viewModel */ + content: (@Composable (it: PaddingValues) -> Unit) +) { + val scaffoldState = rememberScaffoldState() + val scope = rememberCoroutineScope() + Scaffold( + scaffoldState = scaffoldState, + topBar = { + TopAppBar( + backgroundColor = mainBlue, + contentColor = Color.White + ) { + IconButton( + onClick = { + val drawerState = scaffoldState.drawerState + scope.launch { + if (drawerState.isClosed) + drawerState.open() + else + drawerState.close() + } + } + ) { + Image(painter = icon, contentDescription = "icon") + } + Text( + text = title, + fontSize = 16.sp, + color = white + ) + } + }, + content = content, + drawerBackgroundColor = mainBlue, + drawerContentColor = white, + drawerShape = drawerShape, + drawerContent = { DrawerContent() } + ) +} + + + +@Composable +fun DrawerContent() { + Column( + modifier = Modifier + .width(260.dp) + .fillMaxSize() + .padding(10.dp), + horizontalAlignment = Alignment.Start + ){ + SpacerHeight(10.dp) + ProfileCard(painter = R.drawable.ic_author.AsPainter()) + SpacerHeight(15.dp) + AlmostOutlinedText(text = "Идет 3-я четверть") + SpacerHeight(20.dp) + Column( + verticalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.padding(5.dp, 0.dp) + ) { + DrawerMainButton( + icon = R.drawable.ic_marks.AsPainter(), + text = R.string.title_marks.AsString() + ) { /* TODO */ } + DrawerMainButton( + icon = R.drawable.ic_homework.AsPainter(), + text = R.string.title_hw.AsString() + ) { /* TODO */ } + DrawerMainButton( + icon = R.drawable.ic_schedule.AsPainter(), + text = R.string.title_schedule.AsString() + ) { /* TODO */ } + DrawerMainButton( + icon = R.drawable.ic_settings.AsPainter(), + text = R.string.title_settings.AsString() + ) { /* TODO */ } + } + Spacer(Modifier.weight(1f)) + Divider(color = white, thickness = 1.dp) + SpacerHeight(5.dp) + Column(Modifier.padding(5.dp, 0.dp)) { + DrawerMainButton( + icon = R.drawable.ic_exit.AsPainter(), + text = R.string.title_leave_from_acconut.AsString() + ) { /* TODO */ } + } + } +} + +val drawerShape = object : Shape { + override fun createOutline( + size: Size, + layoutDirection: LayoutDirection, + density: Density + ): Outline.Rounded { + + val radius = CornerRadius(30f, 30f) + val nullRadius = CornerRadius.Zero + + return Outline.Rounded(RoundRect( + left = 0f, + top = 0f, + right = size.width * 26 / 36, + bottom = size.height, + topLeftCornerRadius = nullRadius, + topRightCornerRadius = radius, + bottomRightCornerRadius = radius, + bottomLeftCornerRadius = nullRadius + )) + } + +} + + +@Composable +fun AlmostOutlinedText( + text: String +){ + Column() { + Divider(color = white, thickness = 1.dp) + Column( + modifier = Modifier + .fillMaxWidth() + .height(30.dp), + verticalArrangement = Arrangement.Center + ) { + Text( + text = text, + color = white, + textAlign = TextAlign.Center, + style = H2, + modifier = Modifier + .fillMaxWidth() + ) + } + Divider(color = white, thickness = 1.dp) + } +} + +@Composable +fun ProfileCard( + textColor: Color = white, + painter: Painter +) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.Start + ) { + Image( + modifier = Modifier.padding(10.dp, 15.dp, 20.dp, 15.dp), + painter = painter, //TODO заменить динмической картинкой + contentDescription = "chel" + ) + Column(verticalArrangement = Arrangement.spacedBy(5.dp)) { + Text( + text = "Имя и фамилия", + style = H1, + color = textColor + ) + Text( + text = "Класс/Группа", + style = H1, + color = textColor + ) + } + } +} + +@Composable +fun LoginBackground() { + val icon = R.drawable.ic_header.AsPainter() + val size = icon.intrinsicSize + Column { + Image( + painter = icon, + contentDescription = "", + modifier = Modifier.fillMaxWidth(), + contentScale = ContentScale.FillWidth, + alignment = Alignment.TopStart + ) + } + +} + + + +@Preview +@Composable +fun ProfilePrev() { + ProfileCard(painter = R.drawable.ic_author.AsPainter()) +} + +@Composable +fun MainTextField( + value: MutableState, + isError: MutableState = remember { mutableStateOf(false) }, + label: String = "", + keyboardType: KeyboardType = KeyboardType.Text, + onChange: (it: String) -> Unit = { value.value = it } +) { + + var passwordVisible by rememberSaveable { mutableStateOf(false) } + val focusRequester = FocusRequester() + + OutlinedTextField( + value = value.value, + onValueChange = onChange, + label = { Text( + text = label, + style = H2, + color = dark + ) }, + shape = RoundedCornerShape(10.dp), + textStyle = H2, + colors = TextFieldDefaults.outlinedTextFieldColors( + textColor = dark, + unfocusedBorderColor = if(isError.value) falseColor else mainBlue, + focusedBorderColor = if(isError.value) falseColor else mainBlue, + focusedLabelColor = dark, + unfocusedLabelColor = dark, + cursorColor = dark + ), + maxLines = 1, + keyboardOptions = KeyboardOptions( + keyboardType = keyboardType + ), + visualTransformation = + if(keyboardType == KeyboardType.Password) { + if (passwordVisible) + VisualTransformation.None + else + PasswordVisualTransformation() + }else VisualTransformation.None, + trailingIcon = { + if(keyboardType == KeyboardType.Password){ + val image = if (passwordVisible) + Icons.Filled.Visibility + else Icons.Filled.VisibilityOff + + IconButton(onClick = {passwordVisible = !passwordVisible}){ + Icon(imageVector = image, "") + } + } + }, + modifier = Modifier + .focusRequester(focusRequester) + .onFocusChanged { + if (it.isFocused) + if(isError.value) isError.value = false + }, + ) +} + +@Composable +fun DrawerMainButton( + icon: Painter, + text: String, + textColor: Color = white, + onClick: () -> Unit = {} +) { + Column( + modifier = Modifier + .fillMaxWidth() + .height(30.dp) + .clickable(onClick = onClick), + verticalArrangement = Arrangement.Center + ) { + Row( + horizontalArrangement = Arrangement.Start + ){ + Image( + painter = icon, + contentDescription = "icon" + ) + SpacerWidth(13.dp) + Text( + text = text, + style = H2, + color = textColor + ) + } + } +} + +@Preview +@Composable +fun Almst() { + Column() { + AlmostOutlinedText(text = "Идет 3-я четверть") + } +} + +@Preview +@Composable +fun ButtonPrev() { + DrawerMainButton( + icon = R.drawable.ic_marks.AsPainter(), + text = "Оценки" + ) +} + + +@Preview +@Composable +fun DrawerPrev() { + Surface( + color = mainBlue + ) { + DrawerContent() + } +} + +@Preview +@Composable +fun MainScaffoldPrev() { + MainScaffold( + icon = R.drawable.ic_marks.AsPainter(), + title = R.string.title_marks.AsString() + ) { + + } +} + +@Preview +@Composable +fun CheckBoxed() { + val isCheck = remember { mutableStateOf(false) } + val titleColor = mainBlue + Row { + Card( + elevation = 0.dp, + shape = RoundedCornerShape(6.dp), + border = BorderStroke(1.5.dp, color = titleColor) + ) { + Box( + modifier = Modifier + .size(20.dp) + .background(if (isCheck.value) titleColor else Color.White) + .clickable { + isCheck.value = !isCheck.value + }, + contentAlignment = Alignment.Center + ) { + if(isCheck.value) + Icon(Icons.Default.Check, contentDescription = "", tint = Color.White) + } + } + } +} + +@Preview +@Composable +fun PrevCB() { + val checkedState = remember { mutableStateOf(true) } + MainCheckbox(checkedState){ + + } +} + + +@Composable +fun MainCheckbox( + isChecked: MutableState, + modifier: Modifier = Modifier, + size: Float = 24f, + checkedColor: Color = mainBlue, + uncheckedColor: Color = white, + checkmarkColor: Color = white, + onValueChange: () -> Unit +) { + + val checkboxColor: Color by animateColorAsState(if (isChecked.value) checkedColor else uncheckedColor) + val density = LocalDensity.current + val duration = 200 + + Row( + modifier = modifier + .toggleable( + value = isChecked.value, + role = Role.Checkbox, + onValueChange = { + isChecked.value = !isChecked.value + onValueChange.invoke() + } + ) + ) { + Card( + elevation = 0.dp, + shape = RoundedCornerShape(8.dp), + border = BorderStroke(1.dp, color = checkedColor), + ) { + Box( + modifier = Modifier + .size(size.dp) + .background(checkboxColor), + contentAlignment = Alignment.Center + ) { + androidx.compose.animation.AnimatedVisibility( + visible = isChecked.value, + enter = slideInHorizontally( + animationSpec = tween(duration) + ) { + (size * -0.5).toInt() + } + expandHorizontally( + expandFrom = Alignment.Start, + animationSpec = tween(duration) + ), + exit = fadeOut() + ) { + Icon( + Icons.Default.Check, + contentDescription = null, + tint = checkmarkColor + ) + } + } + } + } +} + +@Composable +fun MainButton( + text: String, + radius: Dp = 8.dp, + onClick: () -> Unit +) { + Button( + onClick = onClick, + colors = ButtonDefaults.buttonColors( + backgroundColor = mainBlue, + contentColor = Color.White + ), + shape = RoundedCornerShape(radius), + modifier = Modifier.fillMaxWidth() + ) { + Text( + text = text, + style = H1 + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt new file mode 100644 index 0000000..89c2261 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/LoginScreen.kt @@ -0,0 +1,133 @@ +package ru.megboyzz.dnevnik.screens + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.modifier.modifierLocalOf +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.textInputServiceFactory +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import ru.megboyzz.dnevnik.AsString +import ru.megboyzz.dnevnik.R +import ru.megboyzz.dnevnik.SpacerHeight +import ru.megboyzz.dnevnik.SpacerWidth +import ru.megboyzz.dnevnik.ui.theme.* + +@Composable +fun LoginScreen() { + + val login = remember { + mutableStateOf("") + } + val password = remember { + mutableStateOf("") + } + + val configuration = LocalConfiguration.current + val screenHeight = configuration.screenHeightDp + val screenWidth = configuration.screenWidthDp + + val defaultModifier = Modifier.width(500.dp) + + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = defaultModifier + ) { + if(screenWidth < 500) + LoginBackground() + else{ + defaultModifier.then(Modifier.fillMaxWidth()) + } + Row(horizontalArrangement = Arrangement.Center) { + Text( + text = R.string.title_welcome.AsString(), + style = Big, + textAlign = TextAlign.Center, + modifier = Modifier.padding(65.dp, 20.dp, 65.dp, 40.dp) + ) + } + MainTextField( + value = login, + label = R.string.title_login.AsString() + ) + SpacerHeight(15.dp) + MainTextField( + value = password, + keyboardType = KeyboardType.Password, + label = R.string.title_password.AsString() + ) + Row( + modifier = Modifier + .fillMaxWidth() + .padding(65.dp, 10.dp) + .height(30.dp), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Row( + modifier = Modifier.fillMaxHeight(), + verticalAlignment = Alignment.CenterVertically + ) { + val checkedState = remember { mutableStateOf(true) } + MainCheckbox(checkedState) { /* TODO */ } + SpacerWidth(5.dp) + Text( + text = R.string.title_remember_me.AsString(), + style = MainText, + color = dark + ) + } + Text( + text = R.string.title_forget_password.AsString(), + style = MainText, + color = dark, + modifier = Modifier.clickable{ /* TODO */ } + ) + } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(65.dp, 10.dp), + verticalArrangement = Arrangement.Center + ) { + MainButton(text = R.string.title_sign_in.AsString()) { + /* TODO */ + } + SpacerHeight(5.dp) + Text( + text = R.string.title_sign_up.AsString(), + modifier = Modifier + .clickable { + /* TODO */ + } + .padding(5.dp) + .fillMaxWidth(), + textAlign = TextAlign.Center, + style = Mini + ) + } + + } +} + +@Preview +@Composable +fun LoginPagePrev() { + LoginScreen() +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/MarksScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/MarksScreen.kt new file mode 100644 index 0000000..34cf25e --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/MarksScreen.kt @@ -0,0 +1,2 @@ +package ru.megboyzz.dnevnik.screens + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/ScheduleScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/ScheduleScreen.kt new file mode 100644 index 0000000..34cf25e --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/ScheduleScreen.kt @@ -0,0 +1,2 @@ +package ru.megboyzz.dnevnik.screens + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/SettingsScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/SettingsScreen.kt new file mode 100644 index 0000000..34cf25e --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/SettingsScreen.kt @@ -0,0 +1,2 @@ +package ru.megboyzz.dnevnik.screens + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/subscreens/ByDayMarksScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/subscreens/ByDayMarksScreen.kt new file mode 100644 index 0000000..9c8d36a --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/subscreens/ByDayMarksScreen.kt @@ -0,0 +1,2 @@ +package ru.megboyzz.dnevnik.screens.subscreens + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/screens/subscreens/LastMarksSubScreen.kt b/app/src/main/java/ru/megboyzz/dnevnik/screens/subscreens/LastMarksSubScreen.kt new file mode 100644 index 0000000..9c8d36a --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/screens/subscreens/LastMarksSubScreen.kt @@ -0,0 +1,2 @@ +package ru.megboyzz.dnevnik.screens.subscreens + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Color.kt b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Color.kt new file mode 100644 index 0000000..2ed3495 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Color.kt @@ -0,0 +1,24 @@ +package ru.megboyzz.dnevnik.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple200 = Color(0xFFBB86FC) +val Purple500 = Color(0xFF6200EE) +val Purple700 = Color(0xFF3700B3) +val Teal200 = Color(0xFF03DAC5) + +//Цвета из дизайна +val dark = Color(0xFF_272727) +val mainBlue = Color(0xFF_3C95FF) +val lightGray = Color(0xFF_F4F4F4) +val white = Color(0xFF_FFFFFF) +val trueColor = Color(0xFF_56F570) +val falseColor = Color(0xFF_FC5876) +val attentionColor = Color(0xFF_FCF558) +val mainBlur = Color(0xD9_58A3FC) +val blur = Color(0xD9_272727) + +//Цвет годовой оценки +val totalMarkColor = Color(0xFF_FCBA58) + + diff --git a/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Shape.kt b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Shape.kt new file mode 100644 index 0000000..dbf362d --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package ru.megboyzz.dnevnik.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Theme.kt b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Theme.kt new file mode 100644 index 0000000..a02c614 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Theme.kt @@ -0,0 +1,44 @@ +package ru.megboyzz.dnevnik.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.MaterialTheme +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import androidx.compose.runtime.Composable + +private val DarkColorPalette = darkColors( + primary = Purple200, + primaryVariant = Purple700, + secondary = Teal200 +) + +private val LightColorPalette = lightColors( + primary = Purple500, + primaryVariant = Purple700, + secondary = Teal200 + + /* Other default colors to override + background = Color.White, + surface = Color.White, + onPrimary = Color.White, + onSecondary = Color.Black, + onBackground = Color.Black, + onSurface = Color.Black, + */ +) + +@Composable +fun MyDnevnikTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { + val colors = if (darkTheme) { + DarkColorPalette + } else { + LightColorPalette + } + + MaterialTheme( + colors = colors, + typography = Typography, + shapes = Shapes, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Type.kt b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Type.kt new file mode 100644 index 0000000..02f6adc --- /dev/null +++ b/app/src/main/java/ru/megboyzz/dnevnik/ui/theme/Type.kt @@ -0,0 +1,64 @@ +package ru.megboyzz.dnevnik.ui.theme + +import androidx.compose.material.Typography +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.ExperimentalUnitApi +import androidx.compose.ui.unit.TextUnit +import androidx.compose.ui.unit.TextUnitType +import androidx.compose.ui.unit.sp +import androidx.core.content.res.ResourcesCompat +import ru.megboyzz.dnevnik.R + +val Typography = Typography( + body1 = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp + ), + /* Other default text styles to override + button = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.W500, + fontSize = 14.sp + ), + caption = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 12.sp + ) + */ +) + + +val H1 = TextStyle( + fontSize = 20.sp, + fontWeight = FontWeight.Bold +) + +val H2 = TextStyle( + fontSize = 15.sp, + fontWeight = FontWeight.Bold, + lineHeight = (12 * 1.315).sp +) + +val MainText = TextStyle( + fontSize = 12.sp, + fontWeight = FontWeight.Bold, + lineHeight = (10 * 1.56).sp +) + +val Big = TextStyle( + fontSize = 27.sp, + fontWeight = FontWeight.Bold, + lineHeight = (22 * 1.475).sp +) + +val Mini = TextStyle( + fontSize = 10.sp, + fontWeight = FontWeight.Bold, +) \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_white_line.xml b/app/src/main/res/drawable-v24/ic_white_line.xml new file mode 100644 index 0000000..95ff286 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_white_line.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_author.xml b/app/src/main/res/drawable/ic_author.xml new file mode 100644 index 0000000..48bfb75 --- /dev/null +++ b/app/src/main/res/drawable/ic_author.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_black_line.xml b/app/src/main/res/drawable/ic_black_line.xml new file mode 100644 index 0000000..a83531d --- /dev/null +++ b/app/src/main/res/drawable/ic_black_line.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/drawable/ic_choose_icons.xml b/app/src/main/res/drawable/ic_choose_icons.xml new file mode 100644 index 0000000..1a3f234 --- /dev/null +++ b/app/src/main/res/drawable/ic_choose_icons.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml new file mode 100644 index 0000000..da58964 --- /dev/null +++ b/app/src/main/res/drawable/ic_done.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/drawable/ic_exit.xml b/app/src/main/res/drawable/ic_exit.xml new file mode 100644 index 0000000..c651330 --- /dev/null +++ b/app/src/main/res/drawable/ic_exit.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_header.xml b/app/src/main/res/drawable/ic_header.xml new file mode 100644 index 0000000..c2e3ef0 --- /dev/null +++ b/app/src/main/res/drawable/ic_header.xml @@ -0,0 +1,16 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_homework.xml b/app/src/main/res/drawable/ic_homework.xml new file mode 100644 index 0000000..f9696c1 --- /dev/null +++ b/app/src/main/res/drawable/ic_homework.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_hw_is_done_rect.xml b/app/src/main/res/drawable/ic_hw_is_done_rect.xml new file mode 100644 index 0000000..99d2e42 --- /dev/null +++ b/app/src/main/res/drawable/ic_hw_is_done_rect.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_hw_toggeler.xml b/app/src/main/res/drawable/ic_hw_toggeler.xml new file mode 100644 index 0000000..8434585 --- /dev/null +++ b/app/src/main/res/drawable/ic_hw_toggeler.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_login_header.xml b/app/src/main/res/drawable/ic_login_header.xml new file mode 100644 index 0000000..7458a28 --- /dev/null +++ b/app/src/main/res/drawable/ic_login_header.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_marks.xml b/app/src/main/res/drawable/ic_marks.xml new file mode 100644 index 0000000..b6b19ea --- /dev/null +++ b/app/src/main/res/drawable/ic_marks.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_month_swipe_left.xml b/app/src/main/res/drawable/ic_month_swipe_left.xml new file mode 100644 index 0000000..e01d760 --- /dev/null +++ b/app/src/main/res/drawable/ic_month_swipe_left.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_sad_smile.xml b/app/src/main/res/drawable/ic_sad_smile.xml new file mode 100644 index 0000000..ec5d96e --- /dev/null +++ b/app/src/main/res/drawable/ic_sad_smile.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_schedule.xml b/app/src/main/res/drawable/ic_schedule.xml new file mode 100644 index 0000000..1bcbe5c --- /dev/null +++ b/app/src/main/res/drawable/ic_schedule.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..e3ba4cc --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_smile.xml b/app/src/main/res/drawable/ic_smile.xml new file mode 100644 index 0000000..82a47bc --- /dev/null +++ b/app/src/main/res/drawable/ic_smile.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_subject.xml b/app/src/main/res/drawable/ic_subject.xml new file mode 100644 index 0000000..7a9b6fb --- /dev/null +++ b/app/src/main/res/drawable/ic_subject.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon.xml b/app/src/main/res/drawable/icon.xml new file mode 100644 index 0000000..2efc254 --- /dev/null +++ b/app/src/main/res/drawable/icon.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/app/src/main/res/drawable/icon_rounded.xml b/app/src/main/res/drawable/icon_rounded.xml new file mode 100644 index 0000000..8400e6d --- /dev/null +++ b/app/src/main/res/drawable/icon_rounded.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/app/src/main/res/font/inter_bold.xml b/app/src/main/res/font/inter_bold.xml new file mode 100644 index 0000000..fc40af7 --- /dev/null +++ b/app/src/main/res/font/inter_bold.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml new file mode 100644 index 0000000..ad6e6b9 --- /dev/null +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -0,0 +1,17 @@ + + + MyDnevnik + Welcome to MyDnevnik + Marks + Schedule + Home work + Settings + Leave + Welcome + Username/password + Password + Forgot your password? + Remember me + Sign in + Sign up + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml new file mode 100644 index 0000000..d2226ac --- /dev/null +++ b/app/src/main/res/values/font_certs.xml @@ -0,0 +1,17 @@ + + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + 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 + + + diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml new file mode 100644 index 0000000..b8d21d6 --- /dev/null +++ b/app/src/main/res/values/preloaded_fonts.xml @@ -0,0 +1,6 @@ + + + + @font/inter_bold + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..ef68f50 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,16 @@ + + MyDnevnik + Добро пожаловать в дневник + Оценки + Расписание + Домашнее занадние + Настройки + Выйти из аккаунта + Добро пожаловать в дневник + Логин + Пароль + Забыли пароль? + Запомнить меня + Войти + Нет аккаунта? Расскажем как его зарегистрировать и подключить к школе + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..5edee9f --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/ru/megboyzz/dnevnik/ExampleUnitTest.kt b/app/src/test/java/ru/megboyzz/dnevnik/ExampleUnitTest.kt new file mode 100644 index 0000000..30a3c34 --- /dev/null +++ b/app/src/test/java/ru/megboyzz/dnevnik/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package ru.megboyzz.dnevnik + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1f209fc --- /dev/null +++ b/build.gradle @@ -0,0 +1,14 @@ +buildscript { + ext { + compose_version = '1.1.0' + } +}// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false + id 'org.jetbrains.kotlin.android' version '1.6.10' apply false +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..cd0519b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f2716fc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Sep 26 23:09:42 MSK 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..afcf840 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "MyDnevnik" +include ':app'