commit 446a4d9e5e241a4ad9a3aa8f569e6b6e7f9654b4 Author: Minecon724 Date: Wed Jul 24 12:32:34 2024 +0200 initial commit 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/.name b/.idea/.name new file mode 100644 index 0000000..bd24fef --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +vast.app \ No newline at end of file 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/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..6be7e96 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,18 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/emulatorDisplays.xml b/.idea/emulatorDisplays.xml new file mode 100644 index 0000000..701307a --- /dev/null +++ b/.idea/emulatorDisplays.xml @@ -0,0 +1,47 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..0897082 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ 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..44ca2d9 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,41 @@ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..fdf8d99 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0ad17cb --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/other.xml b/.idea/other.xml new file mode 100644 index 0000000..0d3a1fb --- /dev/null +++ b/.idea/other.xml @@ -0,0 +1,263 @@ + + + + + + \ 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/README.md b/README.md new file mode 100644 index 0000000..8d3c648 --- /dev/null +++ b/README.md @@ -0,0 +1,12 @@ +vast.ai for Android + +- Required: Android 10 or newer (so 7 year old devices should be good) +- This app is optimized for phones and tablets \ + although similar screens like auto or desktop should work \ + no support for other form factor devices like wearables or tvs +- material you supported + +# Features +- dashboard + +TODO \ 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.kts b/app/build.gradle.kts new file mode 100644 index 0000000..aaa5e6b --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,78 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.jetbrains.kotlin.android) + alias(libs.plugins.secrets.gradle.plugin) +} + +android { + namespace = "eu.m724.vastapp" + compileSdk = 34 + + defaultConfig { + applicationId = "eu.m724.vastapp" + minSdk = 29 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + + buildConfigField("String", "VASTAI_KEY", "null") + } + + buildTypes { + release { + isMinifyEnabled = 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 + buildConfig = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + + +dependencies { + + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.appcompat) + implementation(libs.material) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + implementation(libs.androidx.navigation.compose) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + implementation(libs.play.services.cronet) +} \ 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/eu/m724/vastapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/eu/m724/vastapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..fabc8ca --- /dev/null +++ b/app/src/androidTest/java/eu/m724/vastapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package eu.m724.vastapp + +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("eu.m724.vastapp", 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..7827d93 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/DashboardActivity.kt b/app/src/main/java/eu/m724/vastapp/DashboardActivity.kt new file mode 100644 index 0000000..4f7ef7d --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/DashboardActivity.kt @@ -0,0 +1,128 @@ +package eu.m724.vastapp + +import android.os.Bundle +import androidx.activity.BackEventCompat +import androidx.activity.ComponentActivity +import androidx.activity.compose.BackHandler +import androidx.activity.compose.PredictiveBackHandler +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.BottomAppBar +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.NavOptions +import androidx.navigation.NavOptionsBuilder +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import eu.m724.vastapp.dashboard.DashboardScreen +import eu.m724.vastapp.dashboard.InstancesScreen +import eu.m724.vastapp.ui.theme.VastappTheme +import eu.m724.vastapp.vastai.data.User +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import kotlin.coroutines.cancellation.CancellationException + +class DashboardActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + val user = intent.getParcelableExtra("user")!! // TODO null check + + enableEdgeToEdge() + setContent { + VastappTheme { + val items = listOf( + Screen.Dashboard, + Screen.Instances, + Screen.Billing + ) + + val navController = rememberNavController() + + Scaffold( + modifier = Modifier.fillMaxSize(), + bottomBar = { + NavigationBar { + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + + items.forEach { screen -> + NavigationBarItem( + selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true, + onClick = { + navController.navigate(screen.route) { + // Pop up to the start destination of the graph to + // avoid building up a large stack of destinations + // on the back stack as users select items + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + // Avoid multiple copies of the same destination when + // reselecting the same item + launchSingleTop = true + // Restore state when reselecting a previously selected item + restoreState = true + + } + }, + icon = { Icon(screen.icon, contentDescription = stringResource(screen.resourceId)) }, + label = { Text(text = stringResource(screen.resourceId)) } + ) + } + } + } + ) { innerPadding -> + Column(modifier = Modifier.padding(innerPadding)) { + + NavHost(navController = navController, startDestination = "dashboard") { + composable("dashboard") { DashboardScreen(user = user) } + composable("instances") { InstancesScreen() } + composable("billing") { BillingScreen(user = user) } + } + } + } + } + } + } +} + +@Composable +fun BillingScreen(user: User) { + Column( + modifier = Modifier + .fillMaxWidth() + .height(100.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center) { + Text("You have $%.2f".format(user.credit), fontSize = 28.sp) + } + + Column( + modifier = Modifier.fillMaxSize() + ) { + + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/LoginActivity.kt b/app/src/main/java/eu/m724/vastapp/LoginActivity.kt new file mode 100644 index 0000000..6da9ac4 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/LoginActivity.kt @@ -0,0 +1,309 @@ +package eu.m724.vastapp + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.activity.result.ActivityResultLauncher +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.core.animateFloat +import androidx.compose.animation.core.updateTransition +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.imePadding +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.KeyboardArrowDown +import androidx.compose.material3.Button +import androidx.compose.material3.Checkbox +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import eu.m724.vastapp.ui.theme.VastappTheme +import eu.m724.vastapp.vastai.api.ApiFailure +import eu.m724.vastapp.vastai.api.UserUrlRequestCallback +import eu.m724.vastapp.vastai.data.User +import kotlinx.coroutines.launch +import org.chromium.net.CronetEngine +import org.chromium.net.UrlRequest +import java.util.concurrent.Executor +import java.util.concurrent.Executors +import kotlin.random.Random + +class LoginActivity : ComponentActivity() { + private val executor: Executor = Executors.newSingleThreadExecutor() + private lateinit var cronetEngine: CronetEngine + private lateinit var dashboardLauncher: ActivityResultLauncher + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + dashboardLauncher = registerForActivityResult( + ActivityResultContracts.StartActivityForResult() + ) { result -> finish() } // TODO re-login here + + cronetEngine = CronetEngine.Builder(applicationContext).build() + val tryLogin: (String, (ApiFailure) -> Unit) -> Unit = + { apiKey, onFailure -> tryLogin(apiKey, { user -> loadApp(user) }, onFailure) } + + enableEdgeToEdge() + setContent { + VastappTheme { + Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(innerPadding) + .imePadding(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + LoginApp(applicationContext, tryLogin) + } + } + } + } + + } + + private fun loadApp(user: User) { + val intent = Intent(this, DashboardActivity::class.java) + intent.putExtra("user", user) + + dashboardLauncher.launch(intent) + finish() + } + + private fun tryLogin(apiKey: String, onSuccess: (User) -> Unit, onFailure: (ApiFailure) -> Unit) { + val requestBuilder = cronetEngine.newUrlRequestBuilder( + "https://console.vast.ai/api/v0/users/current", + UserUrlRequestCallback(onSuccess, onFailure), + executor + ).addHeader("Authorization", "Bearer $apiKey") + + val request: UrlRequest = requestBuilder.build() + request.start() + } + +} + +@Composable +fun LoginApp(context: Context, tryLogin: (String, (ApiFailure) -> Unit) -> Unit) { + val coroutineScope = rememberCoroutineScope() + + var apiKey by rememberSaveable { mutableStateOf(BuildConfig.VASTAI_KEY ?: "") } + var loading by rememberSaveable { mutableStateOf(false) } + var advancedOpen by rememberSaveable { mutableStateOf(false) } + + val transition = updateTransition(targetState = advancedOpen, label = "Advanced Menu Transition") + val arrowRotation by transition.animateFloat(label = "Advanced Menu Arrow Rotation") { state -> + if (state) 180f else 0f + } + + val login: () -> Unit = { + tryLogin(apiKey) { apiFailure -> + loading = false + coroutineScope.launch { + Toast.makeText(context, apiFailure.errorMessage, Toast.LENGTH_SHORT).show() + } + } + } + + Column( + modifier = Modifier.width(300.dp), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + TextField( + modifier = Modifier.fillMaxWidth(), + enabled = !loading, + value = apiKey, + onValueChange = { apiKey = it }, + label = { Text(text = "API key") }, + visualTransformation = PasswordVisualTransformation(), + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), + singleLine = true + ) + Spacer(modifier = Modifier.height(10.dp)) + Row { + TextButton( + enabled = !loading, + onClick = { + advancedOpen = !advancedOpen + } + ) { + Text("Advanced options") + Icon( + imageVector = Icons.Filled.KeyboardArrowDown, + contentDescription = null, + modifier = Modifier.rotate(arrowRotation) + ) + } + Spacer(modifier = Modifier.weight(1f)) + Button( + enabled = !loading, + onClick = { + loading = true + login() + } + ) { + if (loading) { + CircularProgressIndicator() + } else { + Text("Log in") + } + } + } + AnimatedVisibility(visible = advancedOpen) { + AdvancedOptions() + } + } +} + +@Composable +fun AdvancedOptions() { + var checked by rememberSaveable { mutableStateOf(true) } + var clicks by rememberSaveable { mutableIntStateOf(0) } + var checkboxLabel by rememberSaveable { mutableStateOf("here's a checkbox for you") } + var mathPassing by rememberSaveable { mutableStateOf(true) } + + val clickMessages = mapOf( + 20 to "having fun?" + ) + + Column( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 12.dp) + ) { + Text("none yet sorry") + + Row( + verticalAlignment = Alignment.CenterVertically + ) { + Checkbox( + enabled = mathPassing, + checked = mathPassing && checked, + onCheckedChange = { + checked = it + clicks++ + + if (clicks in clickMessages) { + checkboxLabel = clickMessages[clicks].toString() + } + } + ) + Text(checkboxLabel) + } + + AnimatedVisibility(visible = mathPassing) { + MathProblem(onFail = { + mathPassing = false + checkboxLabel = "checkbox is angry" + }, onPass = { + checked = !checked + }) + } + } +} + +@Composable +fun MathProblem(onFail: () -> Unit, onPass: () -> Unit) { + var solved by rememberSaveable { mutableStateOf(false) } + + val n1 = Random.nextInt(-10, 20) + val n2 = Random.nextInt(-10, 20) + val plus = Random.nextBoolean() + val correct = Random.nextInt(0, 3) + val solution = if (plus) n1 + n2 else n1 - n2 + val solutions = mutableListOf(solution, solution, solution) + + if (correct != 0) solutions[0] += Random.nextInt(5, 11) + if (correct != 1) solutions[1] -= Random.nextInt(1, 3) + if (correct != 2) solutions[2] -= Random.nextInt(5, 11) + + if (solved) { + MathProblem(onFail, onPass) + } else { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceEvenly + ) { + MathProblemLabel(n1 = n1, n2 = n2, sign = if (plus) "+" else "-") + NumberButton(onClick = { + if (correct == 0) { + solved = true + onPass() + } else { + onFail() + } + }, number = solutions[0]) + NumberButton(onClick = { + if (correct == 1) { + solved = true + onPass() + } else { + onFail() + } + }, number = solutions[1]) + NumberButton(onClick = { + if (correct == 2) { + solved = true + onPass() + } else { + onFail() + } + }, number = solutions[2]) + } + } +} + +@Composable +fun MathProblemLabel(n1: Int, n2: Int, sign: String) { + Text("$n1 $sign $n2 =") +} + +@Composable +fun NumberButton(onClick: () -> Unit, number: Int) { + Button( + modifier = Modifier + .clip(CircleShape) + .size(30.dp), + contentPadding = PaddingValues(0.dp), + onClick = onClick + ) { + Text(number.toString()) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/Screen.kt b/app/src/main/java/eu/m724/vastapp/Screen.kt new file mode 100644 index 0000000..e4ca9f4 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/Screen.kt @@ -0,0 +1,17 @@ +package eu.m724.vastapp + +import android.graphics.drawable.Icon +import androidx.annotation.StringRes +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material.icons.outlined.ShoppingCart +import androidx.compose.material3.Icon +import androidx.compose.ui.graphics.vector.ImageVector + +sealed class Screen(val route: String, @StringRes val resourceId: Int, val icon: ImageVector) { + object Dashboard : Screen("dashboard", R.string.nav_dashboard, Icons.Outlined.Home) + object Instances : Screen("instances", R.string.nav_instances, Icons.Outlined.Menu) + object Billing : Screen("billing", R.string.nav_billing, Icons.Outlined.ShoppingCart) +} diff --git a/app/src/main/java/eu/m724/vastapp/dashboard/Billing.kt b/app/src/main/java/eu/m724/vastapp/dashboard/Billing.kt new file mode 100644 index 0000000..ff7fa1f --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/dashboard/Billing.kt @@ -0,0 +1,4 @@ +package eu.m724.vastapp.dashboard + +class Billing { +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/dashboard/Dashboard.kt b/app/src/main/java/eu/m724/vastapp/dashboard/Dashboard.kt new file mode 100644 index 0000000..d37e4d4 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/dashboard/Dashboard.kt @@ -0,0 +1,145 @@ +package eu.m724.vastapp.dashboard + +import android.widget.Space +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Info +import androidx.compose.material.icons.filled.ShoppingCart +import androidx.compose.material3.Card +import androidx.compose.material3.CardColors +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableDoubleStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.modifier.modifierLocalMapOf +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.FontScaling +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import eu.m724.vastapp.R +import eu.m724.vastapp.vastai.data.User + +class Dashboard { +} + + +@Composable +fun DashboardScreen(user: User) { + var balance by rememberSaveable { mutableDoubleStateOf(user.credit) } + var remainingTime by rememberSaveable { mutableIntStateOf(0) } + + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { + Column( + modifier = Modifier + .fillMaxWidth() + .height(100.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center) { + Text("Hello ${user.username}!", fontSize = 28.sp) + } + + Row( + modifier = Modifier.width(340.dp) + ) { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp) + .weight(1f), + colors = CardDefaults.cardColors( + containerColor = balanceCardColor(balance) + ) + ) { + Row( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + painter = painterResource(id = R.drawable.baseline_account_balance_wallet_24), + contentDescription = "Balance" + ) + Spacer(modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) + Text( + text = "$%.2f".format(balance), + fontSize = 22.sp, + color = balanceColor(balance, user.balanceThreshold) + ) + } + } + Card( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp) + .weight(1f), + ) { + Row( + modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + painter = painterResource(id = R.drawable.baseline_access_time_filled_24), + contentDescription = "Remaining time" + ) + Spacer( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) + Text( + text = formatTime(remainingTime), + fontSize = 22.sp + ) + } + } + } + } +} + +@Composable +fun balanceCardColor(balance: Double): Color { + return if (balance > 0) CardDefaults.cardColors().containerColor else MaterialTheme.colorScheme.errorContainer +} + +@Composable +fun balanceColor(balance: Double, warningThreshold: Double): Color { + return if (balance > warningThreshold) MaterialTheme.colorScheme.secondary else MaterialTheme.colorScheme.error +} + +fun formatTime(seconds: Int): String { + if (seconds <= 0) return "0.00m" + + val minutes: Double = seconds / 60.0 + if (minutes < 60) { + return "%.2fm".format(minutes) + } + + val hours: Double = minutes / 60 + if (hours < 24) { + return "%.2fh".format(hours) + } + + val days: Double = hours / 24 + return "%.2fd".format(days) +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/dashboard/Instances.kt b/app/src/main/java/eu/m724/vastapp/dashboard/Instances.kt new file mode 100644 index 0000000..bdd6774 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/dashboard/Instances.kt @@ -0,0 +1,20 @@ +package eu.m724.vastapp.dashboard + +import androidx.compose.foundation.layout.Column +import androidx.compose.runtime.Composable +import eu.m724.vastapp.vastai.data.User + +class Instances { +} + +@Composable +fun InstancesScreen() { + Column { + + } +} + +@Composable +fun Instance() { + +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/ui/theme/Color.kt b/app/src/main/java/eu/m724/vastapp/ui/theme/Color.kt new file mode 100644 index 0000000..1f8acf3 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package eu.m724.vastapp.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/ui/theme/Theme.kt b/app/src/main/java/eu/m724/vastapp/ui/theme/Theme.kt new file mode 100644 index 0000000..fa96ea1 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package eu.m724.vastapp.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun VastappTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/ui/theme/Type.kt b/app/src/main/java/eu/m724/vastapp/ui/theme/Type.kt new file mode 100644 index 0000000..1b4d183 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package eu.m724.vastapp.ui.theme + +import androidx.compose.material3.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( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/vastai/api/ApiFailure.kt b/app/src/main/java/eu/m724/vastapp/vastai/api/ApiFailure.kt new file mode 100644 index 0000000..faa0e6f --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/vastai/api/ApiFailure.kt @@ -0,0 +1,9 @@ +package eu.m724.vastapp.vastai.api + +import android.os.Parcel +import android.os.Parcelable + +data class ApiFailure( + /** user friendly error message */ + val errorMessage: String?, +) \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/vastai/api/UserUrlRequestCallback.kt b/app/src/main/java/eu/m724/vastapp/vastai/api/UserUrlRequestCallback.kt new file mode 100644 index 0000000..f55b7a4 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/vastai/api/UserUrlRequestCallback.kt @@ -0,0 +1,68 @@ +package eu.m724.vastapp.vastai.api + +import eu.m724.vastapp.vastai.data.User +import org.chromium.net.CronetException +import org.chromium.net.UrlRequest +import org.chromium.net.UrlResponseInfo +import org.json.JSONObject +import java.io.ByteArrayOutputStream +import java.nio.ByteBuffer +import java.nio.channels.Channels +import java.nio.channels.WritableByteChannel +import java.nio.charset.Charset +import java.nio.charset.CodingErrorAction + + +class UserUrlRequestCallback( + val onSuccess: (User) -> Unit, + val onFailure: (ApiFailure) -> Unit +) : UrlRequest.Callback() { + + private val stringResponse = StringBuilder() + + override fun onRedirectReceived( + request: UrlRequest?, + info: UrlResponseInfo?, + newLocationUrl: String? + ) { + request?.followRedirect() + } + + override fun onResponseStarted(request: UrlRequest?, info: UrlResponseInfo?) { + request?.read(ByteBuffer.allocateDirect(102400)) + } + + override fun onReadCompleted( + request: UrlRequest?, + info: UrlResponseInfo?, + byteBuffer: ByteBuffer? + ) { + byteBuffer?.clear() + request?.read(byteBuffer) + + stringResponse.append(Charsets.UTF_8.newDecoder().onUnmappableCharacter(CodingErrorAction.IGNORE).decode(byteBuffer)) + } + + override fun onSucceeded(request: UrlRequest?, info: UrlResponseInfo?) { + if (info?.httpStatusCode == 200) { + val jsonResponse = JSONObject(stringResponse.toString()) + println(jsonResponse) + onSuccess(User( + id = jsonResponse.getString("id"), + username = jsonResponse.getString("username"), + email = jsonResponse.getString("email"), + apiKey = jsonResponse.getString("api_key"), + credit = jsonResponse.getDouble("credit"), + balanceThreshold = jsonResponse.getDouble("balance_threshold"), + balanceThresholdEnabled = jsonResponse.getBoolean("balance_threshold_enabled"), + )) + } else { + onFailure(ApiFailure("${info?.httpStatusCode} ${info?.httpStatusText}")) + println("API error: $stringResponse") + } + } + + override fun onFailed(request: UrlRequest?, info: UrlResponseInfo?, error: CronetException?) { + onFailure(ApiFailure("Network error: ${error?.message ?: "Unknown"}")) + } +} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/vastai/data/User.kt b/app/src/main/java/eu/m724/vastapp/vastai/data/User.kt new file mode 100644 index 0000000..92a4a53 --- /dev/null +++ b/app/src/main/java/eu/m724/vastapp/vastai/data/User.kt @@ -0,0 +1,52 @@ +package eu.m724.vastapp.vastai.data + +import android.os.Parcel +import android.os.Parcelable +import androidx.compose.ui.res.painterResource + +data class User( + val id: String, + val username: String, + val email: String, + val apiKey: String, + val credit: Double, // this shouldn't be double + /** user's balance notifying threshold */ + val balanceThreshold: Double, + /** if user has balance notifying enabled */ + val balanceThresholdEnabled: Boolean +) : Parcelable { + constructor(parcel: Parcel) : this( + parcel.readString().toString(), + parcel.readString().toString(), + parcel.readString().toString(), + parcel.readString().toString(), + parcel.readDouble(), + parcel.readDouble(), + parcel.readBoolean() + ) { + } + + override fun writeToParcel(parcel: Parcel, flags: Int) { + parcel.writeString(id) + parcel.writeString(username) + parcel.writeString(email) + parcel.writeString(apiKey) + parcel.writeDouble(credit) + parcel.writeDouble(balanceThreshold) + parcel.writeBoolean(balanceThresholdEnabled) + } + + override fun describeContents(): Int { + return 0 + } + + companion object CREATOR : Parcelable.Creator { + override fun createFromParcel(parcel: Parcel): User { + return User(parcel) + } + + override fun newArray(size: Int): Array { + return arrayOfNulls(size) + } + } +} diff --git a/app/src/main/res/drawable/baseline_access_time_filled_24.xml b/app/src/main/res/drawable/baseline_access_time_filled_24.xml new file mode 100644 index 0000000..759b617 --- /dev/null +++ b/app/src/main/res/drawable/baseline_access_time_filled_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/baseline_account_balance_wallet_24.xml b/app/src/main/res/drawable/baseline_account_balance_wallet_24.xml new file mode 100644 index 0000000..83e9d26 --- /dev/null +++ b/app/src/main/res/drawable/baseline_account_balance_wallet_24.xml @@ -0,0 +1,5 @@ + + + + + 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_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ 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-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..adc4b2d --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ 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/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..08818f7 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ + + vast.app + Dashboard + Login + Dashboard + Dashboard + Billing + Instances + \ 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..1f2f6d1 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ 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/eu/m724/vastapp/ExampleUnitTest.kt b/app/src/test/java/eu/m724/vastapp/ExampleUnitTest.kt new file mode 100644 index 0000000..752d271 --- /dev/null +++ b/app/src/test/java/eu/m724/vastapp/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package eu.m724.vastapp + +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.kts b/build.gradle.kts new file mode 100644 index 0000000..b8e7133 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,6 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.jetbrains.kotlin.android) apply false + alias(libs.plugins.secrets.gradle.plugin) apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..20e2a01 --- /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. For more details, visit +# https://developer.android.com/r/tools/gradle-multi-project-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/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..28ee6ea --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,41 @@ +[versions] +agp = "8.5.1" +kotlin = "1.9.0" +coreKtx = "1.13.1" +junit = "4.13.2" +junitVersion = "1.2.1" +espressoCore = "3.6.1" +appcompat = "1.7.0" +material = "1.12.0" +lifecycleRuntimeKtx = "2.8.3" +activityCompose = "1.9.0" +composeBom = "2024.06.00" +playServicesCronet = "18.1.0" +navigationCompose = "2.7.7" +secretsGradlePlugin = "2.0.1" + +[libraries] +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-material3 = { group = "androidx.compose.material3", name = "material3" } +play-services-cronet = { module = "com.google.android.gms:play-services-cronet", version.ref = "playServicesCronet" } +androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } + +[plugins] +android-application = { id = "com.android.application", version.ref = "agp" } +jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secretsGradlePlugin" } + 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..2dcb5ba --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Jul 23 11:11:39 CEST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 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.kts b/settings.gradle.kts new file mode 100644 index 0000000..3129660 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,24 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "vast.app" +include(":app") + \ No newline at end of file