diff --git a/app/src/main/java/com/charo/android/presentation/ui/home/BannerAboutCharoActivity.kt b/app/src/main/java/com/charo/android/presentation/ui/home/BannerAboutCharoActivity.kt index 965ff4e2..ff9a9614 100644 --- a/app/src/main/java/com/charo/android/presentation/ui/home/BannerAboutCharoActivity.kt +++ b/app/src/main/java/com/charo/android/presentation/ui/home/BannerAboutCharoActivity.kt @@ -29,9 +29,9 @@ class BannerAboutCharoActivity : AppCompatActivity() { override fun createFragment(position: Int): Fragment { return when(position){ - 0 -> BannerAboutCharoFragment(BannerAboutCharo(R.drawable.onboarding_background_1_android, "구경하고","사람들의 드라이브 경험을\n자유롭게 구경해보세요.")) - 1 -> BannerAboutCharoFragment(BannerAboutCharo(R.drawable.onboarding_background_2_android, "검색하고","원하는 지역과 테마로\n맞춤 드라이브 코스를 찾아보세요.")) - else -> BannerAboutCharoFragment(BannerAboutCharo(R.drawable.onboarding_background_3_android, "작성하고","나만의 드라이브 코스를\n기록하고 공유해보세요.")) + 0 -> BannerAboutCharoFragment(BannerAboutCharo(R.drawable.banner_charo_look, "구경하고","사람들의 드라이브 경험을\n자유롭게 구경해보세요.")) + 1 -> BannerAboutCharoFragment(BannerAboutCharo(R.drawable.banner_charo_search, "검색하고","원하는 지역과 테마로\n맞춤 드라이브 코스를 찾아보세요.")) + else -> BannerAboutCharoFragment(BannerAboutCharo(R.drawable.banner_charo_write, "작성하고","나만의 드라이브 코스를\n기록하고 공유해보세요.")) } } } diff --git a/app/src/main/java/com/charo/android/presentation/ui/home/BannerDriveTheaterActivity.kt b/app/src/main/java/com/charo/android/presentation/ui/home/BannerDriveTheaterActivity.kt index cbbcac39..4b844732 100644 --- a/app/src/main/java/com/charo/android/presentation/ui/home/BannerDriveTheaterActivity.kt +++ b/app/src/main/java/com/charo/android/presentation/ui/home/BannerDriveTheaterActivity.kt @@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.widget.ImageView import com.bumptech.glide.Glide +import com.bumptech.glide.RequestManager import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.charo.android.R @@ -13,18 +14,20 @@ import com.charo.android.databinding.ActivityBannerDriveTheaterBinding class BannerDriveTheaterActivity : AppCompatActivity() { private lateinit var binding: ActivityBannerDriveTheaterBinding + private lateinit var requestManager : RequestManager + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivityBannerDriveTheaterBinding.inflate(layoutInflater) setContentView(binding.root) + requestManager = Glide.with(this) glideImg(resources.getDrawable(R.drawable.image_121), binding.ivPaju1) } private fun glideImg(img : Drawable, imageView : ImageView){ - Glide.with(this) - .load(img) + requestManager.load(img) .transform(CenterCrop(), RoundedCorners(20)) .into(imageView) } diff --git a/app/src/main/res/drawable-hdpi/banner_charo_look.png b/app/src/main/res/drawable-hdpi/banner_charo_look.png new file mode 100644 index 00000000..9befa14a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/banner_charo_look.png differ diff --git a/app/src/main/res/drawable-hdpi/banner_charo_search.png b/app/src/main/res/drawable-hdpi/banner_charo_search.png new file mode 100644 index 00000000..a3e18954 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/banner_charo_search.png differ diff --git a/app/src/main/res/drawable-hdpi/banner_charo_write.png b/app/src/main/res/drawable-hdpi/banner_charo_write.png new file mode 100644 index 00000000..66f0049c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/banner_charo_write.png differ diff --git a/app/src/main/res/drawable-mdpi/banner_charo_look.png b/app/src/main/res/drawable-mdpi/banner_charo_look.png new file mode 100644 index 00000000..c10fcf22 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/banner_charo_look.png differ diff --git a/app/src/main/res/drawable-mdpi/banner_charo_search.png b/app/src/main/res/drawable-mdpi/banner_charo_search.png new file mode 100644 index 00000000..035aeb06 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/banner_charo_search.png differ diff --git a/app/src/main/res/drawable-mdpi/banner_charo_write.png b/app/src/main/res/drawable-mdpi/banner_charo_write.png new file mode 100644 index 00000000..6a3b64eb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/banner_charo_write.png differ diff --git a/app/src/main/res/drawable-xhdpi/banner_charo_look.png b/app/src/main/res/drawable-xhdpi/banner_charo_look.png new file mode 100644 index 00000000..568d0c26 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/banner_charo_look.png differ diff --git a/app/src/main/res/drawable-xhdpi/banner_charo_search.png b/app/src/main/res/drawable-xhdpi/banner_charo_search.png new file mode 100644 index 00000000..f3fe84fa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/banner_charo_search.png differ diff --git a/app/src/main/res/drawable-xhdpi/banner_charo_write.png b/app/src/main/res/drawable-xhdpi/banner_charo_write.png new file mode 100644 index 00000000..ea362fd1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/banner_charo_write.png differ diff --git a/app/src/main/res/drawable-xxhdpi/banner_charo_look.png b/app/src/main/res/drawable-xxhdpi/banner_charo_look.png new file mode 100644 index 00000000..77ac7e13 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/banner_charo_look.png differ diff --git a/app/src/main/res/drawable-xxhdpi/banner_charo_search.png b/app/src/main/res/drawable-xxhdpi/banner_charo_search.png new file mode 100644 index 00000000..7c9a7144 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/banner_charo_search.png differ diff --git a/app/src/main/res/drawable-xxhdpi/banner_charo_write.png b/app/src/main/res/drawable-xxhdpi/banner_charo_write.png new file mode 100644 index 00000000..1627feda Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/banner_charo_write.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/banner_charo_look.png b/app/src/main/res/drawable-xxxhdpi/banner_charo_look.png new file mode 100644 index 00000000..1d3ac869 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/banner_charo_look.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/banner_charo_search.png b/app/src/main/res/drawable-xxxhdpi/banner_charo_search.png new file mode 100644 index 00000000..1b632fb9 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/banner_charo_search.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/banner_charo_write.png b/app/src/main/res/drawable-xxxhdpi/banner_charo_write.png new file mode 100644 index 00000000..fd5de08b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/banner_charo_write.png differ diff --git a/app/src/main/res/drawable/rectangle_fill_radius_10dp.xml b/app/src/main/res/drawable/rectangle_fill_f8f9fa_12dp.xml similarity index 67% rename from app/src/main/res/drawable/rectangle_fill_radius_10dp.xml rename to app/src/main/res/drawable/rectangle_fill_f8f9fa_12dp.xml index 1a739745..434fe109 100644 --- a/app/src/main/res/drawable/rectangle_fill_radius_10dp.xml +++ b/app/src/main/res/drawable/rectangle_fill_f8f9fa_12dp.xml @@ -1,8 +1,8 @@ - + + android:color="@color/gray1_sub_f8f9fa" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_banner_drive_theater.xml b/app/src/main/res/layout/activity_banner_drive_theater.xml index 1acae5eb..526fbc1f 100644 --- a/app/src/main/res/layout/activity_banner_drive_theater.xml +++ b/app/src/main/res/layout/activity_banner_drive_theater.xml @@ -248,7 +248,7 @@ android:paddingHorizontal="15dp" android:paddingTop="19dp" android:paddingBottom="21dp" - android:background="@drawable/rectangle_fill_radius_10dp" + android:background="@drawable/rectangle_fill_f8f9fa_12dp" android:textStyle="normal" android:textSize="14sp" android:textColor="#495057" @@ -412,7 +412,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" android:layout_marginTop="15dp" - android:background="@drawable/rectangle_fill_radius_10dp" + android:background="@drawable/rectangle_fill_f8f9fa_12dp" android:lineSpacingExtra="8.4sp" android:paddingHorizontal="15dp" android:paddingTop="19dp"