From c31f793d8ae0002469cebe9c285cbc9bed61610d Mon Sep 17 00:00:00 2001 From: jisungbin Date: Wed, 28 Jul 2021 07:41:36 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=AA=A8=EB=A6=AC=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EC=B5=9C=EC=A0=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 11 ++- .../team/bravepeople/devevent/GlideModule.kt | 38 -------- .../devevent/activity/main/MainActivity.kt | 41 ++++---- .../bravepeople/devevent/activity/main/Tab.kt | 14 +++ .../devevent/activity/main/info/Info.kt | 38 ++++---- .../devevent/receiver/EventReloadReceiver.kt | 11 ++- .../devevent/ui/errordialog/ErrorDialog.kt | 2 +- .../ui/fancybottombar/FancyBottomBar.kt | 93 ------------------- .../devevent/ui/fancybottombar/FancyColors.kt | 18 ---- .../devevent/ui/fancybottombar/FancyItem.kt | 14 --- .../ui/fancybottombar/FancyOptions.kt | 21 ----- .../devevent/ui/glideimage/GlideImage.kt | 26 ------ .../bravepeople/devevent/util/AlarmUtil.kt | 2 +- build.gradle.kts | 1 - buildSrc/src/main/kotlin/Dependencies.kt | 29 ++---- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 2 +- 17 files changed, 83 insertions(+), 280 deletions(-) delete mode 100644 app/src/main/kotlin/team/bravepeople/devevent/GlideModule.kt create mode 100644 app/src/main/kotlin/team/bravepeople/devevent/activity/main/Tab.kt delete mode 100644 app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyBottomBar.kt delete mode 100644 app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyColors.kt delete mode 100644 app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyItem.kt delete mode 100644 app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyOptions.kt delete mode 100644 app/src/main/kotlin/team/bravepeople/devevent/ui/glideimage/GlideImage.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b6db5da..2812d83 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,6 @@ plugins { id("com.android.application") id("kotlin-android") id("kotlin-kapt") - // id("kotlinx-serialization") id("dagger.hilt.android.plugin") id("name.remal.check-dependency-updates") version Versions.Util.CheckDependencyUpdates } @@ -53,7 +52,6 @@ android { sourceSets { getByName("main").run { java.srcDirs("src/main/kotlin") - resources.excludes.add("META-INF/library_release.kotlin_module") } } @@ -61,6 +59,7 @@ android { release { isDebuggable = false isMinifyEnabled = true + isShrinkResources = true } } @@ -75,6 +74,11 @@ android { } dependencies { + implementation("com.github.skydoves:landscapist-coil:1.2.8") { + exclude(group = "androidx.appcompat", module = "appcompat") + exclude(group = "androidx.appcompat", module = "appcompat-resources") + } + Dependencies.debug.forEach(::debugImplementation) Dependencies.essential.forEach(::implementation) Dependencies.network.forEach(::implementation) @@ -84,4 +88,7 @@ dependencies { Dependencies.hilt.forEach(::implementation) Dependencies.room.forEach(::implementation) Dependencies.compiler.forEach(::kapt) + + // https://whyprogrammer.tistory.com/590 + kapt("org.xerial:sqlite-jdbc:3.34.0") } diff --git a/app/src/main/kotlin/team/bravepeople/devevent/GlideModule.kt b/app/src/main/kotlin/team/bravepeople/devevent/GlideModule.kt deleted file mode 100644 index 1e4c42e..0000000 --- a/app/src/main/kotlin/team/bravepeople/devevent/GlideModule.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * DevEventAndroid © 2021 용감한 친구들. all rights reserved. - * DevEventAndroid license is under the MIT. - * - * [GlideModule.kt] created by Ji Sungbin on 21. 6. 20. 오후 11:55. - * - * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. - */ - -package team.bravepeople.devevent - -import android.app.ActivityManager -import android.content.Context -import com.bumptech.glide.GlideBuilder -import com.bumptech.glide.annotation.GlideModule -import com.bumptech.glide.load.DecodeFormat -import com.bumptech.glide.load.engine.DiskCacheStrategy -import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory -import com.bumptech.glide.module.AppGlideModule -import com.bumptech.glide.request.RequestOptions - -@GlideModule -class GlideModule : AppGlideModule() { - override fun applyOptions(context: Context, builder: GlideBuilder) { - builder.setDiskCache(InternalCacheDiskCacheFactory(context, 1024 * 1024 * 500)) // 500 MB - - val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as? ActivityManager - if (activityManager?.isLowRamDevice == true) { - builder.setDefaultRequestOptions(RequestOptions().format(DecodeFormat.PREFER_RGB_565)) - } else { - builder.setDefaultRequestOptions( - RequestOptions() - .format(DecodeFormat.PREFER_ARGB_8888) - .diskCacheStrategy(DiskCacheStrategy.ALL) - ) - } - } -} diff --git a/app/src/main/kotlin/team/bravepeople/devevent/activity/main/MainActivity.kt b/app/src/main/kotlin/team/bravepeople/devevent/activity/main/MainActivity.kt index 0595050..e151fb5 100644 --- a/app/src/main/kotlin/team/bravepeople/devevent/activity/main/MainActivity.kt +++ b/app/src/main/kotlin/team/bravepeople/devevent/activity/main/MainActivity.kt @@ -59,7 +59,9 @@ import androidx.compose.ui.unit.sp import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.Dimension import dagger.hilt.android.AndroidEntryPoint -import javax.inject.Inject +import me.sungbin.fancybottombar.FancyBottomBar +import me.sungbin.fancybottombar.FancyColors +import me.sungbin.fancybottombar.FancyItem import team.bravepeople.devevent.R import team.bravepeople.devevent.activity.main.event.EventFilter import team.bravepeople.devevent.activity.main.event.EventViewModel @@ -72,22 +74,15 @@ import team.bravepeople.devevent.theme.SystemUiController import team.bravepeople.devevent.theme.colors import team.bravepeople.devevent.ui.chip.ChipViewModel import team.bravepeople.devevent.ui.chip.FlowTag -import team.bravepeople.devevent.ui.fancybottombar.FancyBottomBar -import team.bravepeople.devevent.ui.fancybottombar.FancyColors -import team.bravepeople.devevent.ui.fancybottombar.FancyItem import team.bravepeople.devevent.util.AlarmUtil import team.bravepeople.devevent.util.Data import team.bravepeople.devevent.util.config.PathConfig import team.bravepeople.devevent.util.extension.toast - -private enum class Tab { - Main, Favorite, Info -} +import javax.inject.Inject @AndroidEntryPoint class MainActivity : ComponentActivity() { - private var backButtonPressedTime = 0L private var tab by mutableStateOf(Tab.Main) private val chipVm: ChipViewModel by viewModels() @@ -129,7 +124,10 @@ class MainActivity : ComponentActivity() { setContent { MaterialTheme { - Scaffold(topBar = { TopBar() }, content = { Main() }) + Scaffold( + topBar = { TopBar() }, + content = { Main() } + ) } } } @@ -180,9 +178,11 @@ class MainActivity : ComponentActivity() { AnimatedVisibility(visible = searching, exit = fadeOut()) { TextField( keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), - keyboardActions = KeyboardActions(onDone = { - focusManager.clearFocus() - }), + keyboardActions = KeyboardActions( + onDone = { + focusManager.clearFocus() + } + ), modifier = Modifier .fillMaxSize() .focusRequester(FocusRequester()), @@ -260,13 +260,14 @@ class MainActivity : ComponentActivity() { ConstraintLayout(modifier = Modifier.fillMaxSize()) { val (events, bottomBar) = createRefs() - Column(modifier = Modifier - .constrainAs(events) { - top.linkTo(parent.top) - bottom.linkTo(bottomBar.top) - height = Dimension.fillToConstraints - } - .fillMaxWidth() + Column( + modifier = Modifier + .constrainAs(events) { + top.linkTo(parent.top) + bottom.linkTo(bottomBar.top) + height = Dimension.fillToConstraints + } + .fillMaxWidth() ) { Crossfade(tab) { target -> when (target) { diff --git a/app/src/main/kotlin/team/bravepeople/devevent/activity/main/Tab.kt b/app/src/main/kotlin/team/bravepeople/devevent/activity/main/Tab.kt new file mode 100644 index 0000000..ae49175 --- /dev/null +++ b/app/src/main/kotlin/team/bravepeople/devevent/activity/main/Tab.kt @@ -0,0 +1,14 @@ +/* + * DevEventAndroid © 2021 용감한 친구들. all rights reserved. + * DevEventAndroid license is under the MIT. + * + * [Tab.kt] created by Ji Sungbin on 21. 6. 22. 오후 3:41. + * + * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. + */ + +package team.bravepeople.devevent.activity.main + +enum class Tab { + Main, Favorite, Info +} diff --git a/app/src/main/kotlin/team/bravepeople/devevent/activity/main/info/Info.kt b/app/src/main/kotlin/team/bravepeople/devevent/activity/main/info/Info.kt index c7c6acb..ea53fa1 100644 --- a/app/src/main/kotlin/team/bravepeople/devevent/activity/main/info/Info.kt +++ b/app/src/main/kotlin/team/bravepeople/devevent/activity/main/info/Info.kt @@ -61,6 +61,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.Dimension +import com.skydoves.landscapist.coil.CoilImage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import team.bravepeople.devevent.BuildConfig @@ -68,7 +69,6 @@ import team.bravepeople.devevent.R import team.bravepeople.devevent.activity.main.event.database.EventDatabase import team.bravepeople.devevent.theme.ColorOrange import team.bravepeople.devevent.theme.colors -import team.bravepeople.devevent.ui.glideimage.GlideImage import team.bravepeople.devevent.ui.licenser.License import team.bravepeople.devevent.ui.licenser.Licenser import team.bravepeople.devevent.ui.licenser.Project @@ -81,7 +81,6 @@ import team.bravepeople.devevent.util.extension.noRippleClickable import team.bravepeople.devevent.util.extension.noRippleLongClickable import team.bravepeople.devevent.util.extension.toast - @Composable fun ApplicationInfoDialog(isOpen: MutableState) { if (isOpen.value) { @@ -186,12 +185,6 @@ private fun OpenSourceDialog(isOpen: MutableState) { "https://android.googlesource.com/platform/frameworks/support/", License.Apache2 ), - Project( - "lottie", - "https://github.com/airbnb/lottie/blob/master/android-compose.md", - License.MIT - ), - Project("glide", "https://github.com/bumptech/glide", License.BSD), Project( "Browser", "https://developer.android.com/jetpack/androidx/releases/browser", @@ -224,15 +217,20 @@ private fun OpenSourceDialog(isOpen: MutableState) { "https://github.com/square/leakcanary", License.Apache2 ), - Project( - "바른나눔고딕", - "https://help.naver.com/support/contents/contents.help?serviceNo=1074&categoryNo=3497", - License.CUSTOM("SIL") - ), Project( "ConstraintLayout", "https://developer.android.com/jetpack/compose/layouts/constraintlayout", License.Apache2 + ), + Project( + "FancyBottomBar", + "https://github.com/jisungbin/FancyBottomBar", + License.MIT + ), + Project( + "Landscapist", + "https://github.com/skydoves/Landscapist", + License.Apache2 ) ) ) @@ -306,12 +304,12 @@ fun Info(database: EventDatabase, activity: Activity) { .height(100.dp), verticalAlignment = Alignment.CenterVertically ) { - GlideImage( + CoilImage( modifier = Modifier .size(100.dp) .noRippleClickable { Web.open(activity, Web.Link.Organization) } .clip(RoundedCornerShape(10.dp)), - src = logoUrl + imageModel = logoUrl ) Column( modifier = Modifier.fillMaxSize(), @@ -491,9 +489,11 @@ fun Info(database: EventDatabase, activity: Activity) { TextField( value = eventsKeyword, keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), - keyboardActions = KeyboardActions(onDone = { - focusManager.clearFocus() - }), + keyboardActions = KeyboardActions( + onDone = { + focusManager.clearFocus() + } + ), onValueChange = { eventsKeyword = it Data.save(context, PathConfig.EventKeywordAlarm, it.text) @@ -526,4 +526,4 @@ fun Info(database: EventDatabase, activity: Activity) { ) } } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/team/bravepeople/devevent/receiver/EventReloadReceiver.kt b/app/src/main/kotlin/team/bravepeople/devevent/receiver/EventReloadReceiver.kt index f094d73..8b408bb 100644 --- a/app/src/main/kotlin/team/bravepeople/devevent/receiver/EventReloadReceiver.kt +++ b/app/src/main/kotlin/team/bravepeople/devevent/receiver/EventReloadReceiver.kt @@ -14,9 +14,6 @@ import android.content.Context import android.content.Intent import androidx.annotation.StringRes import dagger.hilt.android.AndroidEntryPoint -import java.util.Calendar -import javax.inject.Inject -import kotlin.random.Random import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.collect @@ -25,10 +22,14 @@ import team.bravepeople.devevent.R import team.bravepeople.devevent.activity.main.event.database.EventDatabase import team.bravepeople.devevent.activity.main.event.repo.EventRepo import team.bravepeople.devevent.activity.main.event.repo.EventRepoResult +import team.bravepeople.devevent.util.AlarmUtil import team.bravepeople.devevent.util.Data import team.bravepeople.devevent.util.NotificationUtil import team.bravepeople.devevent.util.config.PathConfig import team.bravepeople.devevent.util.extension.filterNewEventByName +import java.util.Calendar +import javax.inject.Inject +import kotlin.random.Random @AndroidEntryPoint class EventReloadReceiver : BroadcastReceiver() { @@ -41,10 +42,12 @@ class EventReloadReceiver : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) != 13) return + AlarmUtil.startReloadService(context = context!!) + CoroutineScope(Dispatchers.IO).launch { val preEvents = database.dao().getEvents() val receiveNewEventNotification = - Data.read(context!!, PathConfig.NewEventNotification, "false").toBoolean() + Data.read(context, PathConfig.NewEventNotification, "false").toBoolean() val eventsKeywordAlarms = Data.read(context, PathConfig.EventKeywordAlarm, "")!!.split(",").map { it.trim() } diff --git a/app/src/main/kotlin/team/bravepeople/devevent/ui/errordialog/ErrorDialog.kt b/app/src/main/kotlin/team/bravepeople/devevent/ui/errordialog/ErrorDialog.kt index d04e17f..314de53 100644 --- a/app/src/main/kotlin/team/bravepeople/devevent/ui/errordialog/ErrorDialog.kt +++ b/app/src/main/kotlin/team/bravepeople/devevent/ui/errordialog/ErrorDialog.kt @@ -49,4 +49,4 @@ fun ErrorDialog( } ) } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyBottomBar.kt b/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyBottomBar.kt deleted file mode 100644 index defbd28..0000000 --- a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyBottomBar.kt +++ /dev/null @@ -1,93 +0,0 @@ -/* - * DevEventAndroid © 2021 용감한 친구들. all rights reserved. - * DevEventAndroid license is under the MIT. - * - * [FancyBottomBar.kt] created by Ji Sungbin on 21. 6. 22. 오후 4:38. - * - * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. - */ - -package team.bravepeople.devevent.ui.fancybottombar - -import androidx.compose.animation.animateColorAsState -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.material.Icon -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource - -@Composable -fun FancyBottomBar( - modifier: Modifier, - fancyColors: FancyColors = FancyColors(), - fancyOptions: FancyOptions = FancyOptions(), - items: List, - onItemChanged: FancyItem.() -> Unit -) { - var fancyItemState by remember { mutableStateOf(items.first().id) } - - Row( - modifier = modifier - .fillMaxWidth() - .height(fancyOptions.barHeight) - .background(color = fancyColors.background), - verticalAlignment = Alignment.CenterVertically - ) { - items.forEach { item -> - val fancyItemColor by animateColorAsState(if (fancyItemState == item.id) fancyColors.primary else fancyColors.indicatorBackground) - - Box( - modifier = Modifier - .weight(1f) - .clickable { - fancyItemState = item.id - onItemChanged(item) - } - ) { - Spacer( - modifier = Modifier - .fillMaxWidth() - .height(fancyOptions.indicatorHeight) - .background(color = fancyItemColor) - ) - Column( - modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - if (item.icon != null) { - Icon( - painter = painterResource(item.icon), - contentDescription = null, - tint = fancyItemColor - ) - } - if (item.title.isNotBlank()) { - Text( - text = item.title, - color = fancyItemColor, - modifier = Modifier.padding(top = fancyOptions.titleTopPadding), - fontFamily = fancyOptions.fontFamily - ) - } - } - } - } - } -} diff --git a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyColors.kt b/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyColors.kt deleted file mode 100644 index fac1bf6..0000000 --- a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyColors.kt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * DevEventAndroid © 2021 용감한 친구들. all rights reserved. - * DevEventAndroid license is under the MIT. - * - * [FancyColors.kt] created by Ji Sungbin on 21. 6. 22. 오후 4:38. - * - * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. - */ - -package team.bravepeople.devevent.ui.fancybottombar - -import androidx.compose.ui.graphics.Color - -class FancyColors( - var background: Color = Color.White, - var indicatorBackground: Color = Color.LightGray, - var primary: Color = Color.Blue -) diff --git a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyItem.kt b/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyItem.kt deleted file mode 100644 index 0b4751c..0000000 --- a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyItem.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * DevEventAndroid © 2021 용감한 친구들. all rights reserved. - * DevEventAndroid license is under the MIT. - * - * [FancyItem.kt] created by Ji Sungbin on 21. 6. 22. 오후 4:38. - * - * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. - */ - -package team.bravepeople.devevent.ui.fancybottombar - -import androidx.annotation.DrawableRes - -data class FancyItem(val title: String = "", @DrawableRes val icon: Int? = null, val id: Int = 0) diff --git a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyOptions.kt b/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyOptions.kt deleted file mode 100644 index 211fdb4..0000000 --- a/app/src/main/kotlin/team/bravepeople/devevent/ui/fancybottombar/FancyOptions.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * DevEventAndroid © 2021 용감한 친구들. all rights reserved. - * DevEventAndroid license is under the MIT. - * - * [FancyOptions.kt] created by Ji Sungbin on 21. 6. 22. 오후 4:39. - * - * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. - */ - -package team.bravepeople.devevent.ui.fancybottombar - -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp - -class FancyOptions( - var fontFamily: FontFamily = FontFamily.Default, - var indicatorHeight: Dp = 1.dp, - var barHeight: Dp = 60.dp, - var titleTopPadding: Dp = 4.dp -) diff --git a/app/src/main/kotlin/team/bravepeople/devevent/ui/glideimage/GlideImage.kt b/app/src/main/kotlin/team/bravepeople/devevent/ui/glideimage/GlideImage.kt deleted file mode 100644 index 0a673b9..0000000 --- a/app/src/main/kotlin/team/bravepeople/devevent/ui/glideimage/GlideImage.kt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DevEventAndroid © 2021 용감한 친구들. all rights reserved. - * DevEventAndroid license is under the MIT. - * - * [GlideImage.kt] created by Ji Sungbin on 21. 6. 22. 오후 4:39. - * - * Please see: https://github.com/brave-people/Dev-Event-Android/blob/master/LICENSE. - */ - -package team.bravepeople.devevent.ui.glideimage - -import android.widget.ImageView -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.viewinterop.AndroidView -import team.bravepeople.devevent.GlideApp - -@Composable -fun GlideImage(modifier: Modifier, src: Any) { - val context = LocalContext.current - - AndroidView(factory = { ImageView(context) }, modifier = modifier) { - GlideApp.with(context).load(src).into(it) - } -} diff --git a/app/src/main/kotlin/team/bravepeople/devevent/util/AlarmUtil.kt b/app/src/main/kotlin/team/bravepeople/devevent/util/AlarmUtil.kt index a177d6b..a1660f8 100644 --- a/app/src/main/kotlin/team/bravepeople/devevent/util/AlarmUtil.kt +++ b/app/src/main/kotlin/team/bravepeople/devevent/util/AlarmUtil.kt @@ -13,9 +13,9 @@ import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent -import java.util.Calendar import team.bravepeople.devevent.receiver.EventReloadReceiver import team.bravepeople.devevent.service.BackgroundService +import java.util.Calendar object AlarmUtil { diff --git a/build.gradle.kts b/build.gradle.kts index 4db5a87..cc1cf4e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,6 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:${Versions.Essential.Gradle}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Essential.Kotlin}") - // classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.Essential.Kotlin}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.Hilt.Master}") } } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index d54375f..c8b96e3 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -14,8 +14,8 @@ object Application { const val targetSdk = 30 const val compileSdk = 30 const val jvmTarget = "1.8" - const val versionCode = 8 - const val versionName = "1.0.3" + const val versionCode = 9 + const val versionName = "1.0.4" val targetCompat = JavaVersion.VERSION_11 val sourceCompat = JavaVersion.VERSION_11 @@ -24,24 +24,21 @@ object Application { object Versions { object Essential { const val Kotlin = "1.5.10" // todo: 1.5.20 - const val Gradle = "7.1.0-alpha03" + const val Gradle = "7.1.0-alpha05" const val CoreKtx = "1.6.0" const val Coroutines = "1.5.1" } object Ui { const val SwipeToRefresh = "0.13.0" - const val Glide = "4.12.0" const val Browser = "1.3.0" const val ConstraintLayout = "1.0.0-alpha08" + const val FancyBottomBar = "1.0.0" } object Util { const val CrashReporter = "1.1.0" - // const val Gson = "2.8.7" - // const val SerializationJson = "1.2.1" const val CheckDependencyUpdates = "1.4.0" - // const val SerializationConverter = "0.8.0" } object Network { @@ -54,8 +51,6 @@ object Versions { object Hilt { const val Master = "2.37" - const val ViewModel = "1.0.0-alpha03" - const val ViewModelCompiler = "1.0.0" } object Compose { @@ -85,17 +80,14 @@ object Dependencies { val ui = listOf( "androidx.browser:browser:${Versions.Ui.Browser}", - "com.github.bumptech.glide:glide:${Versions.Ui.Glide}", "androidx.constraintlayout:constraintlayout-compose:${Versions.Ui.ConstraintLayout}", - "com.google.accompanist:accompanist-swiperefresh:${Versions.Ui.SwipeToRefresh}" + "com.google.accompanist:accompanist-swiperefresh:${Versions.Ui.SwipeToRefresh}", + "io.github.jisungbin:fancybottombar:${Versions.Ui.FancyBottomBar}" ) val util = listOf( "com.balsikandar.android:crashreporter:${Versions.Util.CrashReporter}", - // "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.Util.SerializationJson}", - "com.squareup.retrofit2:converter-gson:${Versions.Network.Retrofit}", - // "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:${Versions.Util.SerializationConverter}", - // "com.google.code.gson:gson:${Versions.Util.Gson}" + "com.squareup.retrofit2:converter-gson:${Versions.Network.Retrofit}" ) val room = listOf( @@ -104,8 +96,7 @@ object Dependencies { ) val hilt = listOf( - "com.google.dagger:hilt-android:${Versions.Hilt.Master}", - "androidx.hilt:hilt-lifecycle-viewmodel:${Versions.Hilt.ViewModel}" + "com.google.dagger:hilt-android:${Versions.Hilt.Master}" ) val compose = listOf( @@ -119,8 +110,6 @@ object Dependencies { val compiler = listOf( "androidx.room:room-compiler:${Versions.Jetpack.Room}", - "com.github.bumptech.glide:compiler:${Versions.Ui.Glide}", - "com.google.dagger:hilt-android-compiler:${Versions.Hilt.Master}", - "androidx.hilt:hilt-compiler:${Versions.Hilt.ViewModelCompiler}" + "com.google.dagger:hilt-android-compiler:${Versions.Hilt.Master}" ) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d657efc..39fa653 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index b13e486..73cf425 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,4 +8,4 @@ */ rootProject.name = "DevEvent" -include(":app") \ No newline at end of file +include(":app")