diff --git a/app/.gitignore b/app/.gitignore index aa724b7..226d61c 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -7,6 +7,7 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetSelector.xml .DS_Store /build /captures diff --git a/app/.idea/deploymentTargetSelector.xml b/app/.idea/deploymentTargetSelector.xml deleted file mode 100644 index b268ef3..0000000 --- a/app/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 7a64cab..160f3f0 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -47,6 +47,7 @@ dependencies { implementation(libs.androidx.navigation.ui.ktx) implementation(libs.navigation.fragment.ktx) implementation(libs.navigation.ui.ktx) + implementation(libs.androidx.activity) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml index 0ff080c..8eb28fe 100644 --- a/app/app/src/main/AndroidManifest.xml +++ b/app/app/src/main/AndroidManifest.xml @@ -13,14 +13,23 @@ android:theme="@style/Theme.EasyEat" tools:targetApi="31"> + android:name=".SplashActivity" + android:exported="true"> + + + + + \ No newline at end of file diff --git a/app/app/src/main/java/tech/mercantec/easyeat/SplashActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/SplashActivity.kt new file mode 100644 index 0000000..b7956a9 --- /dev/null +++ b/app/app/src/main/java/tech/mercantec/easyeat/SplashActivity.kt @@ -0,0 +1,22 @@ +package tech.mercantec.easyeat + +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class SplashActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + // TODO do auth check + val loggedIn = false + + if (!loggedIn) { + startActivity(Intent(this, WelcomeActivity::class.java)) + + return + } + + startActivity(Intent(this, MainActivity::class.java)) + } +} \ No newline at end of file diff --git a/app/app/src/main/java/tech/mercantec/easyeat/WelcomeActivity.kt b/app/app/src/main/java/tech/mercantec/easyeat/WelcomeActivity.kt new file mode 100644 index 0000000..c9cf0d9 --- /dev/null +++ b/app/app/src/main/java/tech/mercantec/easyeat/WelcomeActivity.kt @@ -0,0 +1,17 @@ +package tech.mercantec.easyeat + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class WelcomeActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + supportActionBar?.hide() + + setContentView(R.layout.activity_welcome) + } +} \ No newline at end of file diff --git a/app/app/src/main/res/layout/activity_welcome.xml b/app/app/src/main/res/layout/activity_welcome.xml new file mode 100644 index 0000000..84f0c90 --- /dev/null +++ b/app/app/src/main/res/layout/activity_welcome.xml @@ -0,0 +1,34 @@ + + + + + +