commit b40f7f1f4fc7ab2d6ec27c94ab17f597ecea4cd6 Author: Mika Date: Fri Jul 14 14:31:08 2023 +0200 Init 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..4026308 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Fitness Journey \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ 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/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a2d7c21 --- /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..e1eea1d --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..773fe0f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ 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..72ce03c --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,70 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'de.polyfish0.fitnessjourney' + compileSdk 33 + + defaultConfig { + applicationId "de.polyfish0.fitnessjourney" + minSdk 24 + targetSdk 33 + 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 '1.3.2' + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0" + implementation 'com.google.android.material:material:1.9.0' + implementation "androidx.navigation:navigation-compose:2.5.3" + implementation "androidx.compose.material3:material3:1.1.1" + implementation 'androidx.core:core-ktx:1.8.0' + implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0') + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1' + implementation 'androidx.activity:activity-compose:1.5.1' + implementation platform('androidx.compose:compose-bom:2022.10.00') + implementation 'androidx.compose.ui:ui' + implementation 'androidx.compose.ui:ui-graphics' + implementation 'androidx.compose.ui:ui-tooling-preview' + implementation 'androidx.compose.material3:material3' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00') + androidTestImplementation 'androidx.compose.ui:ui-test-junit4' + debugImplementation 'androidx.compose.ui:ui-tooling' + debugImplementation 'androidx.compose.ui:ui-test-manifest' +} \ 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/de/polyfish0/fitnessjourney/ExampleInstrumentedTest.kt b/app/src/androidTest/java/de/polyfish0/fitnessjourney/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..d69118e --- /dev/null +++ b/app/src/androidTest/java/de/polyfish0/fitnessjourney/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package de.polyfish0.fitnessjourney + +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("de.polyfish0.fitnessjourney", 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..d22938b --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/MainActivity.kt b/app/src/main/java/de/polyfish0/fitnessjourney/MainActivity.kt new file mode 100644 index 0000000..20587ef --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/MainActivity.kt @@ -0,0 +1,140 @@ +package de.polyfish0.fitnessjourney + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Menu +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Divider +import androidx.compose.material3.DrawerState +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer +import androidx.compose.material3.NavigationDrawerItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavHostController +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import de.polyfish0.fitnessjourney.routes.MainScreenRoute +import de.polyfish0.fitnessjourney.routes.Routes +import de.polyfish0.fitnessjourney.routes.bodycomposition.BodyCompositionMainRoute +import de.polyfish0.fitnessjourney.routes.settings.SettingsMainRoute +import de.polyfish0.fitnessjourney.routes.trainingplans.TrainingPlansRoute +import de.polyfish0.fitnessjourney.ui.theme.FitnessJourneyTheme +import kotlinx.coroutines.launch + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + FitnessJourneyTheme { + MainCompose() + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainCompose( + navController: NavHostController = rememberNavController(), + drawerState: DrawerState = rememberDrawerState(initialValue = DrawerValue.Closed) +) { + val scope = rememberCoroutineScope() + ModalNavigationDrawer( + drawerState = drawerState, + drawerContent = { + ModalDrawerSheet { + Text(text = stringResource(R.string.app_name), modifier = Modifier.padding(16.dp)) + Divider() + NavigationDrawerItem( + modifier = Modifier.padding(8.dp, 2.dp, 8.dp, 2.dp), + label = { Text(text = stringResource(R.string.body_composition)) }, + selected = navController.currentDestination?.route == Routes.BODY_COMPOSITION_MAIN, + onClick = { + navController.navigate(Routes.BODY_COMPOSITION_MAIN) + scope.launch { drawerState.apply { close() } } + } + ) + NavigationDrawerItem( + modifier = Modifier.padding(8.dp, 2.dp, 8.dp, 2.dp), + label = { Text(text = stringResource(R.string.training_plans)) }, + selected = navController.currentDestination?.route == Routes.TRAINING_PLANS_MAIN, + onClick = { + navController.navigate(Routes.TRAINING_PLANS_MAIN) + scope.launch { drawerState.apply { close() } } + } + ) + Divider() + NavigationDrawerItem( + modifier = Modifier.padding(8.dp, 2.dp, 8.dp, 2.dp), + label = { Text(text = stringResource(R.string.settings)) }, + icon = { Icon(Icons.Filled.Settings, contentDescription = "") }, + selected = false, + onClick = { + navController.navigate(Routes.SETTINGS) + scope.launch { drawerState.apply { close() } } + } + ) + } + } + ) { + Scaffold( + topBar = { + TopAppBar( + title = {}, + navigationIcon = { + IconButton( + onClick = { + scope.launch { + drawerState.apply { open() } + } + } + ) { + Icon(Icons.Filled.Menu, contentDescription = "") + } + } + ) + } + ) { padding -> + Surface(modifier = Modifier.padding(padding)) { + NavHost( + navController = navController, + startDestination = Routes.MAIN, + modifier = Modifier.padding(8.dp) + ) { + composable(Routes.MAIN) { + MainScreenRoute(navigation = navController) + } + + composable(Routes.BODY_COMPOSITION_MAIN) { + BodyCompositionMainRoute(navigation = navController) + } + + composable(Routes.TRAINING_PLANS_MAIN) { + TrainingPlansRoute(navigation = navController) + } + + composable(Routes.SETTINGS) { + SettingsMainRoute(navigation = navController) + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/routes/MainScreenRoute.kt b/app/src/main/java/de/polyfish0/fitnessjourney/routes/MainScreenRoute.kt new file mode 100644 index 0000000..bbf8a39 --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/routes/MainScreenRoute.kt @@ -0,0 +1,71 @@ +package de.polyfish0.fitnessjourney.routes + +import android.util.Log +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Shapes +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import de.polyfish0.fitnessjourney.R + +@Composable +fun MainScreenRoute(navigation: NavController) { + Surface( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(), + color = MaterialTheme.colorScheme.background + ) { + Scaffold( + floatingActionButton = { + ElevatedButton( + onClick = { + Log.d("f", "ff") + } + ) { + Icon(Icons.Filled.Add, contentDescription = "") + } + } + ) { padding -> + Column( + modifier = Modifier + .fillMaxWidth() + .padding(padding), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.padding(4.dp)) { + Text(text = "Moin ich bin the first screen!") + Button(onClick = { + navigation.navigate(Routes.TRAINING_PLANS_MAIN) + }) { + Text(text = stringResource(R.string.app_name)) + } + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/routes/Routes.kt b/app/src/main/java/de/polyfish0/fitnessjourney/routes/Routes.kt new file mode 100644 index 0000000..82ee123 --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/routes/Routes.kt @@ -0,0 +1,8 @@ +package de.polyfish0.fitnessjourney.routes + +object Routes { + const val MAIN = "Main" + const val BODY_COMPOSITION_MAIN = "BodyCompositionMain" + const val TRAINING_PLANS_MAIN = "TrainingPlansMain" + const val SETTINGS = "Settings" +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/routes/bodycomposition/BodyCompositionMainRoute.kt b/app/src/main/java/de/polyfish0/fitnessjourney/routes/bodycomposition/BodyCompositionMainRoute.kt new file mode 100644 index 0000000..829683f --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/routes/bodycomposition/BodyCompositionMainRoute.kt @@ -0,0 +1,37 @@ +package de.polyfish0.fitnessjourney.routes.bodycomposition + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import de.polyfish0.fitnessjourney.R +import de.polyfish0.fitnessjourney.routes.Routes + +@Composable +fun BodyCompositionMainRoute(navigation: NavController) { + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.Top, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.padding(4.dp)) { + Text(text = "Hier gibts noch nichts aber hier sollen krasse Fitness Daten und Statistiken angezeigt werden c:") + Button(onClick = { + navigation.navigate(Routes.MAIN) + }) { + Text(text = stringResource(R.string.app_name)) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/routes/settings/SettingsMainRoute.kt b/app/src/main/java/de/polyfish0/fitnessjourney/routes/settings/SettingsMainRoute.kt new file mode 100644 index 0000000..58b27ca --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/routes/settings/SettingsMainRoute.kt @@ -0,0 +1,47 @@ +package de.polyfish0.fitnessjourney.routes.settings + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController +import de.polyfish0.fitnessjourney.R +import de.polyfish0.fitnessjourney.routes.Routes + +@Composable +fun SettingsMainRoute(navigation: NavController) { + Surface( + modifier = Modifier + .fillMaxWidth() + .fillMaxHeight(), + color = MaterialTheme.colorScheme.background + ) { + Column( + modifier = Modifier.fillMaxWidth(), + verticalArrangement = Arrangement.Top, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.padding(4.dp)) { + Text(text = "Hier gibts noch nichts aber es sollen die Einstellungen werden c:") + Button(onClick = { + navigation.navigate(Routes.MAIN) + }) { + Text(text = stringResource(R.string.app_name)) + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/routes/trainingplans/TrainingPlansCreationRoute.kt b/app/src/main/java/de/polyfish0/fitnessjourney/routes/trainingplans/TrainingPlansCreationRoute.kt new file mode 100644 index 0000000..27a2217 --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/routes/trainingplans/TrainingPlansCreationRoute.kt @@ -0,0 +1 @@ +package de.polyfish0.fitnessjourney.routes.trainingplans diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/routes/trainingplans/TrainingPlansMainRoute.kt b/app/src/main/java/de/polyfish0/fitnessjourney/routes/trainingplans/TrainingPlansMainRoute.kt new file mode 100644 index 0000000..a4e52c5 --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/routes/trainingplans/TrainingPlansMainRoute.kt @@ -0,0 +1,34 @@ +package de.polyfish0.fitnessjourney.routes.trainingplans + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.navigation.NavController + +@Composable +fun TrainingPlansRoute(navigation: NavController) { + Surface(modifier = Modifier + .fillMaxWidth()) { + Card( + colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primaryContainer) + ) { + Column(modifier = Modifier.padding(4.dp)) { + Text(text = "Und hier kann der Nutzer Trainingspläne erstellen ^^") + Button(onClick = { + navigation.popBackStack() + }) { + Text(text = "Funny Stuff") + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Color.kt b/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Color.kt new file mode 100644 index 0000000..6da17d4 --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package de.polyfish0.fitnessjourney.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/de/polyfish0/fitnessjourney/ui/theme/Theme.kt b/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Theme.kt new file mode 100644 index 0000000..02a030f --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package de.polyfish0.fitnessjourney.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.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +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 FitnessJourneyTheme( + 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 + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.background.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Type.kt b/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Type.kt new file mode 100644 index 0000000..46e7efb --- /dev/null +++ b/app/src/main/java/de/polyfish0/fitnessjourney/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package de.polyfish0.fitnessjourney.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/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/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/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ 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..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/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-de/strings.xml b/app/src/main/res/values-de/strings.xml new file mode 100644 index 0000000..29c56b3 --- /dev/null +++ b/app/src/main/res/values-de/strings.xml @@ -0,0 +1,7 @@ + + + Fitness Journey + Trainingspläne + Körperdaten + Einstellungen + \ 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..51f787a --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + Fitness Journey + Training plans + Body composition + Settings + \ 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..431c385 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,4 @@ + + +