내가 찜한 메뉴

app/build.gradle.kts

@@ -169,6 +169,7 @@ dependencies {
     implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-analytics-ktx")
     implementation("com.google.firebase:firebase-config-ktx")
+    implementation("com.google.firebase:firebase-messaging-ktx")
 
     // Glide
     implementation("com.github.bumptech.glide:glide:4.15.1")

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>
         <package android:name="com.google.android.apps.maps" />
@@ -45,6 +46,14 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/google_maps_key" />
 
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="siksha_channel" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_notification" />
+
         <activity
             android:name="com.wafflestudio.siksha2.ui.RootActivity"
             android:screenOrientation="portrait"
@@ -123,6 +132,14 @@
             android:name=".ui.common.ImageViewerActivity"
             android:exported="false"
             android:theme="@style/Theme.Siksha.ImageViewer" />
+
+        <service
+            android:name=".fcm.SikshaFirebaseService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>

app/src/main/java/com/wafflestudio/siksha2/components/SettingItemRow.kt

@@ -11,7 +11,6 @@ import com.wafflestudio.siksha2.databinding.ItemSettingRowBinding
 import com.wafflestudio.siksha2.utils.setVisibleOrGone
 
 class SettingItemRow : LinearLayout {
-
     private val binding = ItemSettingRowBinding.inflate(LayoutInflater.from(context), this)
     var checked: Boolean = false
         get() = binding.checkbox.isSelected
@@ -54,6 +53,30 @@ class SettingItemRow : LinearLayout {
         invalidate()
     }
 
+    fun setShowCheckSimple(visible: Boolean) {
+        binding.checkSimple.setVisibleOrGone(visible)
+        requestLayout()
+        invalidate()
+    }
+
+    fun setShowToggleSwitch(visible: Boolean) {
+        binding.toggleSwitch.setVisibleOrGone(visible)
+
+        isClickable = false
+        isFocusable = false
+    }
+
+    fun setToggleState(active: Boolean) {
+        binding.toggleSwitch.setActive(active)
+    }
+
+    fun setOnToggleClicked(listener: (Boolean) -> Unit) {
+        binding.toggleSwitch.setOnClickListener {
+            binding.toggleSwitch.toggle()
+            listener(binding.toggleSwitch.isActive)
+        }
+    }
+
     private fun init(attr: AttributeSet?) {
         gravity = Gravity.CENTER_VERTICAL
         orientation = HORIZONTAL
@@ -68,6 +91,9 @@ class SettingItemRow : LinearLayout {
                 setArrowIcon(getBoolean(R.styleable.SettingItem_showArrowIcon, true))
                 setNewIcon(getBoolean(R.styleable.SettingItem_showNewIcon, false))
                 setShowCheckbox(getBoolean(R.styleable.SettingItem_showCheckbox, false))
+                setShowCheckSimple(getBoolean(R.styleable.SettingItem_showCheckSimple, false))
+                setShowToggleSwitch(getBoolean(R.styleable.SettingItem_showToggleSwitch, false))
+
                 binding.settingRowText.text = getString(R.styleable.SettingItem_itemText)
                 binding.settingRowText.setTextColor(context.obtainStyledAttributes(attr, R.styleable.SettingItem).getColor(R.styleable.SettingItem_textColor, ContextCompat.getColor(context, R.color.black)))
             } finally {

app/src/main/java/com/wafflestudio/siksha2/components/ToggleSwitchView.kt

@@ -0,0 +1,107 @@
+package com.wafflestudio.siksha2.components
+
+import android.content.Context
+import android.graphics.Rect
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.TouchDelegate
+import android.view.View
+import android.view.animation.AccelerateDecelerateInterpolator
+import android.widget.FrameLayout
+import android.widget.ImageView
+import com.wafflestudio.siksha2.R
+
+class ToggleSwitchView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    private val bgActive: ImageView
+    private val bgInactive: ImageView
+    private val knob: ImageView
+
+    var isActive = false
+        private set
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.item_toggle_switch, this, true)
+        bgActive = findViewById(R.id.bg_active)
+        bgInactive = findViewById(R.id.bg_inactive)
+        knob = findViewById(R.id.toggle_knob)
+        descendantFocusability = FOCUS_BLOCK_DESCENDANTS
+
+        post {
+            val minTouchSize = (48 * resources.displayMetrics.density).toInt()
+            val parent = this.parent as? View ?: return@post
+            parent.post {
+                val rect = Rect()
+                getHitRect(rect)
+                val widthDiff = (minTouchSize - rect.width()).coerceAtLeast(0) / 2
+                val heightDiff = (minTouchSize - rect.height()).coerceAtLeast(0) / 2
+                rect.inset(-widthDiff, -heightDiff)
+                parent.touchDelegate = TouchDelegate(rect, this)
+            }
+        }
+
+        isClickable = true
+        isFocusable = true
+        setOnClickListener { toggle() }
+        updateAppearance(animated = false)
+    }
+
+    fun toggle() {
+        isActive = !isActive
+        updateAppearance(animated = true)
+    }
+
+    fun setActive(active: Boolean, animated: Boolean = false) {
+        if (isActive != active) {
+            isActive = active
+            updateAppearance(animated)
+        }
+    }
+
+    private fun updateAppearance(animated: Boolean) {
+        bgActive.visibility = if (isActive) VISIBLE else GONE
+        bgInactive.visibility = if (isActive) GONE else VISIBLE
+
+        post {
+            val knobMarginPx = 2f.dp
+
+            val maxTravel = (width - knob.width - knobMarginPx * 2)
+
+            val targetX = if (isActive) {
+                knobMarginPx + maxTravel
+            } else {
+                knobMarginPx
+            }
+
+            if (animated) {
+                knob.animate()
+                    .x(targetX)
+                    .setInterpolator(AccelerateDecelerateInterpolator())
+                    .setDuration(150)
+                    .start()
+            } else {
+                knob.x = targetX
+            }
+        }
+    }
+
+    private val Float.dp: Float
+        get() = this * resources.displayMetrics.density
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        return super.onTouchEvent(event)
+    }
+
+    override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+        return super.dispatchTouchEvent(ev)
+    }
+
+    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+        return true
+    }
+}

