diff --git a/app/build.gradle b/app/build.gradle index 3f835f6..90626cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,6 +75,8 @@ dependencies { def arch_version = "2.2.0" def roomVersion = '2.3.0' + implementation 'androidx.core:core-splashscreen:1.0.1' + // ViewModel implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1207edf..a65e438 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,16 +14,19 @@ android:theme="@style/Theme.Ophelia" tools:targetApi="31"> + android:theme="@style/SplashScreenTheme"> + + \ No newline at end of file diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/BioListViewModel.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/BioListViewModel.kt index 14d016a..b538ead 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/BioListViewModel.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/BioListViewModel.kt @@ -1,8 +1,5 @@ package com.menagerie.ophelia.database.polycule -import android.app.Application -import android.content.Context -import android.view.View import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider @@ -10,7 +7,6 @@ import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope import com.menagerie.ophelia.database.polycule.entity.Bio import kotlinx.coroutines.launch -import java.lang.IllegalArgumentException class BioListViewModel(private val repository: PolyculeRepository) : ViewModel() { diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt index 8e8ce5b..d192ef1 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeApplication.kt @@ -1,8 +1,6 @@ package com.menagerie.ophelia.database.polycule import android.app.Application -import android.util.Log -import com.menagerie.ophelia.database.polycule.entity.Bio import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt index 2b799bf..201b123 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabase.kt @@ -1,7 +1,6 @@ package com.menagerie.ophelia.database.polycule import android.content.Context -import android.util.Log import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase @@ -34,7 +33,6 @@ abstract class PolyculeDatabase : RoomDatabase() { ): PolyculeDatabase { return INSTANCE ?: synchronized(this) { - Log.d("huh?", "FUCK") val instance = Room.databaseBuilder( context.applicationContext, PolyculeDatabase::class.java, @@ -55,41 +53,24 @@ abstract class PolyculeDatabase : RoomDatabase() { override fun onCreate(db: SupportSQLiteDatabase) { super.onCreate(db) - Log.d("WWW" , "FUCK") INSTANCE?.let { database -> scope.launch { - Log.d("WWWWWWWWW", "FUCK") populateDatabase(database.bioDao()) } } } suspend fun populateDatabase(bioDao: BioDao) { - Log.d("TAWNI", "AAAAA") - var bio = Bio( - name = "Fuck") + name = "Azea") bioDao.insert(bio) bio = Bio( - name = "Off") - bioDao.insert(bio) - - - - bio = Bio( - name = "Android!") + name = "Darkwood Mill") bioDao.insert(bio) bio = Bio( - name = "(Now") - bioDao.insert(bio) - bio = Bio( - name = "In") - bioDao.insert(bio) - bio = Bio( - name = "Compose!)") + name = "Blizzard") bioDao.insert(bio) val count = bioDao.getAllAlphabetisedBios().count() - Log.d("Count", "$count") } } diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt index c2c6bf5..68119ac 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeDatabaseManager.kt @@ -2,6 +2,7 @@ package com.menagerie.ophelia.database.polycule import com.menagerie.ophelia.database.polycule.entity.Bio +//Todo: Move repo access to manager to limit passing it around object PolyculeDatabaseManager { lateinit var polyculeRepository : PolyculeRepository diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt index bf882b2..db94018 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/PolyculeRepository.kt @@ -1,10 +1,8 @@ package com.menagerie.ophelia.database.polycule -import androidx.lifecycle.LiveData import com.menagerie.ophelia.database.polycule.entity.Bio import com.menagerie.ophelia.database.polycule.entity.BioDao import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.count class PolyculeRepository( diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Bio.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Bio.kt index 855a668..796e2a3 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Bio.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/Bio.kt @@ -2,7 +2,6 @@ package com.menagerie.ophelia.database.polycule.entity import androidx.room.ColumnInfo import androidx.room.Entity -import androidx.room.ForeignKey import androidx.room.PrimaryKey @Entity( diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt index 27270b5..c92bbfa 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/BioDao.kt @@ -5,7 +5,6 @@ import androidx.room.Insert import androidx.room.Query import androidx.room.Update import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.count @Dao abstract class BioDao { diff --git a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt index c9924e1..a613ac8 100644 --- a/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt +++ b/app/src/main/java/com/menagerie/ophelia/database/polycule/entity/IdentityDao.kt @@ -4,7 +4,6 @@ import androidx.room.Dao import androidx.room.Insert import androidx.room.Query import androidx.room.Update -import com.menagerie.ophelia.database.polycule.entity.Identity @Dao abstract class IdentityDao { diff --git a/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt b/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt new file mode 100644 index 0000000..5516a1f --- /dev/null +++ b/app/src/main/java/com/menagerie/ophelia/view/splash/SplashActivity().kt @@ -0,0 +1,36 @@ +package com.menagerie.ophelia.view.splash + +import android.annotation.SuppressLint +import android.content.Intent +import android.os.Build +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen +import androidx.lifecycle.lifecycleScope +import com.menagerie.ophelia.MainActivity +import kotlinx.coroutines.delay + +@SuppressLint("CustomSplashScreen") +class SplashActivity : ComponentActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + val splashScreen = installSplashScreen() + splashScreen.setKeepOnScreenCondition { true } + } + + super.onCreate(savedInstanceState) + //TODO : Figure out how to update this properly + lifecycleScope.launchWhenCreated { + delay(1500) + + val intent = Intent(this@SplashActivity, + MainActivity::class.java) + startActivity(intent) + finish() + + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml new file mode 100644 index 0000000..3b23538 --- /dev/null +++ b/app/src/main/res/drawable/bg_splash.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_splash_12.xml b/app/src/main/res/drawable/bg_splash_12.xml new file mode 100644 index 0000000..9567ad8 --- /dev/null +++ b/app/src/main/res/drawable/bg_splash_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_app_logo.png b/app/src/main/res/drawable/ic_app_logo.png new file mode 100644 index 0000000..a1ef349 Binary files /dev/null and b/app/src/main/res/drawable/ic_app_logo.png differ diff --git a/app/src/main/res/drawable/ophelia_background.xml b/app/src/main/res/drawable/ophelia_background.xml new file mode 100644 index 0000000..7c97e64 --- /dev/null +++ b/app/src/main/res/drawable/ophelia_background.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ophelia_foreground.xml b/app/src/main/res/drawable/ophelia_foreground.xml new file mode 100644 index 0000000..359649e --- /dev/null +++ b/app/src/main/res/drawable/ophelia_foreground.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml index 6f3b755..5003082 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -1,6 +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 index 6f3b755..5003082 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml new file mode 100644 index 0000000..6f4f49c --- /dev/null +++ b/app/src/main/res/values-v31/themes.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index b9b95c6..3f3c8de 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,7 @@ - \ No newline at end of file