revert: restore develop

Author: cho58

app/src/main/java/com/wafflestudio/siksha2/compose/ui/settings/ReorderRestaurantNameCard.kt

@@ -1,12 +1,16 @@
 package com.wafflestudio.siksha2.compose.ui.settings
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.wafflestudio.siksha2.ui.SikshaTheme
@@ -17,9 +21,17 @@ fun ReorderRestaurantNameCard(
     modifier: Modifier = Modifier
 ) {
     Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .padding(vertical = 12.dp, horizontal = 8.dp),
+        modifier = modifier.fillMaxSize()
+            .padding(horizontal = 8.dp, vertical = 6.dp)
+            .shadow(
+                elevation = 6.dp,
+                shape = RoundedCornerShape(12.dp),
+                spotColor = Color.Transparent
+            )
+            .background(
+                color = SikshaTheme.colors.ElementTooltip2
+            )
+            .padding(start = 12.dp, top = 11.dp, bottom = 11.dp),
         contentAlignment = Alignment.CenterStart
     ) {
         Text(

app/src/main/java/com/wafflestudio/siksha2/db/RestaurantsDao.kt

@@ -18,22 +18,13 @@ interface RestaurantsDao {
     @Query("SELECT * FROM restaurants WHERE is_favorite")
     suspend fun getFavoriteAll(): List<RestaurantInfo>
 
-    @Query("SELECT * FROM restaurants WHERE visible")
-    suspend fun getHiddenAll(): List<RestaurantInfo>
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(item: List<RestaurantInfo>)
 
     @Transaction
     suspend fun update(item: List<RestaurantInfo>) {
-        val personalStates = getAll().associateBy { it.id }
-        val result = item.map { restaurant ->
-            val personalState = personalStates[restaurant.id]
-            restaurant.copy(
-                isFavorite = personalState?.isFavorite ?: restaurant.isFavorite,
-                visible = personalState?.visible ?: restaurant.visible
-            )
-        }
+        val favoritesId = getFavoriteAll().map { it.id }
+        val result = item.map { it.copy(isFavorite = it.id in favoritesId) }
         insert(result)
     }
 
@@ -45,20 +36,4 @@ interface RestaurantsDao {
             insert(listOf(temp))
         }
     }
-
-    @Transaction
-    suspend fun setRestaurantFavoriteById(id: Long, isFavorite: Boolean) {
-        val target = getRestaurantById(id)
-        target?.let {
-            insert(listOf(it.copy(isFavorite = isFavorite)))
-        }
-    }
-
-    @Transaction
-    suspend fun setRestaurantVisibleById(id: Long, visible: Boolean) {
-        val target = getRestaurantById(id)
-        target?.let {
-            insert(listOf(it.copy(visible = visible)))
-        }
-    }
 }

app/src/main/java/com/wafflestudio/siksha2/db/SikshaDatabase.kt

@@ -6,7 +6,7 @@ import androidx.room.TypeConverters
 import com.wafflestudio.siksha2.models.DailyMenu
 import com.wafflestudio.siksha2.models.RestaurantInfo
 
-@Database(entities = [RestaurantInfo::class, DailyMenu::class], version = 2)
+@Database(entities = [RestaurantInfo::class, DailyMenu::class], version = 1)
 @TypeConverters(SikshaRoomTypeAdapter::class)
 abstract class SikshaDatabase : RoomDatabase() {
     abstract fun restaurantDao(): RestaurantsDao

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

@@ -23,7 +23,6 @@ object DatabaseModule {
     fun provideDatabase(@ApplicationContext context: Context, moshi: Moshi): SikshaDatabase {
         return Room.databaseBuilder(context, SikshaDatabase::class.java, "siksha-db")
             .addTypeConverter(SikshaRoomTypeAdapter(moshi))
-            .fallbackToDestructiveMigration()
             .build()
     }
 

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

@@ -39,10 +39,7 @@ data class RestaurantInfo(
     var etc: Extra? = null,
     @ColumnInfo(name = "is_favorite")
     @Transient()
-    var isFavorite: Boolean = false,
-    @ColumnInfo(name = "visible")
-    @Transient()
-    var visible: Boolean = true
+    var isFavorite: Boolean = false
 ) : Parcelable {
 
     @Parcelize

app/src/main/java/com/wafflestudio/siksha2/network/SikshaApi.kt

@@ -77,27 +77,6 @@ interface SikshaApi {
     @GET("/restaurants")
     suspend fun fetchRestaurants(): NetworkResult<FetchRestaurantsResult>
 
-    @GET("/restaurants/personal")
-    suspend fun fetchPersonalRestaurants(): NetworkResult<FetchPersonalRestaurantsResult>
-
-    @PATCH("/restaurants/like/{restaurantId}")
-    suspend fun setRestaurantFavorite(
-        @Path("restaurantId") restaurantId: Long,
-        @Body body: RestaurantLikeRequest
-    ): NetworkResult<RestaurantLikeResponse>
-
-    @PATCH("/restaurants/visible/{restaurantId}")
-    suspend fun setRestaurantVisible(
-        @Path("restaurantId") restaurantId: Long,
-        @Body body: RestaurantVisibleRequest
-    ): NetworkResult<RestaurantVisibleResponse>
-
-    @GET("/restaurants/order")
-    suspend fun fetchRestaurantOrder(): NetworkResult<RestaurantOrder>
-
-    @PATCH("/restaurants/order")
-    suspend fun updateRestaurantOrder(@Body body: RestaurantOrder): NetworkResult<RestaurantOrder>
-
     @POST("/reviews")
     suspend fun leaveMenuReview(@Body req: LeaveReviewParam): NetworkResult<LeaveReviewResult>