app/src/main/java/com/wafflestudio/siksha2/di/NetworkModule.kt

@@ -24,14 +24,36 @@ import javax.inject.Singleton
 object NetworkModule {
     @Provides
     @Singleton
-    fun provideHttpClient(sikshaPrefObjects: SikshaPrefObjects): OkHttpClient {
+    fun provideHttpClient(
+        @ApplicationContext context: Context,
+        sikshaPrefObjects: SikshaPrefObjects
+    ): OkHttpClient {
         return OkHttpClient.Builder()
+            /*
             .addInterceptor { chain ->
                 val newRequest = chain.request().newBuilder()
                     .header(AUTH_TOKEN_HEADER_KEY, sikshaPrefObjects.accessToken.getValue())
                     .build()
                 chain.proceed(newRequest)
             }
+
+             */
+            .addInterceptor { chain ->
+                val request = chain.request()
+                val builder = request.newBuilder()
+
+                val path = request.url.encodedPath
+                val isLoginRequest = path.contains("/auth/login")
+
+                if (!isLoginRequest) {
+                    val newRequest = builder
+                        .header(AUTH_TOKEN_HEADER_KEY, sikshaPrefObjects.accessToken.getValue())
+                        .build()
+                    chain.proceed(newRequest)
+                } else {
+                    chain.proceed(request)
+                }
+            }
             .addInterceptor(
                 HttpLoggingInterceptor().apply {
                     level =

app/src/main/java/com/wafflestudio/siksha2/fcm/SikshaFirebaseService.kt

@@ -0,0 +1,83 @@
+package com.wafflestudio.siksha2.fcm
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import com.wafflestudio.siksha2.R
+import com.wafflestudio.siksha2.preferences.SikshaPrefObjects
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class SikshaFirebaseService : FirebaseMessagingService() {
+
+    @Inject lateinit var prefs: SikshaPrefObjects
+
+    override fun onNewToken(token: String) {
+        super.onNewToken(token)
+        Log.d("FCM", "New FCM token generated: $token")
+        prefs.fcmToken.setValue(token)
+    }
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        Log.d("FCM", "notification=${remoteMessage.notification}")
+        Log.d("FCM", "data=${remoteMessage.data}")
+
+        val title = remoteMessage.notification?.title
+            ?: remoteMessage.data["title"]
+            ?: "식샤"
+
+        val body = remoteMessage.notification?.body
+            ?: remoteMessage.data["body"]
+            ?: ""
+
+        val notificationManager =
+            getSystemService(NOTIFICATION_SERVICE) as android.app.NotificationManager
+
+        val builder = NotificationCompat.Builder(this, "siksha_channel")
+            // .setSmallIcon(R.drawable.siksha_rice_bowl)
+            .setSmallIcon(R.drawable.ic_notification)
+            // .setLargeIcon(createNotificationLargeIcon())
+            .setContentTitle(title)
+            .setContentText(body)
+            .setAutoCancel(true)
+
+        notificationManager.notify(
+            System.currentTimeMillis().toInt(),
+            builder.build()
+        )
+    }
+
+    private fun createNotificationLargeIcon(): Bitmap {
+        val size = 39
+        val radius = 8.5f
+
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        val paintBg = Paint().apply {
+            color = resources.getColor(R.color.orange_500, null)
+            isAntiAlias = true
+        }
+
+        val rect = RectF(0f, 0f, size.toFloat(), size.toFloat())
+        canvas.drawRoundRect(rect, radius, radius, paintBg)
+
+        val riceBmp = BitmapFactory.decodeResource(resources, R.drawable.siksha_rice_bowl)
+
+        val iconSize = (size * 0.55).toInt()
+        val left = (size - iconSize) / 2
+        val top = (size - iconSize) / 2
+        val resized = Bitmap.createScaledBitmap(riceBmp, iconSize, iconSize, true)
+
+        canvas.drawBitmap(resized, left.toFloat(), top.toFloat(), null)
+
+        return bitmap
+    }
+}

app/src/main/java/com/wafflestudio/siksha2/models/RestaurantInfo.kt

@@ -45,7 +45,7 @@ data class RestaurantInfo(
     @Parcelize
     @JsonClass(generateAdapter = true)
     data class Extra(
-        @Json(name = "operating_hours") val operatingHours: OperatingHour
+        @Json(name = "operating_hours") val operatingHours: OperatingHour? = null
     ) : Parcelable
 
     @Parcelize