Refactoring

This commit is contained in:
2021-09-06 23:00:01 +02:00
parent 605659a224
commit 1367955396
17 changed files with 114 additions and 86 deletions
@@ -6,6 +6,7 @@ import com.ericampire.android.androidstudycase.app.room.AppDatabase
import com.ericampire.android.androidstudycase.data.room.AnimatorDao
import com.ericampire.android.androidstudycase.data.room.BlogDao
import com.ericampire.android.androidstudycase.data.room.LottieFilesDao
import com.ericampire.android.androidstudycase.data.room.UserDao
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
@@ -25,6 +26,11 @@ object RoomModule {
return db.build()
}
@Provides
fun provideUserDao(appDatabase: AppDatabase): UserDao {
return appDatabase.userDao
}
@Provides
fun provideBlogDao(appDatabase: AppDatabase): BlogDao {
return appDatabase.blogDao
@@ -2,22 +2,23 @@ package com.ericampire.android.androidstudycase.app.room
import androidx.room.Database
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import com.ericampire.android.androidstudycase.data.room.AnimatorDao
import com.ericampire.android.androidstudycase.data.room.BlogDao
import com.ericampire.android.androidstudycase.data.room.LottieFilesDao
import com.ericampire.android.androidstudycase.data.room.UserDao
import com.ericampire.android.androidstudycase.domain.entity.Animator
import com.ericampire.android.androidstudycase.domain.entity.Blog
import com.ericampire.android.androidstudycase.domain.entity.Lottiefile
import com.ericampire.android.androidstudycase.util.room.DateConverter
import com.ericampire.android.androidstudycase.domain.entity.User
@Database(
entities = [Blog::class, Animator::class, Lottiefile::class],
entities = [Blog::class, Animator::class, Lottiefile::class, User::class],
version = 2,
exportSchema = false
)
abstract class AppDatabase : RoomDatabase() {
abstract val blogDao: BlogDao
abstract val userDao: UserDao
abstract val animatorDao: AnimatorDao
abstract val lottieFileDao: LottieFilesDao
}
@@ -2,7 +2,6 @@ package com.ericampire.android.androidstudycase.presentation.screen.home.ui
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.material.Card
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.MaterialTheme
@@ -12,13 +11,11 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import com.airbnb.lottie.compose.*
import com.ericampire.android.androidstudycase.domain.entity.Lottiefile
import com.ericampire.android.androidstudycase.presentation.screen.explore.ui.LottieFileItemView
import com.ericampire.android.androidstudycase.presentation.theme.AndroidStudyCaseTheme
import com.ericampire.android.androidstudycase.presentation.theme.AppColor
import com.ericampire.android.androidstudycase.util.LottieFileProvider
@@ -70,13 +67,11 @@ fun FeaturedLottieFileView(
maxLines = 1,
text = lottiefile.name,
style = MaterialTheme.typography.h6,
textAlign = TextAlign.Center,
)
Text(
text = lottiefile.createdBy?.name ?: "",
maxLines = 1,
style = MaterialTheme.typography.caption,
textAlign = TextAlign.Center,
)
}
)
@@ -5,6 +5,8 @@ import androidx.compose.ui.graphics.Color
object AppColor {
val Teal = Color(0xFF1C7373)
val PaleBlue = Color(0xFFD3F6F6)
val PrimaryColor = Color(0xFF2BEAED)
val PrimaryColorDark = Color(0xFF006B78)
val Purple700 = Color(0xFF3700B3)