Merge branch 'main' into twitterloginfrontend

Android/app/build.gradle

@@ -63,6 +63,7 @@ dependencies {
  androidTestImplementation("androidx.navigation:navigation-testing:2.5.3")
 
  implementation 'androidx.compose.ui:ui-graphics'
+ implementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
  implementation 'androidx.compose.ui:ui-tooling-preview'
  implementation 'androidx.compose.material3:material3'
  implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

Android/app/src/main/AndroidManifest.xml

@@ -10,19 +10,21 @@
  android:label="@string/app_name"
  android:roundIcon="@mipmap/ic_launcher"
  android:supportsRtl="true"
- android:theme="@style/Theme.VigyBag"
+ android:theme="@style/Theme.CustomSplashScreenTheme"
+
  tools:targetApi="31">
  <activity
  android:name=".MainActivity"
  android:exported="true"
  android:label="@string/app_name"
- android:theme="@style/splashScreenTheme">
+ android:theme="@style/Theme.CustomSplashScreenTheme">
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
 
  <category android:name="android.intent.category.LAUNCHER" />
  </intent-filter>
  </activity>
+
  </application>
 
 </manifest>

Android/app/src/main/java/com/vigbag/android/MainActivity.kt

@@ -2,15 +2,15 @@ package com.vigbag.android
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.fragment.app.Fragment
 import com.vigbag.android.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
+ installSplashScreen()
  setContentView(R.layout.activity_main)
  }
-
-
 }
 

Android/app/src/main/java/com/vigbag/android/SignInFragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
+import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import com.vigbag.android.databinding.FragmentSignInBinding
 import com.vigbag.android.util.Constants.preferences

Android/app/src/main/java/com/vigbag/android/SignUpFragment.kt

@@ -2,12 +2,10 @@ package com.vigbag.android
 
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
+import androidx.navigation.fragment.findNavController
 import com.vigbag.android.databinding.FragmentSignUpBinding
 
 class SignUpFragment : Fragment(R.layout.fragment_sign_up) {

Android/app/src/main/res/navigation/nav_graph.xml

@@ -5,6 +5,8 @@
  android:id="@+id/nav_graph"
  app:startDestination="@id/signInFragment">
 
+
+
  <fragment
  android:id="@+id/signInFragment"
  android:name="com.vigbag.android.SignInFragment"

Android/app/src/main/res/values/Theme.SplashScreen.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="Theme.CustomSplashScreenTheme" parent="Theme.SplashScreen">
+ <item name="windowSplashScreenBackground">#F9A826</item>
+ <item name="windowSplashScreenAnimatedIcon">@drawable/splashscreenlogo</item>
+ <item name="windowSplashScreenAnimationDuration">300</item>
+ <item name="postSplashScreenTheme">@style/Theme.VigyBag</item>
+ </style>
+</resources>

Android/app/src/main/res/values/strings.xml

@@ -2,4 +2,6 @@
  <string name="app_name">VigyBag</string>
  <string name="email_key">email</string>
  <string name="password_key">password</string>
+ <!-- TODO: Remove or change this placeholder text -->
+ <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

Android/app/src/main/res/values/themes.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
- <style name="splashScreenTheme" parent="android:Theme.Material.Light.NoActionBar">
- <item name="android:windowBackground">@drawable/splash_image</item>
- <item name="android:statusBarColor">@color/black</item>
- </style>
+
  <style name="Theme.VigyBag" parent="Theme.AppCompat.DayNight.NoActionBar" />
 </resources>

Android/build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
- id 'com.android.application' version '7.4.2' apply false
- id 'com.android.library' version '7.4.2' apply false
+ id 'com.android.application' version '8.0.2' apply false
+ id 'com.android.library' version '8.0.2' apply false
  id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
 }