commit 194152434007638375f786a0662c014981e1abbd Author: Michael Kits <55844847+SeanGTX@users.noreply.github.com> Date: Sat Nov 5 00:36:21 2022 +0300 stable init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4d5a07e --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.iml +.gradle +/local.properties +/.idea +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +/app/debug +/app/release +/app/build \ 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..8cf982f --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,72 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' +} + +android { + compileSdk 32 + + defaultConfig { + applicationId "ru.megboyzz.studentq" + 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' + 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 'com.vk:android-sdk-core:3.5.0' + implementation 'com.vk:android-sdk-api:3.5.0' + + implementation "androidx.room:room-runtime:2.2.6" + kapt "androidx.room:room-compiler:2.2.6" + implementation "androidx.room:room-ktx:2.2.6" + + implementation "androidx.navigation:navigation-compose:2.5.3" +} \ 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/studentq/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ru/megboyzz/studentq/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..70d17b0 --- /dev/null +++ b/app/src/androidTest/java/ru/megboyzz/studentq/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package ru.megboyzz.studentq + +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.studentq", 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..d44fc79 --- /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/studentq/App.kt b/app/src/main/java/ru/megboyzz/studentq/App.kt new file mode 100644 index 0000000..3e3984e --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/App.kt @@ -0,0 +1,20 @@ +package ru.megboyzz.studentq + +import android.app.Application +import androidx.room.Room + +class App : Application() { + var database: AppDatabase? = null + private set + + override fun onCreate() { + super.onCreate() + instance = this + database = Room.databaseBuilder(this, AppDatabase::class.java, "database") + .allowMainThreadQueries() + .build() + + } + + companion object { var instance: App? = null } +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/AppDatabase.kt b/app/src/main/java/ru/megboyzz/studentq/AppDatabase.kt new file mode 100644 index 0000000..7a695fd --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/AppDatabase.kt @@ -0,0 +1,15 @@ +package ru.megboyzz.studentq + +import androidx.room.Database +import androidx.room.RoomDatabase +import ru.megboyzz.studentq.data.Profile +import ru.megboyzz.studentq.data.ProfileDAO + + +@Database( + entities = [Profile::class], + version = 1 +) +abstract class AppDatabase : RoomDatabase(){ + abstract fun profileDao(): ProfileDAO +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/MainActivity.kt b/app/src/main/java/ru/megboyzz/studentq/MainActivity.kt new file mode 100644 index 0000000..a74689f --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/MainActivity.kt @@ -0,0 +1,117 @@ +package ru.megboyzz.studentq + +import android.os.Bundle +import android.util.Log +import android.widget.Space +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.result.ActivityResultLauncher +import androidx.compose.foundation.layout.* +import androidx.compose.material.Button +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.Dp +import com.vk.api.sdk.VK +import com.vk.api.sdk.VKApiCallback +import com.vk.api.sdk.VKApiConfig +import com.vk.api.sdk.auth.VKAuthenticationResult +import com.vk.api.sdk.auth.VKScope +import com.vk.sdk.api.users.UsersService +import com.vk.sdk.api.users.dto.UsersFields +import com.vk.sdk.api.users.dto.UsersUserFull +import ru.megboyzz.studentq.data.Profile +import ru.megboyzz.studentq.navigation.AppNavHost +import ru.megboyzz.studentq.ui.theme.background + + +var authLauncher: ActivityResultLauncher>? = null + + +@Composable +fun Int.AsPainter() = painterResource(this) + +@Composable +fun Int.AsString() = stringResource(this) + +@Composable +fun Dp.SpacerWidth() = Spacer(Modifier.width(this)) + +@Composable +fun Dp.SpacerHeight() = Spacer(Modifier.height(this)) + + +class MainActivity : ComponentActivity() { + + val LOG_TAG = "MainActivity" + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + val db = App.instance?.database + val dao = db?.profileDao() + + authLauncher = VK.login(this) { result: VKAuthenticationResult -> + when (result) { + is VKAuthenticationResult.Success -> { + Toast.makeText(this, "Успешный успех", Toast.LENGTH_LONG).show() + val userId = VK.getUserId() + val value = object : VKApiCallback> { + + override fun fail(error: Exception) { + error.message?.let { Log.e("VK::getUser", it) } + } + + override fun success(result: List) { + + val name = result[0].firstName + val surname = result[0].lastName + val id = userId.value + + if(name != null && surname != null) { + val profile = Profile(name = name, surname = surname, vkID = id, isHeadman = false) + dao?.setProfile(profile) + }else{ + Log.e(LOG_TAG, "Какие то поля null((((") + } + + Log.i("lol", "lol") + } + } + + //Создает кофиг + val config = VKApiConfig( + context = this, + langProvider = {"ru"} + ) + VK.setConfig(config) + + VK.execute( + UsersService().usersGet(listOf(userId), listOf()), + value + ) + + } + is VKAuthenticationResult.Failed -> { + Toast.makeText(this, "Не успех", Toast.LENGTH_LONG).show() + } + } + } + + val profile = dao?.getProfile() + + setContent { + Surface( + modifier = Modifier.fillMaxSize(), + color = background + ) { + AppNavHost() + } + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/data/Profile.kt b/app/src/main/java/ru/megboyzz/studentq/data/Profile.kt new file mode 100644 index 0000000..a1f97e6 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/data/Profile.kt @@ -0,0 +1,15 @@ +package ru.megboyzz.studentq.data + +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity +data class Profile( + @PrimaryKey + val id: Int = 1, + val name: String, + val surname: String, + val vkID: Long, + //Флажок от том что пользователь староста + val isHeadman: Boolean + ) \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/data/ProfileDAO.kt b/app/src/main/java/ru/megboyzz/studentq/data/ProfileDAO.kt new file mode 100644 index 0000000..5221f6d --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/data/ProfileDAO.kt @@ -0,0 +1,17 @@ +package ru.megboyzz.studentq.data + +import androidx.room.Dao +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query + +@Dao +public interface ProfileDAO { + + @Query("SELECT * FROM Profile WHERE id = 1") + fun getProfile(): Profile + + @Insert(onConflict = OnConflictStrategy.REPLACE) + fun setProfile(profile: Profile) + +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/navigation/AppNavHost.kt b/app/src/main/java/ru/megboyzz/studentq/navigation/AppNavHost.kt new file mode 100644 index 0000000..5232af2 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/navigation/AppNavHost.kt @@ -0,0 +1,30 @@ +package ru.megboyzz.studentq.navigation + +import androidx.compose.runtime.Composable +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import ru.megboyzz.studentq.screens.* + +sealed class AppNavRoute(val route: String){ + object Auth: AppNavRoute("auth_screen") + object Queues: AppNavRoute("all_queues_screen") + object Queue: AppNavRoute("in_queue_screen") + object QueueCreate: AppNavRoute("queue_creation_screen") + object QueueInvitation: AppNavRoute("queue_invitation_screen") +} + +@Composable +fun AppNavHost(){ + val navController = rememberNavController() + NavHost( + navController = navController, + startDestination = AppNavRoute.Auth.route + ){ + composable(AppNavRoute.Auth.route) { Auth(navController) } + composable(AppNavRoute.Queues.route) { Queues(navController) } + composable(AppNavRoute.Queue.route) { Queue(navController) } + composable(AppNavRoute.QueueCreate.route) { QueueCreate(navController) } + composable(AppNavRoute.QueueInvitation.route) { QueueInvitation(navController) } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/screens/Auth.kt b/app/src/main/java/ru/megboyzz/studentq/screens/Auth.kt new file mode 100644 index 0000000..1ed1d2d --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/screens/Auth.kt @@ -0,0 +1,161 @@ +package ru.megboyzz.studentq.screens + +import android.util.Log +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.* +import androidx.compose.material.ButtonDefaults.buttonColors +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.navigation.NavHostController +import ru.megboyzz.studentq.AsPainter +import ru.megboyzz.studentq.AsString +import ru.megboyzz.studentq.R +import ru.megboyzz.studentq.authLauncher +import ru.megboyzz.studentq.ui.theme.accent +import ru.megboyzz.studentq.ui.theme.background +import ru.megboyzz.studentq.ui.theme.panel + +@Composable +fun Auth(navHostController: NavHostController){ + + val configuration = LocalConfiguration.current + + val screenHeight = configuration.screenHeightDp + + //Отступ для верхней части экрана + val headerOffset = (screenHeight * 0.1575).dp + + //Отступ под первым текстом (и под кнопкой) + val headerText1Offset = (screenHeight * 0.0375).dp + + //Отступ под вторым текстом + val headerText2Offset = (screenHeight * 0.05625).dp + + //Высота ткстового поля "Обновления" + val updateFieldHeight = (screenHeight * 0.3625).dp + + //Отступ до кнопки + val offset = (screenHeight * 0.025).dp + + //Высота кнопки + val buttonSize = (screenHeight * 0.0525).dp + + //Ширина основного контента страницы + val contentWidth = (configuration.screenWidthDp * 0.805).dp + + Box(Modifier.fillMaxSize()) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.TopStart + ) { Image(R.drawable.ellipse.AsPainter(),"header") } + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.TopEnd + ){ Image(R.drawable.lines.AsPainter(),"header") } + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.BottomEnd + ){ Image(R.drawable.rectangle.AsPainter(),"footer") } + + Column(Modifier.fillMaxSize()) { + Spacer(Modifier.height(headerOffset)) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { + Column( + modifier = Modifier.width(contentWidth) + ) { + Text( + text = R.string.header1.AsString(), + fontWeight = FontWeight.W400, + fontSize = 25.sp, + color = Color.White + ) + Spacer(Modifier.height(headerText1Offset)) + Text( + text = R.string.header2.AsString(), + fontWeight = FontWeight.Bold, + fontSize = 20.sp, + color = Color.White + ) + Spacer(Modifier.height(headerText2Offset)) + Card( + modifier = Modifier + .fillMaxWidth() + .height(updateFieldHeight), + shape = RoundedCornerShape(10.dp), + backgroundColor = panel, + elevation = 10.dp + ) { + Text("adsasd") + } + Text("") + Spacer(Modifier.width(offset)) + Button( + modifier = Modifier + .fillMaxWidth() + .height(buttonSize), + onClick = { + authLauncher?.launch(emptyList()) + //TODO придумать план побега + // идея 1: Завязать все коллбеки на ViewModel + }, + colors = buttonColors( + backgroundColor = accent, + contentColor = Color.White + ), + elevation = ButtonDefaults.elevation( + defaultElevation = 6.dp, + pressedElevation = 8.dp, + disabledElevation = 0.dp + ), + shape = RoundedCornerShape(10.dp), + ) { + Text( + text = R.string.login_button1_title.AsString(), + fontWeight = FontWeight.W400, + fontSize = 14.sp + ) + } + + Spacer(Modifier.height(headerText1Offset)) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceAround, + ){ + Text( + modifier = Modifier.clickable { + //TODO Сделать копачку + }, + text = R.string.service_title.AsString(), + textAlign = TextAlign.Center, + color = Color.White + ) + Text( + modifier = Modifier.clickable { + //TODO Сделать копачку + }, + text = R.string.contact_title.AsString(), + textAlign = TextAlign.Center, + color = Color.White + ) + } + + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/screens/Queue.kt b/app/src/main/java/ru/megboyzz/studentq/screens/Queue.kt new file mode 100644 index 0000000..6e2f962 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/screens/Queue.kt @@ -0,0 +1,9 @@ +package ru.megboyzz.studentq.screens + +import androidx.compose.runtime.Composable +import androidx.navigation.NavHostController + +@Composable +fun Queue(navHostController: NavHostController){ + +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/screens/QueueCreate.kt b/app/src/main/java/ru/megboyzz/studentq/screens/QueueCreate.kt new file mode 100644 index 0000000..448e10c --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/screens/QueueCreate.kt @@ -0,0 +1,9 @@ +package ru.megboyzz.studentq.screens + +import androidx.compose.runtime.Composable +import androidx.navigation.NavHostController + +@Composable +fun QueueCreate(navHostController: NavHostController){ + +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/screens/QueueInvitation.kt b/app/src/main/java/ru/megboyzz/studentq/screens/QueueInvitation.kt new file mode 100644 index 0000000..5f0310e --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/screens/QueueInvitation.kt @@ -0,0 +1,9 @@ +package ru.megboyzz.studentq.screens + +import androidx.compose.runtime.Composable +import androidx.navigation.NavHostController + +@Composable +fun QueueInvitation(navHostController: NavHostController){ + +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/screens/Queues.kt b/app/src/main/java/ru/megboyzz/studentq/screens/Queues.kt new file mode 100644 index 0000000..8b435aa --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/screens/Queues.kt @@ -0,0 +1,9 @@ +package ru.megboyzz.studentq.screens + +import androidx.compose.runtime.Composable +import androidx.navigation.NavHostController + +@Composable +fun Queues(navHostController: NavHostController){ + +} \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/ui/theme/Color.kt b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Color.kt new file mode 100644 index 0000000..c4da5bf --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Color.kt @@ -0,0 +1,12 @@ +package ru.megboyzz.studentq.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 background = Color(0xFF_1E1E1E) +val accent = Color(0xFF_E6195E) +val panel = Color(0xFF_333333) \ No newline at end of file diff --git a/app/src/main/java/ru/megboyzz/studentq/ui/theme/Shape.kt b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Shape.kt new file mode 100644 index 0000000..7b0517d --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package ru.megboyzz.studentq.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/studentq/ui/theme/Theme.kt b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Theme.kt new file mode 100644 index 0000000..5077aa8 --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Theme.kt @@ -0,0 +1,44 @@ +package ru.megboyzz.studentq.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 StudentqTheme(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/studentq/ui/theme/Type.kt b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Type.kt new file mode 100644 index 0000000..8b113ed --- /dev/null +++ b/app/src/main/java/ru/megboyzz/studentq/ui/theme/Type.kt @@ -0,0 +1,28 @@ +package ru.megboyzz.studentq.ui.theme + +import androidx.compose.material.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +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 + ) + */ +) \ 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/ellipse.xml b/app/src/main/res/drawable/ellipse.xml new file mode 100644 index 0000000..52052a0 --- /dev/null +++ b/app/src/main/res/drawable/ellipse.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_background.xml b/app/src/main/res/drawable/ic_background.xml new file mode 100644 index 0000000..0c7f1c3 --- /dev/null +++ b/app/src/main/res/drawable/ic_background.xml @@ -0,0 +1,33 @@ + + + + + + + + + + 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/icon.xml b/app/src/main/res/drawable/icon.xml new file mode 100644 index 0000000..dae78cf --- /dev/null +++ b/app/src/main/res/drawable/icon.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/lines.xml b/app/src/main/res/drawable/lines.xml new file mode 100644 index 0000000..5f8d51d --- /dev/null +++ b/app/src/main/res/drawable/lines.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/rectangle.xml b/app/src/main/res/drawable/rectangle.xml new file mode 100644 index 0000000..6f46594 --- /dev/null +++ b/app/src/main/res/drawable/rectangle.xml @@ -0,0 +1,11 @@ + + + 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..fd7b8a1 --- /dev/null +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -0,0 +1,10 @@ + + + Studentq + Auth via VK + Go to Queues + Queue for students + Developed by the same students + Service + Contact + \ 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/integers.xml b/app/src/main/res/values/integers.xml new file mode 100644 index 0000000..e190c5c --- /dev/null +++ b/app/src/main/res/values/integers.xml @@ -0,0 +1,4 @@ + + + 51447354 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..b83fa2e --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ + + Studentq + Авторизация через ВК + Перейти к очередям + Удобная Очередь для студентов + Разработаная такими же студентами + Сервис + Связь + \ 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..c2a7473 --- /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/studentq/ExampleUnitTest.kt b/app/src/test/java/ru/megboyzz/studentq/ExampleUnitTest.kt new file mode 100644 index 0000000..af52294 --- /dev/null +++ b/app/src/test/java/ru/megboyzz/studentq/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package ru.megboyzz.studentq + +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..78c697f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 12 15:27:02 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..ee14260 --- /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 = "Studentq" +include ':app'