Добавлены некоторые сущности и продлженеие верстки компонентов

app/build.gradle

@@ -28,6 +28,7 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
     kotlinOptions {
         jvmTarget = '1.8'
@@ -67,4 +68,8 @@ dependencies {
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
     implementation "com.google.accompanist:accompanist-swiperefresh:0.23.0"
     implementation "com.google.accompanist:accompanist-navigation-animation:0.24.1-alpha"
+
+    implementation 'com.squareup.retrofit2:retrofit:2.6.4'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }

app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
             android:exported="true"
             android:theme="@style/Theme.MyDnevnik"
             android:screenOrientation="fullSensor"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="stateAlwaysVisible">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/ru/megboyzz/dnevnik/MainActivity.kt

@@ -1,6 +1,7 @@
 package ru.megboyzz.dnevnik
 
 import android.os.Bundle
+import android.window.SplashScreen
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.*
@@ -11,6 +12,7 @@ import ru.megboyzz.dnevnik.ui.theme.*
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+
         super.onCreate(savedInstanceState)
         setContent {
             Surface(

app/src/main/java/ru/megboyzz/dnevnik/Utils.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.graphics.Color
@@ -21,9 +20,12 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
-import androidx.navigation.NavHostController
-import ru.megboyzz.dnevnik.navigation.AppNavRoute
 import ru.megboyzz.dnevnik.navigation.BaseNavRote
+import ru.megboyzz.dnevnik.screens.Month
+import java.time.DayOfWeek
+import java.time.LocalDate
+import java.time.Year
+import java.time.temporal.TemporalAdjusters
 
 @Composable
 fun Int.AsPainter() = painterResource(this)
@@ -100,6 +102,19 @@ fun Modifier.drawColoredShadow(
             it.restore()
         }
     }
-} else {
+} else this
-    this
+
+fun getMonthDaysBy(year: Int, month: Month, dayOfWeek: DayOfWeek): List<Int>{
+    var date: LocalDate =
+        Year.of(year).atMonth(month.ordinal + 1).atDay(1).with(TemporalAdjusters.firstInMonth(dayOfWeek))
+    var mi = date.month
+
+    val list = mutableListOf<Int>()
+
+    while (mi.ordinal == month.ordinal) {
+        list.add(date.dayOfMonth)
+        date = date.with(TemporalAdjusters.next(dayOfWeek))
+        mi = date.month
+    }
+    return list
 }

app/src/main/java/ru/megboyzz/dnevnik/entities/request/AuthorizationRequest.kt

@@ -0,0 +1,13 @@
+package ru.megboyzz.dnevnik.entities.request
+
+import com.google.gson.annotations.SerializedName
+
+data class AuthorizationRequest(
+    val username: String,
+    val password: String,
+    val scope: String,
+    @SerializedName("client_id")
+    val clientId: String,
+    @SerializedName("client_secret")
+    val clientSecret: String
+)

app/src/main/java/ru/megboyzz/dnevnik/entities/response/AuthorizationResponse.kt

@@ -0,0 +1,17 @@
+package ru.megboyzz.dnevnik.entities.response
+
+data class AuthorizationResponse(
+    val accessToken: String,
+    val expiresIn: Long,
+    val refreshToken: String,
+    val scope: String,
+    val user: Long
+)
+/*
+* 	"accessToken": "7wmx4EIXWQNcQtqmKahZ9kwpy6pKCRU8",
+	"expiresIn": 2591999,
+	"expiresIn_str": "2591999",
+	"refreshToken": "Iu8rTLAFt8d1JuObaUwsPbqXkdZ3i3ct",
+	"scope": "commoninfo,friendsandrelatives,educationalinfo,personaldata",
+	"user": 1000006509021,
+	"user_str": "1000006509021"*/

app/src/main/java/ru/megboyzz/dnevnik/screens/Components.kt

@@ -1,7 +1,9 @@
 package ru.megboyzz.dnevnik.screens
 
 import android.annotation.SuppressLint
-import android.widget.Toast
+import android.graphics.ColorSpace.Rgb.TransferParameters
+import android.graphics.Point
+import android.graphics.RectF
 import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.*
@@ -20,21 +22,18 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.draw.shadow
 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.*
-import androidx.compose.ui.graphics.Outline
+import androidx.compose.ui.graphics.drawscope.DrawStyle
-import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.modifier.modifierLocalConsumer
 import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.input.KeyboardType
@@ -43,18 +42,16 @@ 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 androidx.navigation.NavController
-import androidx.navigation.compose.rememberNavController
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import kotlinx.coroutines.launch
 import ru.megboyzz.dnevnik.*
 import ru.megboyzz.dnevnik.R
 import ru.megboyzz.dnevnik.navigation.AppNavRoute
 import ru.megboyzz.dnevnik.navigation.BaseNavRote
-import ru.megboyzz.dnevnik.navigation.MarksNavRoute
 import ru.megboyzz.dnevnik.ui.theme.*
-import java.util.Calendar
+import java.time.DayOfWeek
+import java.util.*
+
 
 @Composable
 fun MainScaffold(
@@ -294,6 +291,13 @@ val drawerShape = object : Shape {
 
 }
 
+@Preview
+@Composable
+fun text() {
+    Row(Modifier.fillMaxWidth()) {
+        AlmostOutlinedText(text = "Здарова карова")
+    }
+}
 
 @Composable
 fun AlmostOutlinedText(
@@ -786,36 +790,28 @@ fun LastMarkCard(
     }
 }
 
-@Preview
+enum class Month{
-@Composable
+    January,
-fun LastMarkPrev() {
+    February,
-    Column(verticalArrangement = Arrangement.spacedBy(20.dp)) {
+    March,
-        LastMarkCard(
+    April,
-            subjectName = "Русский язык",
+    May,
-            mark = 3,
+    June,
-            date = "03.02.2023",
+    July,
-            teacher = "Джаналиева Д. Ф.",
+    August,
-            reason = "диктнант"
+    September,
-        )
+    October,
-        LastMarkCard(
+    November,
-            subjectName = "Алгебра и начала математического анализа",
+    December,
-            mark = 5,
-            date = "03.08.2023",
-            teacher = "Штрошер С. Н.")
-    }
 }
 
-data class CalendarData(
-    val title: String,
-    
-)
-
 
 @Composable
 fun CardCalendar(
-    onClick: (day: Int) -> Unit
+    month: Month,
+    year: Int,
+    onClick: (day: Int) -> Unit,
 ) {
-    //Calendar(Calendar.FEBRUARY)
     val listOfDays = listOf(
         R.string.title_mon.AsString(),
         R.string.title_tue.AsString(),
@@ -824,10 +820,18 @@ fun CardCalendar(
         R.string.title_fri.AsString(),
         R.string.title_sat.AsString(),
     )
+
+    //TODO Сделать сворачивание календаря
+    val expanded = remember {
+        mutableStateOf(true)
+    }
+    val expandedModifier = if(expanded.value) Modifier else Modifier.height(100.dp)
+
     Card(
         backgroundColor = white,
         modifier = Modifier.fillMaxWidth(),
-        shape = RoundedCornerShape(10.dp)
+        shape = RoundedCornerShape(10.dp),
+        elevation = 5.dp
     ){
         Box(
             modifier = Modifier
@@ -835,7 +839,6 @@ fun CardCalendar(
                 .padding(15.dp)
         ){
             Column(
-                //horizontalAlignment = Alignment.CenterHorizontally,
                 modifier = Modifier.fillMaxWidth()
             ) {
                 Row(
@@ -857,67 +860,60 @@ fun CardCalendar(
                     color = dark,
                     modifier = Modifier.padding(0.dp, 0.dp, 0.dp, 10.dp)
                 )
-                val days = 28
+
-                val weeks = days / 6
+                val offset = 8 - getMonthDaysBy(year, month, DayOfWeek.MONDAY)[0]
-                var dayIn = 2
+
-                val startDay = 1
                 Row(
                     horizontalArrangement = Arrangement.SpaceBetween,
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(10.dp, 10.dp, 10.dp, 5.dp)
+                        .padding(0.dp, 10.dp, 0.dp, 5.dp)
                 ) {
-                    for (i in 1..6) {
+                    for(day in DayOfWeek.values()){
-                        //if(i != 7)
+                        if(day != DayOfWeek.SUNDAY)
-                        Column(
+                        Column {
-                            verticalArrangement = Arrangement.spacedBy(10.dp)
+                            val list = getMonthDaysBy(year, month, day)
-                        ) {
+                            var len = 0
-                            for(j in i..days step 7){
+                            if(day.ordinal + 1 <= offset && offset !in 6..7){
-                                var text = j.toString()
+                                EmptyNumberOnCalendar()
-                                if(j < startDay)
+                                len++
-                                    text = ""
-                                val isClicked = remember {
-                                    mutableStateOf(false)
                             }
+                            for(i in list.indices){
+                                val data = list[i]
+                                val isClicked = remember { mutableStateOf(false) }
                                 NumberOnCalendar(
                                     isClicked = isClicked,
-                                    number = j
+                                    number = data.toString()
-                                ) { onClick.invoke(j) }
+                                ) {
+                                    expanded.value != expanded.value
+                                    onClick.invoke(data)
+                                }
+                                len++
+                            }
+                            if(day.ordinal + 1 > offset && len < 5){
+                                EmptyNumberOnCalendar()
                             }
                         }
                     }
                 }
 
-                /*for(day in 1..weeks){
+
-                    Row(
-                        horizontalArrangement = Arrangement.SpaceBetween,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(10.dp, 10.dp, 10.dp, 5.dp)
-                    ){
-                        for(i in dayIn..dayIn + 5){
-                            Text(
-                                text = i.toString(),
-                                color = dark,
-                                style = MainText,
-                                modifier = Modifier.clickable{
-                                    onClick.invoke(i)
-                                }
-                            )
-                        }
-                        dayIn += 6
-                    }
-                }*/
             }
         }
     }
 }
 
-// TODO СДЕЛАТЬ КЛИКАБЕЛЬНОЕ ЧИСЛО НА КАЛЕНДАРЕ
+@Composable
+fun EmptyNumberOnCalendar(){
+    NumberOnCalendar(isClicked = remember {
+        mutableStateOf(false)
+    }, number = "") {}
+}
+
 @Composable
 fun NumberOnCalendar(
     isClicked: MutableState<Boolean>,
-    number: Int,
+    number: String,
     onClick: () -> Unit
 ) {
     val isClickedModifier = if(isClicked.value)
@@ -940,23 +936,205 @@ fun NumberOnCalendar(
         contentAlignment = Alignment.Center
     ){
         Text(
-            text = number.toString(),
+            text = number,
             style = H2,
             color = dark,
             modifier = Modifier.clickable{
+                if(number != "") {
                     isClicked.value = !isClicked.value
                     onClick.invoke()
                 }
+            }
+        )
+    }
+}
+
+@Composable
+fun MonthToggle(
+    startMonth: Month,
+    startYear: Int,
+    onClick: (day: Int) -> Unit
+) {
+
+    var listOfMonth = listOf(
+        R.string.title_january.AsString(),
+        R.string.title_february.AsString(),
+        R.string.title_march.AsString(),
+        R.string.title_april.AsString(),
+        R.string.title_may.AsString(),
+        R.string.title_june.AsString(),
+        R.string.title_july.AsString(),
+        R.string.title_august.AsString(),
+        R.string.title_september.AsString(),
+        R.string.title_october.AsString(),
+        R.string.title_november.AsString(),
+        R.string.title_december.AsString()
+    )
+
+    val month = remember {
+        mutableStateOf(startMonth)
+    }
+    val year = remember {
+        mutableStateOf(startYear)
+    }
+
+    val configuration = LocalConfiguration.current
+    val screenWidth = configuration.screenWidthDp
+
+    var defaultPadding = 35.dp
+
+    val isNormal = screenWidth < 500
+    if(!isNormal) defaultPadding *= 4
+    Column(Modifier.padding(defaultPadding, 0.dp)) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(0.dp, 20.dp),
+            horizontalArrangement = Arrangement.Center
+        ) {
+            Row(
+                horizontalArrangement = Arrangement.spacedBy(10.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                IconButton(onClick = {
+                    var ind = month.value.ordinal - 1
+                    if(ind == -1){
+                        ind = 11
+                        year.value = year.value - 1
+                    }
+                    month.value = Month.values()[ind]
+                }) {
+                    Image(
+                        painter = R.drawable.ic_month_swipe_left.AsPainter(),
+                        contentDescription = "left",
+                        alignment = Alignment.Center
+                    )
+                }
+                Text(
+                    text = "${listOfMonth[month.value.ordinal]} ${year.value}",
+                    style = H1,
+                    color = dark
+                )
+                IconButton(
+                    onClick = {
+                        var ind = month.value.ordinal + 1
+                        if(ind == 12){
+                            ind = 0
+                            year.value = year.value + 1
+                        }
+                        month.value = Month.values()[ind]
+                    }
+                ) {
+                    Image(
+                        painter = R.drawable.ic_month_swipe_right.AsPainter(),
+                        contentDescription = "right",
+                        alignment = Alignment.Center
+                    )
+                }
+            }
+        }
+        CardCalendar(
+            month = month.value,
+            year = year.value,
+            onClick = onClick
         )
     }
 }
 
 @Preview
 @Composable
-fun CalendarPrev() {
+fun MonthTglPrev() {
-    val current = LocalContext.current
+    MonthToggle(
-    CardCalendar(){
+        startMonth = Month.January, startYear = 2023
-        Toast.makeText(current, "Число $it", Toast.LENGTH_SHORT).show()
+    ){
 
     }
 }
+
+@Composable
+fun UnderlinedText(
+    text: String
+) {
+    Column {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(30.dp),
+            verticalArrangement = Arrangement.Center
+        ) {
+            Text(
+                text = text,
+                color = dark,
+                textAlign = TextAlign.Center,
+                style = H1,
+                modifier = Modifier
+                    .fillMaxWidth()
+            )
+        }
+        SpacerHeight(height = 2.dp)
+        Divider(color = dark, thickness = 1.dp)
+    }
+}
+
+
+@Preview
+@Composable
+fun UnderlinedTextPrev() {
+    Box(Modifier.background(white)){
+        UnderlinedText(text = "Общая сводка")
+    }
+}
+
+/**
+ * Класс для предоставления данных для круговых диаграм
+ * Идея предоставить диаграмме массив именованных данных
+ * напрмер кол-во оцеок отлично по всем предметам:
+ *  CircleDiagramData(parameterName = "История", count=5) = 38%
+ *  CircleDiagramData(parameterName = "Русский язык", count=4) = 31%
+ *  CircleDiagramData(parameterName = "Химия", count=1) = 8%
+ *  CircleDiagramData(parameterName = "Математика", count=3) = 23%
+ */
+data class CircleDiagramData(
+    val parameterName: String,
+    val count: Int
+)
+
+@Composable
+fun CircleDiagram(
+    diagramData: List<CircleDiagramData>
+) {
+
+    val sum = diagramData.sumOf { it.count }
+
+    Canvas(modifier = Modifier.size(100.dp)) {
+        val canvasWidth = size.width
+        val canvasHeight = size.height
+        drawCircle(color = white)
+        var angle = -45f
+        var isBlue = true
+        for(data in diagramData){
+            val cur = -(360 * data.count.toFloat() / sum.toFloat())
+            drawArc(
+                color = if(isBlue) Color.Blue else Color.Red,
+                startAngle = -angle,
+                sweepAngle = cur,
+                useCenter = true,
+                //style = Stroke(width = 1f, cap = StrokeCap.Round).
+            )
+            isBlue = !isBlue
+            angle -= cur
+        }
+    }
+}
+
+@Preview
+@Composable
+fun CirclePrev() {
+    val list = listOf(
+        CircleDiagramData(parameterName = "История", count=5),
+        CircleDiagramData(parameterName = "Русский язык", count=4),
+        CircleDiagramData(parameterName = "Химия", count=1),
+        CircleDiagramData(parameterName = "Математика", count=3)
+    )
+    CircleDiagram(list)
+}

app/src/main/res/drawable/ic_month_swipe_right.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.9,9.88L11.31,5.29C11.122,5.104 10.869,4.999 10.605,4.999C10.341,4.999 10.087,5.104 9.9,5.29C9.806,5.383 9.732,5.493 9.681,5.615C9.63,5.737 9.604,5.868 9.604,6C9.604,6.132 9.63,6.263 9.681,6.384C9.732,6.506 9.806,6.617 9.9,6.71L14.5,11.29C14.594,11.383 14.668,11.493 14.719,11.615C14.769,11.737 14.796,11.868 14.796,12C14.796,12.132 14.769,12.262 14.719,12.384C14.668,12.506 14.594,12.617 14.5,12.71L9.9,17.29C9.712,17.477 9.605,17.731 9.604,17.996C9.603,18.262 9.708,18.517 9.895,18.705C10.082,18.893 10.336,18.999 10.601,19C10.867,19.001 11.122,18.897 11.31,18.71L15.9,14.12C16.462,13.557 16.777,12.795 16.777,12C16.777,11.205 16.462,10.442 15.9,9.88Z"
+      android:fillColor="#272727"/>
+</vector>

app/src/test/java/ru/megboyzz/dnevnik/ExampleUnitTest.kt

@@ -1,17 +0,0 @@
-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)
-    }
-}

app/src/test/java/ru/megboyzz/dnevnik/UtilsTest.kt

@@ -0,0 +1,19 @@
+package ru.megboyzz.dnevnik
+
+import org.junit.Test
+
+import org.junit.Assert.*
+import ru.megboyzz.dnevnik.screens.Month
+import java.time.DayOfWeek
+
+class UtilsTest {
+
+    @Test
+    fun testForDaysFunc(){
+        val days = getMonthDaysBy(2023, Month.January, DayOfWeek.MONDAY)
+        assertEquals(
+            listOf(2, 9, 16, 23, 30),
+            days
+        )
+    }
+}