package rename

RepositoryAndroid
Victor SOULIER 1 year ago
parent 87331fbe3c
commit d11da40f0d

@ -1,4 +1,4 @@
package com.example.sciencequest package fr.iut.sciencequest
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4

@ -13,12 +13,7 @@
android:theme="@style/Theme.ScienceQuest" android:theme="@style/Theme.ScienceQuest"
tools:targetApi="31"> tools:targetApi="31">
<activity <activity
android:name=".AccountActivity" android:name="fr.iut.sciencequest.MainActivity"
android:exported="false"
android:label="@string/title_activity_account"
android:theme="@style/Theme.ScienceQuest" />
<activity
android:name=".MainActivity"
android:exported="true" android:exported="true"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.ScienceQuest"> android:theme="@style/Theme.ScienceQuest">

@ -1,45 +0,0 @@
package com.example.sciencequest
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
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.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import com.example.sciencequest.navigation.NavHost
import com.example.sciencequest.ui.theme.ScienceQuestTheme
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
ScienceQuestTheme {
// A surface container using the 'background' color from the theme
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
NavHost()
}
}
}
}
}

@ -1,22 +0,0 @@
package com.example.sciencequest.view
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.res.painterResource
import com.example.sciencequest.R
@Composable
fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit) {
topBar(goToAccount, goToHome)
mainContent()
}
@Composable
fun mainContent() {
}

@ -0,0 +1,28 @@
package fr.iut.sciencequest
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import fr.iut.sciencequest.navigation.NavHost
import fr.iut.sciencequest.ui.theme.ScienceQuestTheme
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
ScienceQuestTheme {
// A surface container using the 'background' color from the theme
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
NavHost()
}
}
}
}
}

@ -1,4 +1,4 @@
package com.example.sciencequest.navigation package fr.iut.sciencequest.navigation
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -6,8 +6,8 @@ import androidx.compose.ui.Modifier
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import com.example.sciencequest.view.AccountScreen import fr.iut.sciencequest.view.AccountScreen
import com.example.sciencequest.view.HomeScreen import fr.iut.sciencequest.view.HomeScreen
@Composable @Composable

@ -1,4 +1,4 @@
package com.example.sciencequest.ui.theme package fr.iut.sciencequest.ui.theme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color

@ -1,4 +1,4 @@
package com.example.sciencequest.ui.theme package fr.iut.sciencequest.ui.theme
import android.app.Activity import android.app.Activity
import android.os.Build import android.os.Build

@ -1,4 +1,4 @@
package com.example.sciencequest.ui.theme package fr.iut.sciencequest.ui.theme
import androidx.compose.material3.Typography import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.TextStyle

@ -1,4 +1,4 @@
package com.example.sciencequest.view package fr.iut.sciencequest.view
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth

@ -0,0 +1,14 @@
package fr.iut.sciencequest.view
import androidx.compose.runtime.Composable
@Composable
fun HomeScreen(goToHome: () -> Unit, goToAccount: () -> Unit) {
topBar(goToAccount, goToHome)
mainContent()
}
@Composable
fun mainContent() {
}

@ -1,4 +1,4 @@
package com.example.sciencequest.view package fr.iut.sciencequest.view
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement

@ -1,4 +1,4 @@
package com.example.sciencequest package fr.iut.sciencequest
import org.junit.Test import org.junit.Test
Loading…
Cancel
Save