From 8b995afb11372f886dc18f1a2d1011ba34f260ad Mon Sep 17 00:00:00 2001
From: Choi SeongHoon <108349655+SeongHoonC@users.noreply.github.com>
Date: Sat, 18 May 2024 19:53:11 +0900
Subject: [PATCH] =?UTF-8?q?[AN/USER]=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
=?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=84=A0=ED=83=9D=20=EC=97=85?=
=?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=A3=B0=20=EC=B6=94=EA=B0=80=20?=
=?UTF-8?q?(#955)=20(#977)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* feat: 상세 배경 dimmed 60 으로 올린다
* feat: 소셜 미디어 아이콘을 앱의 res 로 변경한다
* feat: add school image & background image
* feat: 상세 페에지 이름 길이 두 줄 대응
* feat(FestivalList): 텍스트 높이를 고정한다
* fix: 최근 검색어 전체 삭제 컬러 수정
* feat: RecyclerView 애니메이션 제거
* feat: Default user profile 변경
* feat: dim 60% 로 변경
* feat: 축제 상세 공연 목록을 4 줄 GridLayoutManager 로 변경한다.
* feat: 축제 공연 테두리 굵기를 0.2 로 줄인다
* feat: 아티스트에 둥근 테두리 추가
* feat: 아직 라인업이 공개되지 않았어요 메세지 추가
* feat: 바텀 네비게이션 전환 애니메이션 삭제
* feat: 선택 업데이트 요청 버전만 선택 업데이트 창을 띄운다
* style: ktlint check
* refactor: naming convention
* chore: Update App version to 2.0.4(13)
---
android/festago/app/build.gradle.kts | 4 +-
.../data/dto/school/SocialMediaResponse.kt | 18 ++-
.../dto/schooldetail/SchoolInfoResponse.kt | 2 +-
.../data/repository/FakeArtistRepository.kt | 5 +-
.../festago/data/repository/FakeFestivals.kt | 5 +-
.../festago/data/repository/FakeSchool.kt | 5 +-
.../domain/model/social/SocialMedia.kt | 2 +-
.../domain/model/social/SocialMediaType.kt | 9 ++
.../ui/artistdetail/ArtistDetailFragment.kt | 13 ++-
.../ArtistDetailFestivalViewHolder.kt | 1 +
.../festivaldetail/FestivalDetailFragment.kt | 15 ++-
.../adapter/stage/StageViewHolder.kt | 1 +
.../adapater/FestivalBookmarkViewHolder.kt | 1 +
.../FestivalListFestivalViewHolder.kt | 1 +
.../SchoolDetailFestivalViewHolder.kt | 1 +
.../ui/schooldetail/SchoolDetailFragment.kt | 16 ++-
.../presentation/ui/search/SearchFragment.kt | 1 +
.../FestivalSearchViewHolder.kt | 1 +
.../presentation/ui/splash/SplashActivity.kt | 20 +++-
.../res/animator/nav_default_enter_anim.xml | 4 +
.../res/animator/nav_default_exit_anim.xml | 4 +
.../animator/nav_default_pop_enter_anim.xml | 4 +
.../animator/nav_default_pop_exit_anim.xml | 4 +
.../main/res/drawable/bg_artist_stroke.xml | 7 ++
.../drawable/bg_festival_list_festival.xml | 11 +-
.../src/main/res/drawable/ic_facebook.xml | 16 +++
.../src/main/res/drawable/ic_instagram.xml | 104 ++++++++++++++++++
...efault.xml => ic_user_profile_default.xml} | 2 +-
.../src/main/res/drawable/ic_x.xml | 9 ++
.../src/main/res/drawable/ic_youtube.xml | 14 +++
.../main/res/drawable/img_default_school.png | Bin 0 -> 7446 bytes
.../res/drawable/img_school_background.png | Bin 0 -> 317881 bytes
.../res/layout/fragment_artist_detail.xml | 11 +-
.../res/layout/fragment_festival_detail.xml | 2 +-
.../src/main/res/layout/fragment_my_page.xml | 9 +-
.../res/layout/fragment_school_detail.xml | 16 +--
.../src/main/res/layout/fragment_search.xml | 1 +
.../main/res/layout/item_artist_bookmark.xml | 9 +-
.../res/layout/item_artist_detail_artist.xml | 7 +-
.../layout/item_artist_detail_festival.xml | 15 +++
.../res/layout/item_festival_bookmark.xml | 15 +++
.../layout/item_festival_bookmark_artist.xml | 5 +
.../res/layout/item_festival_detail_stage.xml | 6 +-
.../item_festival_detail_stage_artist.xml | 7 +-
.../res/layout/item_festival_list_artist.xml | 5 +
.../layout/item_festival_list_festival.xml | 15 +++
.../res/layout/item_festival_list_popular.xml | 13 ++-
.../src/main/res/layout/item_media.xml | 8 --
.../res/layout/item_school_detail_artist.xml | 5 +
.../layout/item_school_detail_festival.xml | 14 +++
.../main/res/layout/item_search_festival.xml | 14 +++
.../layout/item_search_festival_artist.xml | 5 +
.../src/main/res/values/strings.xml | 3 +
53 files changed, 420 insertions(+), 65 deletions(-)
create mode 100644 android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMediaType.kt
create mode 100644 android/festago/presentation/src/main/res/animator/nav_default_enter_anim.xml
create mode 100644 android/festago/presentation/src/main/res/animator/nav_default_exit_anim.xml
create mode 100644 android/festago/presentation/src/main/res/animator/nav_default_pop_enter_anim.xml
create mode 100644 android/festago/presentation/src/main/res/animator/nav_default_pop_exit_anim.xml
create mode 100644 android/festago/presentation/src/main/res/drawable/bg_artist_stroke.xml
create mode 100644 android/festago/presentation/src/main/res/drawable/ic_facebook.xml
create mode 100644 android/festago/presentation/src/main/res/drawable/ic_instagram.xml
rename android/festago/presentation/src/main/res/drawable/{ic_profile_default.xml => ic_user_profile_default.xml} (66%)
create mode 100644 android/festago/presentation/src/main/res/drawable/ic_x.xml
create mode 100644 android/festago/presentation/src/main/res/drawable/ic_youtube.xml
create mode 100644 android/festago/presentation/src/main/res/drawable/img_default_school.png
create mode 100644 android/festago/presentation/src/main/res/drawable/img_school_background.png
diff --git a/android/festago/app/build.gradle.kts b/android/festago/app/build.gradle.kts
index cce1cf482..b2d2820e7 100644
--- a/android/festago/app/build.gradle.kts
+++ b/android/festago/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
applicationId = "com.festago.festago"
minSdk = 28
targetSdk = 34
- versionCode = 12
- versionName = "2.0.3"
+ versionCode = 13
+ versionName = "2.0.4"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/android/festago/data/src/main/java/com/festago/festago/data/dto/school/SocialMediaResponse.kt b/android/festago/data/src/main/java/com/festago/festago/data/dto/school/SocialMediaResponse.kt
index 412704746..1fb0650fb 100644
--- a/android/festago/data/src/main/java/com/festago/festago/data/dto/school/SocialMediaResponse.kt
+++ b/android/festago/data/src/main/java/com/festago/festago/data/dto/school/SocialMediaResponse.kt
@@ -1,6 +1,7 @@
package com.festago.festago.data.dto.school
import com.festago.festago.domain.model.social.SocialMedia
+import com.festago.festago.domain.model.social.SocialMediaType
import kotlinx.serialization.Serializable
@Serializable
@@ -10,10 +11,15 @@ data class SocialMediaResponse(
val logoUrl: String,
val url: String,
) {
- fun toDomain(): SocialMedia = SocialMedia(
- type = type,
- name = name,
- logoUrl = logoUrl,
- url = url,
- )
+ fun toDomain(): SocialMedia {
+ val type = when (this.type) {
+ "FACEBOOK" -> SocialMediaType.FACEBOOK
+ "INSTAGRAM" -> SocialMediaType.INSTAGRAM
+ "YOUTUBE" -> SocialMediaType.YOUTUBE
+ "X" -> SocialMediaType.X
+ else -> SocialMediaType.NONE
+ }
+
+ return SocialMedia(type = type, name = name, logoUrl = logoUrl, url = url)
+ }
}
diff --git a/android/festago/data/src/main/java/com/festago/festago/data/dto/schooldetail/SchoolInfoResponse.kt b/android/festago/data/src/main/java/com/festago/festago/data/dto/schooldetail/SchoolInfoResponse.kt
index cdc7d51a0..1f0d061be 100644
--- a/android/festago/data/src/main/java/com/festago/festago/data/dto/schooldetail/SchoolInfoResponse.kt
+++ b/android/festago/data/src/main/java/com/festago/festago/data/dto/schooldetail/SchoolInfoResponse.kt
@@ -17,6 +17,6 @@ data class SchoolInfoResponse(
schoolName = name ?: "",
logoUrl = logoUrl ?: "",
backgroundUrl = backgroundImageUrl ?: "",
- socialMedia = socialMedias.map { it.toDomain() },
+ socialMedia = socialMedias.map { it.toDomain() }
)
}
diff --git a/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeArtistRepository.kt b/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeArtistRepository.kt
index 15dbc1f39..e704cb514 100644
--- a/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeArtistRepository.kt
+++ b/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeArtistRepository.kt
@@ -6,6 +6,7 @@ import com.festago.festago.domain.model.festival.Festival
import com.festago.festago.domain.model.festival.FestivalsPage
import com.festago.festago.domain.model.school.School
import com.festago.festago.domain.model.social.SocialMedia
+import com.festago.festago.domain.model.social.SocialMediaType
import com.festago.festago.domain.repository.ArtistRepository
import java.time.LocalDate
import javax.inject.Inject
@@ -22,13 +23,13 @@ class FakeArtistRepository @Inject constructor() : ArtistRepository {
"https://static.wikia.nocookie.net/witchers/images/d/d9/New_Jeans_Cover.png/revision/latest?cb=20220801091438",
listOf(
SocialMedia(
- "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a5/Instagram_icon.png/1200px-Instagram_icon.png?20200512141346",
+ SocialMediaType.INSTAGRAM,
"공식 인스타그램",
"https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Instagram_logo_2016.svg/264px-Instagram_logo_2016.svg.png",
"https://www.instagram.com/newjeans_official/",
),
SocialMedia(
- "https://upload.wikimedia.org/wikipedia/commons/thumb/c/ce/X_logo_2023.svg/600px-X_logo_2023.svg.png?20230819000805",
+ SocialMediaType.INSTAGRAM,
"공식 엑스",
"https://upload.wikimedia.org/wikipedia/commons/thumb/c/ce/X_logo_2023.svg/531px-X_logo_2023.svg.png",
"https://twitter.com/NewJeans_ADOR",
diff --git a/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeFestivals.kt b/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeFestivals.kt
index 73c537172..02d73c3a3 100644
--- a/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeFestivals.kt
+++ b/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeFestivals.kt
@@ -5,6 +5,7 @@ import com.festago.festago.domain.model.festival.Festival
import com.festago.festago.domain.model.festival.FestivalDetail
import com.festago.festago.domain.model.school.School
import com.festago.festago.domain.model.social.SocialMedia
+import com.festago.festago.domain.model.social.SocialMediaType
import com.festago.festago.domain.model.stage.Stage
import java.time.LocalDate
import java.time.LocalDateTime
@@ -20,13 +21,13 @@ object FakeFestivals {
school = School(id = 2L, name = "부경대학교", imageUrl = ""),
socialMedias = listOf(
SocialMedia(
- type = "INSTAGRAM",
+ type = SocialMediaType.INSTAGRAM,
name = "총학생회 인스타그램",
logoUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Instagram_logo_2016.svg/2048px-Instagram_logo_2016.svg.png",
url = "https://www.instagram.com/25th_solution/",
),
SocialMedia(
- type = "FACEBOOK",
+ type = SocialMediaType.FACEBOOK,
name = "총학생회 페이스북",
logoUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/Facebook_f_logo_%282019%29.svg/1200px-Facebook_f_logo_%282019%29.svg.png",
url = "https://www.facebook.com/23rdemotion/",
diff --git a/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeSchool.kt b/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeSchool.kt
index cfa9f1ea8..f26d51ad3 100644
--- a/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeSchool.kt
+++ b/android/festago/data/src/main/java/com/festago/festago/data/repository/FakeSchool.kt
@@ -2,6 +2,7 @@ package com.festago.festago.data.repository
import com.festago.festago.domain.model.school.SchoolInfo
import com.festago.festago.domain.model.social.SocialMedia
+import com.festago.festago.domain.model.social.SocialMediaType
object FakeSchool {
val googleSchool = SchoolInfo(
@@ -11,13 +12,13 @@ object FakeSchool {
backgroundUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/Google_2015_logo.svg/1200px-Google_2015_logo.svg.png",
socialMedia = listOf(
SocialMedia(
- type = "INSTAGRAM",
+ type = SocialMediaType.INSTAGRAM,
name = "구글대학교 인스타",
logoUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Instagram_logo_2016.svg/2048px-Instagram_logo_2016.svg.png",
url = "https://www.instagram.com/",
),
SocialMedia(
- type = "INSTAGRAM",
+ type = SocialMediaType.INSTAGRAM,
name = "구글대학교 X",
logoUrl = "https://about.x.com/content/dam/about-twitter/x/brand-toolkit/logo-black.png.twimg.1920.png",
url = "https://twitter.com/?lang=en",
diff --git a/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMedia.kt b/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMedia.kt
index 64a1c76af..22e9cbed0 100644
--- a/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMedia.kt
+++ b/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMedia.kt
@@ -1,7 +1,7 @@
package com.festago.festago.domain.model.social
data class SocialMedia(
- val type: String,
+ val type: SocialMediaType,
val name: String,
val logoUrl: String,
val url: String
diff --git a/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMediaType.kt b/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMediaType.kt
new file mode 100644
index 000000000..ace6732b4
--- /dev/null
+++ b/android/festago/domain/src/main/java/com/festago/festago/domain/model/social/SocialMediaType.kt
@@ -0,0 +1,9 @@
+package com.festago.festago.domain.model.social
+
+enum class SocialMediaType {
+ FACEBOOK,
+ INSTAGRAM,
+ YOUTUBE,
+ X,
+ NONE,
+}
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailFragment.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailFragment.kt
index e68ce9103..ee3af37b7 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailFragment.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/ArtistDetailFragment.kt
@@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
+import com.festago.festago.domain.model.social.SocialMediaType
import com.festago.festago.presentation.R
import com.festago.festago.presentation.databinding.FragmentArtistDetailBinding
import com.festago.festago.presentation.databinding.ItemMediaBinding
@@ -107,13 +108,23 @@ class ArtistDetailFragment : Fragment() {
uiState.artist.artistMedia.map { media ->
with(ItemMediaBinding.inflate(layoutInflater, binding.llcArtistMedia, false)) {
- imageUrl = media.logoUrl
+ findMediaRes(media.type)
ivImage.setOnClickListener { startBrowser(media.url) }
binding.llcArtistMedia.addView(ivImage)
}
}
}
+ private fun findMediaRes(type: SocialMediaType): Int {
+ return when (type) {
+ SocialMediaType.YOUTUBE -> R.drawable.ic_youtube
+ SocialMediaType.INSTAGRAM -> R.drawable.ic_instagram
+ SocialMediaType.X -> R.drawable.ic_x
+ SocialMediaType.FACEBOOK -> R.drawable.ic_facebook
+ SocialMediaType.NONE -> R.drawable.bg_festago_default
+ }
+ }
+
private fun handleError(uiState: ArtistDetailUiState.Error) {
binding.refreshListener = { uiState.refresh(args.artist.id) }
}
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailFestivalViewHolder.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailFestivalViewHolder.kt
index 87391ae03..7a0713565 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailFestivalViewHolder.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/artistdetail/adapter/festival/ArtistDetailFestivalViewHolder.kt
@@ -23,6 +23,7 @@ class ArtistDetailFestivalViewHolder(
init {
binding.rvFestivalArtists.adapter = artistAdapter
binding.rvFestivalArtists.addItemDecoration(ArtistItemDecoration())
+ binding.rvFestivalArtists.itemAnimator = null
}
fun bind(item: FestivalItemUiState) {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailFragment.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailFragment.kt
index 4c921856b..9e9e34af9 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailFragment.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/FestivalDetailFragment.kt
@@ -14,6 +14,8 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
+import com.festago.festago.domain.model.social.SocialMedia
+import com.festago.festago.domain.model.social.SocialMediaType
import com.festago.festago.presentation.R
import com.festago.festago.presentation.databinding.FragmentFestivalDetailBinding
import com.festago.festago.presentation.databinding.ItemMediaBinding
@@ -110,13 +112,24 @@ class FestivalDetailFragment : Fragment() {
binding.llcFestivalSocialMedia.removeAllViews()
uiState.festival.socialMedias.forEach { media ->
with(ItemMediaBinding.inflate(layoutInflater, binding.llcFestivalSocialMedia, false)) {
- imageUrl = media.logoUrl
+ ivImage.setImageResource(findMediaRes(media))
ivImage.setOnClickListener { startBrowser(media.url) }
binding.llcFestivalSocialMedia.addView(ivImage)
}
}
}
+ private fun findMediaRes(media: SocialMedia): Int {
+ val res = when (media.type) {
+ SocialMediaType.INSTAGRAM -> R.drawable.ic_instagram
+ SocialMediaType.FACEBOOK -> R.drawable.ic_facebook
+ SocialMediaType.YOUTUBE -> R.drawable.ic_youtube
+ SocialMediaType.X -> R.drawable.ic_x
+ else -> R.drawable.bg_festago_default
+ }
+ return res
+ }
+
private fun handleError(uiState: FestivalDetailUiState.Error) {
binding.refreshListener = { uiState.refresh(args.festival.id) }
}
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/adapter/stage/StageViewHolder.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/adapter/stage/StageViewHolder.kt
index f64b5a254..c24844964 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/adapter/stage/StageViewHolder.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/festivaldetail/adapter/stage/StageViewHolder.kt
@@ -15,6 +15,7 @@ class StageViewHolder(
init {
binding.rvStageArtists.adapter = artistAdapter
+ binding.rvStageArtists.itemAnimator = null
}
fun bind(item: StageItemUiState) {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/bookmarklist/festivalbookmark/adapater/FestivalBookmarkViewHolder.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/bookmarklist/festivalbookmark/adapater/FestivalBookmarkViewHolder.kt
index 1aa38440d..718c2e7a9 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/bookmarklist/festivalbookmark/adapater/FestivalBookmarkViewHolder.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/bookmarklist/festivalbookmark/adapater/FestivalBookmarkViewHolder.kt
@@ -24,6 +24,7 @@ class FestivalBookmarkViewHolder(
init {
binding.rvFestivalArtists.adapter = artistAdapter
binding.rvFestivalArtists.addItemDecoration(ArtistItemDecoration())
+ binding.rvFestivalArtists.itemAnimator = null
}
fun bind(item: FestivalBookmarkItemUiState) {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/festival/FestivalListFestivalViewHolder.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/festival/FestivalListFestivalViewHolder.kt
index 551acee41..5620b4db4 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/festival/FestivalListFestivalViewHolder.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/home/festivallist/festival/FestivalListFestivalViewHolder.kt
@@ -26,6 +26,7 @@ class FestivalListFestivalViewHolder(
init {
binding.rvFestivalArtists.adapter = artistAdapter
binding.rvFestivalArtists.addItemDecoration(ArtistItemDecoration())
+ binding.rvFestivalArtists.itemAnimator = null
}
fun bind(item: FestivalItemUiState) {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFestivalViewHolder.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFestivalViewHolder.kt
index 17b7ad7a4..66fb4407d 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFestivalViewHolder.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFestivalViewHolder.kt
@@ -22,6 +22,7 @@ class SchoolDetailFestivalViewHolder(
init {
binding.rvFestivalArtists.adapter = artistAdapter
binding.rvFestivalArtists.addItemDecoration(ArtistItemDecoration())
+ binding.rvFestivalArtists.itemAnimator = null
}
fun bind(item: FestivalItemUiState) {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFragment.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFragment.kt
index e67a22875..530e5d158 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFragment.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/schooldetail/SchoolDetailFragment.kt
@@ -11,6 +11,8 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
+import com.festago.festago.domain.model.social.SocialMedia
+import com.festago.festago.domain.model.social.SocialMediaType
import com.festago.festago.presentation.R
import com.festago.festago.presentation.databinding.FragmentSchoolDetailBinding
import com.festago.festago.presentation.databinding.ItemMediaBinding
@@ -107,13 +109,25 @@ class SchoolDetailFragment : Fragment() {
uiState.schoolInfo.socialMedia.forEach { media ->
with(ItemMediaBinding.inflate(layoutInflater, binding.llcSchoolSocialMedia, false)) {
- imageUrl = media.logoUrl
+ if (media.type == SocialMediaType.NONE) return@with
+ ivImage.setImageResource(findMediaRes(media))
ivImage.setOnClickListener { startBrowser(media.url) }
binding.llcSchoolSocialMedia.addView(ivImage)
}
}
}
+ private fun findMediaRes(media: SocialMedia): Int {
+ val res = when (media.type) {
+ SocialMediaType.INSTAGRAM -> R.drawable.ic_instagram
+ SocialMediaType.FACEBOOK -> R.drawable.ic_facebook
+ SocialMediaType.YOUTUBE -> R.drawable.ic_youtube
+ SocialMediaType.X -> R.drawable.ic_x
+ else -> R.drawable.bg_festago_default
+ }
+ return res
+ }
+
private fun handleError(uiState: SchoolDetailUiState.Error) {
binding.refreshListener = { uiState.refresh(args.school.id) }
}
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/SearchFragment.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/SearchFragment.kt
index c0aff61d8..21807d625 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/SearchFragment.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/SearchFragment.kt
@@ -119,6 +119,7 @@ class SearchFragment : Fragment() {
private fun initRecyclerView() {
recentSearchAdapter = RecentSearchAdapter()
binding.rvRecentSearch.adapter = recentSearchAdapter
+ binding.rvRecentSearch.itemAnimator = null
}
private fun initBack() {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/festivalsearch/FestivalSearchViewHolder.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/festivalsearch/FestivalSearchViewHolder.kt
index 8e7091063..92cd60565 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/festivalsearch/FestivalSearchViewHolder.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/search/festivalsearch/FestivalSearchViewHolder.kt
@@ -24,6 +24,7 @@ class FestivalSearchViewHolder(
init {
binding.rvFestivalArtists.adapter = artistAdapter
binding.rvFestivalArtists.addItemDecoration(ArtistItemDecoration())
+ binding.rvFestivalArtists.itemAnimator = null
}
fun bind(item: FestivalSearchItemUiState) {
diff --git a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/splash/SplashActivity.kt b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/splash/SplashActivity.kt
index 732692ddf..1f3da7b10 100644
--- a/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/splash/SplashActivity.kt
+++ b/android/festago/presentation/src/main/java/com/festago/festago/presentation/ui/splash/SplashActivity.kt
@@ -97,14 +97,27 @@ class SplashActivity : ComponentActivity() {
}
private fun requestUpdate(latestVersion: Long) {
- val isForceUpdateVersion = firebaseRemoteConfig.getBoolean(KEY_FORCE_UPDATE_REQUIRED)
val latestVersionDescription =
firebaseRemoteConfig.getString(KEY_LATEST_VERSION_DESCRIPTION)
+
+ if (checkForceUpdate(latestVersionDescription)) return
+ checkOptionalUpdate(latestVersion, latestVersionDescription)
+ }
+
+ private fun checkForceUpdate(latestVersionDescription: String): Boolean {
+ val isForceUpdateVersion = firebaseRemoteConfig.getBoolean(KEY_FORCE_UPDATE_REQUIRED)
if (isForceUpdateVersion) {
requestForceUpdate(message = latestVersionDescription)
- return
+ return true
+ }
+ return false
+ }
+
+ private fun checkOptionalUpdate(latestVersion: Long, latestVersionDescription: String) {
+ val isOptionalUpdateVersion = firebaseRemoteConfig.getBoolean(KEY_OPTIONAL_UPDATE_REQUIRED)
+ if (isOptionalUpdateVersion) {
+ requestOptionalUpdate(latestVersion = latestVersion, message = latestVersionDescription)
}
- requestOptionalUpdate(latestVersion = latestVersion, message = latestVersionDescription)
}
private fun requestForceUpdate(message: String) {
@@ -188,6 +201,7 @@ class SplashActivity : ComponentActivity() {
private const val DEBUG_REMOTE_CONFIG_FETCH_INTERVAL = 0L
private const val RELEASE_REMOTE_CONFIG_FETCH_INTERVAL = 3600L
private const val KEY_FORCE_UPDATE_REQUIRED = "FORCE_UPDATE_REQUIRED"
+ private const val KEY_OPTIONAL_UPDATE_REQUIRED = "OPTIONAL_UPDATE_REQUIRED"
private const val KEY_LATEST_VERSION = "LATEST_VERSION"
private const val KEY_LATEST_VERSION_DESCRIPTION = "LATEST_VERSION_DESCRIPTION"
}
diff --git a/android/festago/presentation/src/main/res/animator/nav_default_enter_anim.xml b/android/festago/presentation/src/main/res/animator/nav_default_enter_anim.xml
new file mode 100644
index 000000000..7846f52e8
--- /dev/null
+++ b/android/festago/presentation/src/main/res/animator/nav_default_enter_anim.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/android/festago/presentation/src/main/res/animator/nav_default_exit_anim.xml b/android/festago/presentation/src/main/res/animator/nav_default_exit_anim.xml
new file mode 100644
index 000000000..7846f52e8
--- /dev/null
+++ b/android/festago/presentation/src/main/res/animator/nav_default_exit_anim.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/android/festago/presentation/src/main/res/animator/nav_default_pop_enter_anim.xml b/android/festago/presentation/src/main/res/animator/nav_default_pop_enter_anim.xml
new file mode 100644
index 000000000..7846f52e8
--- /dev/null
+++ b/android/festago/presentation/src/main/res/animator/nav_default_pop_enter_anim.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/android/festago/presentation/src/main/res/animator/nav_default_pop_exit_anim.xml b/android/festago/presentation/src/main/res/animator/nav_default_pop_exit_anim.xml
new file mode 100644
index 000000000..7846f52e8
--- /dev/null
+++ b/android/festago/presentation/src/main/res/animator/nav_default_pop_exit_anim.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/android/festago/presentation/src/main/res/drawable/bg_artist_stroke.xml b/android/festago/presentation/src/main/res/drawable/bg_artist_stroke.xml
new file mode 100644
index 000000000..2daa4ea8d
--- /dev/null
+++ b/android/festago/presentation/src/main/res/drawable/bg_artist_stroke.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/android/festago/presentation/src/main/res/drawable/bg_festival_list_festival.xml b/android/festago/presentation/src/main/res/drawable/bg_festival_list_festival.xml
index fc05ec76c..90c660f54 100644
--- a/android/festago/presentation/src/main/res/drawable/bg_festival_list_festival.xml
+++ b/android/festago/presentation/src/main/res/drawable/bg_festival_list_festival.xml
@@ -1,8 +1,7 @@
-
+
-
-
\ No newline at end of file
+ android:width="0.2dp"
+ android:color="@color/background_gray_03" />
+
+
diff --git a/android/festago/presentation/src/main/res/drawable/ic_facebook.xml b/android/festago/presentation/src/main/res/drawable/ic_facebook.xml
new file mode 100644
index 000000000..5a8f232ef
--- /dev/null
+++ b/android/festago/presentation/src/main/res/drawable/ic_facebook.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/android/festago/presentation/src/main/res/drawable/ic_instagram.xml b/android/festago/presentation/src/main/res/drawable/ic_instagram.xml
new file mode 100644
index 000000000..d7948a451
--- /dev/null
+++ b/android/festago/presentation/src/main/res/drawable/ic_instagram.xml
@@ -0,0 +1,104 @@
+
+
+
+
+ -EIEcM)l3uB
za-jPV!8QF$X}#e%wJ|>Q32#GrW3b#-rzK5{2~)dWgAH7a=2X|@?#`C1W9@HZ53GGD
zd=|~UO=X9<$2BWKXdAXqQ+C@yxzGd|@Gm}miuVK6g?aG7)911aYs5Ey?&|>57jkjg
z)s4Rf0_6mt^g(-9Hro-D=>&W4HI#oSf31#MZZ0o++6#?Fq%K6)*L?+NWxOkuf(lq(
z7G2VE@E+qhDlsE(aGyx`ks38Td42@>jk(O2h2h{@e&g4FUCL=i{rHF;sMH#YSZMBM
zR+?pM%k$G?`NlWi$7eGrHx)3^SSw8y0BXyNFHSU@htBWmOj$%tVWt?PWWY)s!|K^qzEfO)?h;p9ZiPKaiw8
zMRB4sGhQq*fNmB3;*31C*9uiBPcsGC?xSqE1FgPY-VfPeYnp-Lz%#=H#V&rrf(Q%c
zyMtiK>fkeYJ>-yBVDEz(A6gBq|
zgfJ&#s-`sp3;u*Ec(`eJ4S`IuW<7A(4}2$N$%@i6>+DRca``Tq=83)x&>Q&Zjc&bsV^!P;oo
zH4{OTRklK1);Ie4CWRjlPKvwvX2^-B;*@nXQ>17Y<_mnWbT)=@uIb%f5Q0VwzZaY?{Gd0=!hfzO=D9T=p)|
zX!=%H0j^yV6*0g!z{dIP_=V*LhLAfvc_ky5syTP!5T;`;tjJQ)HIqok=^ViPd!PJB
zh4JuurqR_D?3_ys>RLD#fEmVpJebMXVD|px#pfFN&GO?ERA*OR2=<;bdsMEti1{yP
zJA+LoFr(LDx@0OgmU#^Tt7r-z^vANhzlnEcHMogfoL|cx{$>Ep4D+6IJqV^IIE(&1
zu0JDJ{modR0A|K77@Iq;l=`Z_JOB1U
zrm`}={(FD;(Toe+jXsKHdBzs
z;HGlLd@^|*nOGHsB?IJIm6k3lG#RU@E6x}rO&zC%O`uHk`sS95>8D(x|9%JNyilz-
z5fqwfN>lRy&o1lz+3qTUSg&gp+NN_Cc@9-}IvZ=yBR4b)!U>dRrf+?K&64kU1-6@?
z_j>~i9L9fS21i)GySpG2b{YU7ksQ3f)VaZeCHp&@y1rN;ZUlhWnY5)|?f__(bZwKJ
zG=Ia$G6c8{i_8w)qT2PKVB!ojHY&vrIF1mohJ-(n8^cB+dAiYy-RL
zxXB!EQSs=5y*1Yavh{T+T*GX<)yG!{)>Uy7dmmpR%}N#n#8Fw9TK17XORy)*h0GX<
zV@=f-xf1N$aOat-C{^XF%nA2Tg7^2PJH+}Yb!hPD9!d)u38PR`K}GbsCevbWc8V7sir-vnv{>{Wb*DNYOVxp~!Ek=_&$b^GCcn~gor&v$S$
zb5rt}T>{6RC-HI$fWY;~5*zKnvd0rX4V*tO%k8}4Zc%KvfjkfPT)VUqk-y$tnrMCT
zw#u8X_^N%CWU}SH$VN}z2s)&WO|m)
zE{qBaVVYUi#If-{yPUVoYS1KIxBl1v#s5h2k1{zweNkDl==A(jbEzI2z%+yfG@XZ<
zXOfH_1(H@CgkTOx<)sGqQgsIpGI~8TBRDeyeb`J;+H}$gaOPWe;5!%67R6bL3KY2d
zR)-3p)z8|Q^9DejlM?`}BSz1^G80EgrkvYytW}W+7|2#{z-+n=c3^vRP4iRkfvs#o
zu&p=u6j=tt{&$yFR~C|QJN{WkR|x+d
zKVt-c=C|ZDNUuG4-zJUDmBeY}WlKfm?(@NChw^BD9ZW<+j=*4UZf{9Y4`F%);G7I(
zG`*JJ{q#rjOYePC)+i7Yu6wVD_wiR|olAmoQ~|K2^VJU9RlPX>w3CjukRvw0)YG-5RMuYoOR
z+1Tse!U4q~Gv9bYqC!9d1y}Q_Ex0k(!PVqa%jfF<&#cn?;_xhSHGO5F(H>ufj$h;PbA&wqeEnkgeeri{L>T(flmrt`C&
zW~A5!7^U08csP`2pMRkYB9CX!UPEEp!X{LfAN=rRdHwnX?9W%_<*NfNC+iDbNC6Ca
za)XSNIJS&{)xXnc-I+Y-If*qYpx%MuY(GkXj>|U$@m#khNn`=M7
z20db-ku$L3k=(tz5B7Oqe*X{tKsMI4rCn{y^T`Vh{8QgQ6?md)=-4Jp-$u8D)cMky
zn;97q7ILUoOKNoqoOOY2L0W7@-FZw<(}jZtRhC?N#0R(}Y5}nnP+;AsmcFkC1?}|m
zS~fP%7@%C=eNq6Rj-Q0fWl6Fz>dF
zzcKEX9yQSj37S7Ci&;Loi+R1)oJgx?0i(e@&c>fvN-T(QdDCA8&;GN*ciC(<>saO{
zpwdvBHxy*LFDfy!O*k;C1r?=k9}3I)KtB1=6Ia%q=|nN-
zF~+qTbCYAN`vW;Ry_Qma9SW5d`XNxI!bjJM3R6ikKs;~?j4UhR9Vjs*KaMUgHHeo4
z5@q83d;7AD&$qDe9b<0q+_@uTtY^9tJ$(F7{==_6#$1`pKl|jV0)OU4r<>mh%4`*~
zgYUtNMw__b>!WkEZcQg<*&uo{L%EYsX*PV2dzR{uf!YJKpBcM4>zI$1XY%yZrwUNw
zIL+peR?ke$3dG%vSv3}r5%j-iRYdj^l~ZnvocA@X{|$iblj92|EVy5oV!AL{pz#j0
zjOO#qD}9*+3kp8V4w&ZO`Z<;s=A4L!znOaj|9=SpSP)>=5&n+Bn}ML-y=nD(-M5#J
z!}8(BU9I^}VTr=r`eOdX4oojKEzQSBJUAs8G|%R=&nRJvL}+qfY+YHZHpzgcmxZa*
za(!wy&3X|9+1igZ$kQ?qMXoZc2et7c$;ib(-GOuPD}gDuMW7ov{FgJ>w#Geh_T6SI
zc#^ftoos)5pK4b;#Va;`K7>yGdu7loHnB^hVJ=2-juFH$@+4lEQid<8l>;Gwn$1Wa
zw{~^Gf9E@2cM~Vl&eig==okX+-~OFHQ~@xD$&{(AChFs7g$_(8^TiDmC(f7J{Lq7J
z0{cNxEh81HC{##z?I&6oS*jMcDRD3AQ;+CY8Cg+*&`mP+p-Gu6Kh@NEeQZj{r-u@J
zeBfYYU;v%Ikubr~_qL9oHEcTcmED1szKfsD%?*I3$r-rgb=i2A$
zP9xI8=FP9wjbk>HKmO=IzV_93G?n3C0Fyc1m*abMc&NUuO(+;IPrK6IU(-$d0Bj*m
zZo3;hV5%>bxnX-r@Py$EW>N--&E)=0n=nIu|C7&b(+$Bs4;J$7yYI`z1+x_lv{Wnu
zm1v4)dzagh*
zymtVFse|#FYK6NBT|dCWmNX@qfdzuhc6&1elR;54FPOkQ;}*|pbz%Nn0fW6IU4Xt9
zuU@E2QM*-BlX|IKGY}H807h3P@jZZ?Py;eogIQCNFAT_qgb$J417Zqjt!3NH3s>&&S`kc`9zx(xMrd=1nv#_rD`Yn0!
z@&M<}wO=WZr?8T|eDPXYO~!_3Wkmq62|xtT0;q-tE)?8
zMhWmHkT28uOe^Ghu*K(FY3Rfi>{;kI68KSpr~hyo+jmsLb8DXgiFrKLY*Td0F!Me>
zpNnJ3XQZ`t1>3$y6EUn4PzdR+Gl1OEOcROq%>dx`|Mvg>ub}v}WD|-q_n;Pj+O4L7
zZI-?sL#bkU`|0&mY9J{}NlmLru7lXm~2Fh%98ig#X9YZ`+GneMP0F|$%hvrREi`s8%3
z{-}%r2wX|~e1r6exd6cYvGi*mc<(Q>06wp%rOPaaq|0F3o#P8i`S%YB&tA&Hu{yUi
z2GshKmXMn)fy|j(gxK2BbaDj+)W3U@l~9xnBzmBj6)bV*E3xSVgmrB5
z{!CpbrG7u~sUqEVlo_5uPBLHUMFyPxS~WS4yMO6E;DTp;n=*yb0b6ZLDB0Xw?#}|K
z#dArRX8EwwTq);&bcKrwRhW4p@slq{UR1JDb!js+mpY84pxU)h92rvjh4+6>hG0yX
z_KGQOSfrpgWN;P0G0a1(OJA?J#QfNR7#ZGzAg`CPXd{4<3I%%^45fNeIbj~V!7a%d
z7!fWY-H_DR1dU}f{t}oNnAA;Ji7tdv$%0mF(#N{Rg<7Ct?&`rCg-`$25Su{i)Ik^5
zDBet9U&G3^zM1fHbh#Tk9Ht!r;et6B{(ErqRS_uPhDx-!xkaIioywe^&zo9z}mx?lZp5
zSS+iHHV0#sQmE``ERszWi&XcUUZCug_v4|NZ4A>h`>>4f*E=xd0@!~4(+}}}RoMYM
zKLzW|)LUe%m=cU^&UI%f-#eVicOZbj1~dQnpFEXowMH2DBs)e{Y!23!!Ct)AX9tI1
zHD)TrtCgB&82HLN?`lDab-Rquw|C1+b
zmM($0q|l^aX_G$2Nmb_?GcJ%FBJgOpw&jr3_Np^2WB%~|eR=%~n*iA%u*lqirqEof
ztOf_|hH1ZE#(mR#WjVq)OiYXQzEqrKeK2!>3NR;I2@=E0ifhB!vQ+kyr>gB5aHG#~biCfLtkS!Fh
zUwrXG6=6DfRG|RSeEiANC$M-_6&NR&RcQmQ^0FlfiSde6!A=-
zTh|na77M^1EdUX_H;NLSTXcCaQ{n3Rb8AU|x7_!&T1zbu+;&+cf&h0DOthr{43yQR
z?<~P9f9Iy((!wiq8TQ6%cAdj|GOs5x!1!!!Hst=@EzOU8cyOUYo#_)9E7I-tErl1x
zjMl*kS?<7C;}U)@&U@;!%fQ2Ct0cYd0Bz~W&VEf^!o>O9dDq;$=rPj{+J
zPUM1-LIptFsC6!h6nrsFZfdq==d-JQVX01*=J7HFc5IT1{3ip&BQKg@wisXi%mZWl
zEWh5&#hC-Ajx!bSg>IU4bqOo0BQ$0HR0Bk}L4the>+edfbaO7|Iod!A#AwP&g;OZm
zV|jLXB26vUGm;mtUuw{GyH0C?DAO85
z1%&Kt;>vpjJ_l_MO!#ht@l0M~4nzUQHHt0vC^SG3I=3=Di&ie3yXF*o}>wUm$l?AL!oKK=M9WOdug5(8aHoRevO?CIl5+`w1>DtPnx
zSo^jGMKCC*8K`MPnYe(G&Z)pXCw6ls@hY)T_a>foO(a{)#hK~$=hW3q@NST4T0qHu
zx_JV@U6Z);)6_GblFeI#Bra8&S0eo*-QWK966F5RdVQL{u^D7UqO2&is=UVPvO;ia
zIqH|evtPfy@9apj(%Hp!@lcCUrhi!QUa_j6G3Bnsfw)*J|9j3FXK4h3+*L&hPhafC
zVH2+md-5Xd7s+%qcmLeIqZC-KY2M5GldIfPIbgy3>h<6iD0LT#Er>iY%Y5W3P&z=I
zStR`UJMtvMRFZ#Q3Zp!rQmvlN8o*yo*709a8wu20V`+|<7Hp2mJcKYAClYcgu9)L-*e^r-k2Pf!*{CY|>1%KA%YXKt{)f6i$U61=Lk(PD
zAkNj*Sj&{spKF9gJizxXZL8EjD=txZV}XSVv_;ce<*HwlF&_LdbRBE-J;Mx~Mv=Hh
zK|gPoBV(Z*NzlD8|1_9iwLW}Ee=gnerGEzS3DaDVUh3o}>qAyLP~lcmp+VCytCNwj
z-U2w=gvQ(f@ZJR2-T?4s4&g?vEUi%8h%MKkEW3pi)BC6STFz3=75%7L!K^=yMZ!FY
z(_4xR=-5?!|5yRuSk9p&Z8R#f2UhYNV_9pi$>HmB%_;ie@rETa2MDfKo0?wha(JaI
z#6N!pX8P3;gf;{>$AqvGV?q!|TXUz~(Lf&t`jH)Du3Tn8*xDjkV`hMnoP&KXQz1(z
zh)cRC>ou^|5R#`S*9!Qq!PIfHefa1teXSQSo>}BSz>~UTIM#s{4^VO!T
z2Q62>m}MKD7v5#a3o2bR7s9Vp)ar#;i_CyAU^WrR$`e?6S`6UDT<&1b
z_OALmPidJWTe^-p+y{6N$BtA$6ogQeI&HeB-N72@V{I)|rqY_UySIr3OjWTT_Ipxq
zRyA03G>nwe(M>XPn?3{B!oZa@H=jZ8^P4l!p{@aQ^#~*gJoxbbqppU)iX!R{WA>Nb
zG%QFqJYF2SEuwpFAmWNc@p}@K#2$Ut_V;5H7eDUCzm!W92Yc>75
zNB6W^L%zMU4Zs}8+3c@DiH>EvWPa=n4jppbun$gH2@`AY_2rp7dGS)ZgPvL&xQR1m
zUc1yV#Uh9_N417*xxx{2m!yetqHK4l^T%8xZEuPlE0=1RA>(68;+(9>LP;2#`Q6Ys
zEGi(Q%AxgL%6ri&1MBN37)bweVZm^?@yW{<^4q@-xyhi|&;TBl!je{Tt*EkEWA#ov
zj`O6^YO4ac)^2M)^b~ARHL~<`B<@p
zOLIvf>)eE;X|66z<^sw#Rk1eakX54@zi&$w`zhxVWz1+oAU#zaKr)XqXvoYtjL}L<
z4$N9Gsu3TKZuN6%$-3c40V#mtY))F%o{a7ER;dCgw9oU;l#wi4pU?T_V~G_nf^}K;
zNzRe1xn}S$GN}AT^J4o<98Q@u7vA)Z=V$K|oFWuP@PLRfP5OPya@pe#89hsY>hbtlrprgRP9O(uppR>vcn=7zdKTagXR
zF{!LkVijooRME*4nNx4#c))!9l(M<4xdNSOQYrmXB`bfaY+#UPsl2!cFijQx8@m@H
z0J&2IfdmLP==Axv(%Q^2((cgo-@)cr(_lve>vd??>-fC|0NAdZ$(DZEVUPzE%F1}P
zajy}~;*6GGEUaW{6xlndDTQOFRi8}rAB^VG#lN2)oI)`eD|6BU!0)WpwIU#eJKLtI
zgqTluwx)iiz41cgXkYLZ8T_=+0JX$SZrJFruO}+#xlTEDWU?9H$&KQj
zcivH#g4c(yo#vWYj@$~FelXF@cmZ?xg9rCuy*O32rUIsffWzD)QUw(>dulcYYJn`_
z4CX_?h?6;GNoe}XRj`rP0|tfxL@=pYI@iJ!ED{l@pDE^N#2^*2ZI<_9)zrp0!#UYc
zr`qq#9>Kyxj0;$RsbN8k>tR>f5W0%cN1Mz!{rH%bv%=MCYgAbR{%!$
z)*HHc_NTGV%6oNKa4=qLb#q~&@=4boOm%4kh^g;A*4hcovs{m4kGa9$xpPN8_~3_V
z=L8#A$x1+LHieP~VNxJpTwZ9Q1qR#gZf|M|tcN@6=)0ku2Z03!rk24a$YKM$xh&PS
zYSHd_5FyY0>u=we&tP@>gAYECci;Jn{Nh*NlRx|T6FHbbd6`>&P%F*5P==1bb3W9y
z1ouq8*EDcg$8F5Z|KL}DMSk${6L}6RLK0i%22D*zg_WR~LCucwvHKd6#p;w=W*luJ
zVCC~D0~qGQ=fr8?I^Vf-xYSH)3e~{DieoR5OcCe03f#s_rdP*=)ezH}G2@B%MYNza
zen02h3`2ca&aYIn$^@zyGMKRgMY~d^Vgb2v)srA@+r2PXnM;_~ug+Riv%Jh^BhA^%
zOdMr(?*ORiPnF|rch&&FudHffz~Irgw%1bV&2TNoX)#sTlOWi2qypVHLdSweneQKE
zApT`6p-0Ss}1W+$IzhvLko~D9z($6!0Yl20AqGDZ!gA
z9;%pdBZI;pJ60_Y=MG%l4xatN^>hx!XP0BZ5AbTQ7`%yn;~drzzG-WXfEY3c6MU^v
z&)bflcawMImw)lQ^64SiYK$RW#?DVql(48(Eo5;pSjgpBSBva$4r?yt*!nbroM6fI
zFtD8Dlut(|UG+QO-D_$b57#W^g2ezi#m~9pP+lv3iIcqivP+V^h%L`k7?_Jrq5>Cd
zmuVk;b^)yW#cT|P0ekB;EEF1qmgsu%d3{MKk$JALygU@eu*}M@b!{8tiw3aB5!7ml
zV`hlJUGo(4`8+Jm1(*S3Zt)XMI!Uv$}w3Es0Rm
zPio3aG39||3inE7NYh-F8i-qwww_V)k~q!5te;Z~%8F9ja|c0~0qi8nT>^46D9h}x
zd!Ao0L4hgFKP)yScN<$`^?j4w`+9dNeord|U9hwmiLctXl*_C5>dQ2Yw*=*cw>2ip
zg5@P+k*$xYjHXHe@UWC`rmXk^Bg7uwt#)3Z1HJ!o-lg^qK6kVc6Bc_R;d13e8!c-`
z=&UbUq`#9%acb5H|Lj0y$%WM*Uzk}LJS*+7hqvm8>w3MX3mn&ZCIp$99b(jz!^N4?25o|J1nH+~>F3JI)Oxe<_BH`_Th`aw
zvIXXNv)zzgnAa%vYd}_f7C~g-ayzKDhdwHoLKm%S6KgsIi;M5h(Kjq59Dp&K032^Z
zc##dbJRibrR+071y1MXGLk2fZYN>tMKH31uF8)``%fGO6Xt}XQAc(~Afy>!1B4$n19f|iR`(|=SD
zIDRdpnp@Tf&d{HJGR3AiBtQovQ#BTrey&vJs$kQZ#*zNsHH_hKI+V{YuH-(R-3XV3
zn-_N%Xy*{~<&we%AI|VT6Krb7Q48}ck}d!+38*cMGuPe@+FQe1_=T^2O@8l(--9`}
zr9R$OfF>%B7nhf+obr9<=u4WVgbW*o&Q5HpLBhw=_WmwAAI(ioSdGt-9R+#Jddg|W9wZ^oL42G_hLw)wa;Y`!$
zQHgy1{6Oa^^G#DRINhHN-@NmV0uw~
z)5Ha7QIJz116ZNVV+JSsR?p`X&0$@wHe3*`^Uo)!aqb|=B4-$_ynU?9_FOA-ih&#g
z?Q9PVva$DNin;F9!beL`U>2N3IyYAz5H52lalxb~3#L-Mw7J7MPdR>kc%W(M@O1fu
zKlyzn6jYA5%r+iWEL3qWXJhE&bf^HgS;R{WOHeM%oKmeBOknNiI%+l=mPH7C8#Hj9
zW?gaoR*=e0L9&ee9WEe;!+>9uT|B6-Z|7cR8t(
zJV&+4!I>2zQR4x9(id|FY(wW?ZQ0c_);Gvg_vt)M^
zid%XyXeqsMDD2=l+;lY@tL#iCuBuDq5q)g_!_7uT)13tg(=<&X6c!qo#`Hb>*=W|5
z6f*z&JTbsW2AIj%xq(b3U|_H*GJO-H`dINE_H@HINOMLTiuK@b^Qb^#f=6
z#bTcTtTEdN^IFp9yAL*#f3x_@cpU5BjHsuep~+h{qr}ptSgrIxKcnM+=m(1bg_>Pd
z*{zU_u$o>1Wv&-a&|5i4D;B`uN1xYQCo}qSIlar#(43%rCYc8^
zo&=r@M2gFif=Q;nqK_m65rqtyT1NNtx`gZ_GYODQz*s%LvoBY3u#IPDCZNdF({B^t
za6C*EOc0DWJE5BMTiA%d@|DN(;U}L%Fq8nQ`)c~5*_#Znrj^6r7I7|S(#H5OPp0~)
zmK)kG`fpxdeWr_@ezeS3kj4{boe7#LC>a@kadDwwfuN7f()#*_R?xfZp35aR9+$OI
z0X@xm1pnzgR`ypjwrF0&KvUx-aYcbM{pZF5<`*96HH_S+AQ$b^P!+1QIP0CzttcR~
z1v5>?n(3udttt5Kc1H@5$iFi67eO?yiNc1i0ZYR(2NRw%5a&V4wU;!8{