diff --git a/.idea/misc.xml b/.idea/misc.xml
index f796905..8badce8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/.idea/other.xml b/.idea/other.xml
index 104e542..b45a6e0 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -14,6 +14,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="28" />
           <option name="brand" value="DOCOMO" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7c114de..5bd6ab8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,5 +1,3 @@
-import kotlinx.android.parcel.Parcelize
-
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsKotlinAndroid)
@@ -75,4 +73,7 @@ dependencies {
     // Glide
     implementation(libs.glide)
     annotationProcessor(libs.compiler)
+    // DataStore
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.kotlinx.coroutines.android)
 }
\ No newline at end of file
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 47119c3..9140201 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index 6ad5d36..c4de811 100644
Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index ea943ca..cc4a90a 100644
Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2fdba1..8ab3223 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,25 +14,23 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/logo"
-        android:label=""
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:label="傻瓜廚師"
+        android:name=".MyApp"
+        android:roundIcon="@drawable/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.IdiotChefAssistant"
         tools:targetApi="31">
         <activity
-            android:name=".resultBlock.ResultPage"
+            android:name=".result.ResultPage"
             android:exported="false"/>
         <activity
-            android:name=".HistoryPage"
+            android:name=".mainLayout.CameraPage"
             android:exported="false" />
         <activity
-            android:name=".CameraPage"
+            android:name=".recipe.RecipePage"
             android:exported="false" />
         <activity
-            android:name=".recipeBlock.RecipePage"
-            android:exported="false" />
-        <activity
-            android:name=".searchBlock.SearchPage"
+            android:name=".search.SearchPage"
             android:exported="false" />
         <activity
             android:name=".login.LoginActivity"
@@ -42,7 +40,7 @@
             android:name=".register.RegisterPage"
             android:exported="false"/>
         <activity
-            android:name=".MainActivity"
+            android:name=".mainLayout.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/idiotchefassistant/AuthTokenManager.kt b/app/src/main/java/com/example/idiotchefassistant/AuthTokenManager.kt
new file mode 100644
index 0000000..fd368b9
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/AuthTokenManager.kt
@@ -0,0 +1,50 @@
+package com.example.idiotchefassistant
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+val Context.dataStore by preferencesDataStore(name = "settings")
+
+object AuthTokenManager {
+    private val tokenKey = stringPreferencesKey("auth_token")
+    private var _authToken = MutableStateFlow<String?>(null)
+    val authToken = _authToken.asStateFlow()
+
+    fun initialize(context: Context) {
+        CoroutineScope(Dispatchers.IO).launch {
+            loadInitialToken(context)
+        }
+    }
+
+    private suspend  fun loadInitialToken(context: Context) {
+        context.dataStore.data.map { preferences ->
+            preferences[tokenKey]
+        }.collect { token ->
+            _authToken.value = token
+        }
+    }
+
+    fun getAuthTokenSync(): String? = _authToken.value
+
+    suspend fun saveAuthToken(context: Context, token: String) {
+        context.dataStore.edit { preferences ->
+            preferences[tokenKey] = token
+        }
+        _authToken.value = token
+    }
+
+    suspend fun clearAuthToken(context: Context) {
+        context.dataStore.edit { preferences ->
+            preferences.remove(tokenKey)
+        }
+        _authToken.value = null
+    }
+}
diff --git a/app/src/main/java/com/example/idiotchefassistant/HistoryPage.kt b/app/src/main/java/com/example/idiotchefassistant/HistoryPage.kt
deleted file mode 100644
index 355c322..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/HistoryPage.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.example.idiotchefassistant
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.idiotchefassistant.databinding.ActivitySearchPageBinding
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
-import com.example.idiotchefassistant.recipeBlock.RecipeItemAdapter
-import com.example.idiotchefassistant.recipeBlock.RecipePage
-
-class HistoryPage : AppCompatActivity(), RecipeItemAdapter.OnItemClickListener {
-    private lateinit var binding: ActivitySearchPageBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enableEdgeToEdge()
-//        setContentView(R.layout.activity_search_page)
-        binding = ActivitySearchPageBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        binding.SearchBtn.setOnClickListener {
-            val intent = Intent(this, HistoryPage::class.java)
-            startActivity(intent)
-        }
-        binding.EditText
-        val item = mutableListOf<RecipeItem>()
-        val recycleView = binding.RecipeRecycleView
-        recycleView.layoutManager = LinearLayoutManager(this)
-
-        val adapter = RecipeItemAdapter(item)
-        adapter.setOnItemClickListener(this)
-        recycleView.adapter = adapter
-    }
-
-    override fun onItemClick(item: RecipeItem) {
-        val intent = Intent(this, RecipePage::class.java)
-        startActivity(intent)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/HomePage.kt b/app/src/main/java/com/example/idiotchefassistant/HomePage.kt
deleted file mode 100644
index cba7cb1..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/HomePage.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.example.idiotchefassistant
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.idiotchefassistant.databinding.FragmentHomePageBinding
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
-import com.example.idiotchefassistant.recipeBlock.RecipeItemAdapter
-import com.example.idiotchefassistant.recipeBlock.RecipePage
-
-class HomePage : Fragment(), RecipeItemAdapter.OnItemClickListener {
-    private var _binding: FragmentHomePageBinding? = null
-    private val binding get() = _binding!!
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentHomePageBinding.inflate(inflater, container, false)
-        val view = binding.root
-
-        binding.CameraBtn.setOnClickListener {
-            val intent = Intent(activity, CameraPage::class.java)
-            startActivity(intent)
-        }
-
-        val items = generateFakeData()
-        val recycleView = binding.RecipeRecycleView
-        recycleView.layoutManager = LinearLayoutManager(requireContext())
-
-        val adapter = RecipeItemAdapter(items)
-        adapter.setOnItemClickListener(this)
-        recycleView.adapter = adapter
-
-        return view
-    }
-    private fun generateFakeData(): List<RecipeItem> {
-        val fakeData = mutableListOf<RecipeItem>()
-        for (i in 1..10) {
-            fakeData.add(RecipeItem(182,"食譜 $i", "https://www.youtube.com/watch?v=OblT91aXQ5c", 5))
-        }
-        return fakeData
-    }
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    override fun onItemClick(item: RecipeItem){
-        val intent = Intent(activity, RecipePage::class.java)
-        startActivity(intent)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/MyApp.kt b/app/src/main/java/com/example/idiotchefassistant/MyApp.kt
new file mode 100644
index 0000000..5a27331
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/MyApp.kt
@@ -0,0 +1,19 @@
+package com.example.idiotchefassistant
+import android.app.Application
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+
+class MyApp:  Application() {
+    override fun onCreate() {
+        super.onCreate()
+        AuthTokenManager.initialize(applicationContext)
+    }
+    companion object {
+        private val _isLogin = MutableLiveData(false)
+        val isLogin: LiveData<Boolean> = _isLogin
+
+        fun setLogin(value: Boolean) {
+            _isLogin.postValue(value)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/RetrofitManager.kt b/app/src/main/java/com/example/idiotchefassistant/RetrofitManager.kt
index ae756ef..35b755d 100644
--- a/app/src/main/java/com/example/idiotchefassistant/RetrofitManager.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/RetrofitManager.kt
@@ -1,19 +1,19 @@
 package com.example.idiotchefassistant
 
 import DetectAPI
-import com.example.idiotchefassistant.data.retrofit.endpoints.User
-import com.example.idiotchefassistant.ingredientsBlock.IngredientAPI
-import com.example.idiotchefassistant.recipeBlock.RecipeAPI
-import com.example.idiotchefassistant.searchBlock.ResultSearchAPI
+import android.util.Log
+import com.example.idiotchefassistant.ingredients.IngredientAPI
+import com.example.idiotchefassistant.recipe.RecipeAPI
+import com.example.idiotchefassistant.search.ResultSearchAPI
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 val okHttpClient = OkHttpClient.Builder()
-    .connectTimeout(60, TimeUnit.SECONDS) // 設置連接超時時間
-    .readTimeout(60, TimeUnit.SECONDS)    // 設置讀取超時時間
-    .writeTimeout(60, TimeUnit.SECONDS)   // 設置寫入超時時間
+    .connectTimeout(20, TimeUnit.SECONDS) // 設置連接超時時間
+    .readTimeout(20, TimeUnit.SECONDS)    // 設置讀取超時時間
+    .writeTimeout(20, TimeUnit.SECONDS)   // 設置寫入超時時間
     .build()
 
 var retrofit: Retrofit = Retrofit.Builder()
@@ -25,5 +25,27 @@ var retrofit: Retrofit = Retrofit.Builder()
 val detectService: DetectAPI = retrofit.create(DetectAPI::class.java)
 val ingredientService: IngredientAPI = retrofit.create(IngredientAPI::class.java)
 val resultSearchService: ResultSearchAPI = retrofit.create(ResultSearchAPI::class.java)
+val userService: User = retrofit.create(User::class.java)
 val recipeService: RecipeAPI = retrofit.create(RecipeAPI::class.java)
-val userService: User = retrofit.create(User::class.java)
\ No newline at end of file
+
+val okHttpClientAddToken = OkHttpClient.Builder()
+    .addInterceptor { chain ->
+        val token = AuthTokenManager.getAuthTokenSync()
+        val request = chain.request().newBuilder()
+            .addHeader("X-API-Key", "$token") // 這裡放入從 AuthTokenManager 中取得的 Token
+            .build()
+        Log.i("Token","$token")
+        chain.proceed(request)
+    }
+    .connectTimeout(20, TimeUnit.SECONDS) // 設置連接超時時間
+    .readTimeout(20, TimeUnit.SECONDS)    // 設置讀取超時時間
+    .writeTimeout(20, TimeUnit.SECONDS)   // 設置寫入超時時間
+    .build()
+
+var retrofitAddToken: Retrofit = Retrofit.Builder()
+    .baseUrl("https://topic114.bntw.dev/")
+    .addConverterFactory(GsonConverterFactory.create())
+    .client(okHttpClientAddToken)
+    .build()
+val userDataService: User = retrofitAddToken.create(User::class.java)
+val recipeAddTokenService: RecipeAPI = retrofitAddToken.create(RecipeAPI::class.java)
diff --git a/app/src/main/java/com/example/idiotchefassistant/SettingsFragment.kt b/app/src/main/java/com/example/idiotchefassistant/SettingsFragment.kt
deleted file mode 100644
index 5f9568c..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/SettingsFragment.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.idiotchefassistant
-
-import android.os.Bundle
-import androidx.preference.PreferenceFragmentCompat
-
-class SettingsFragment : PreferenceFragmentCompat() {
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.root_preferences, rootKey)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/User.kt b/app/src/main/java/com/example/idiotchefassistant/User.kt
new file mode 100644
index 0000000..ebb1f0c
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/User.kt
@@ -0,0 +1,57 @@
+package com.example.idiotchefassistant
+
+import com.example.idiotchefassistant.recipe.RecipeItem
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+
+data class LoginResponse(
+    val token:String
+)
+
+data class LoginRequestBody(
+    val username:String,
+    val password:String
+)
+
+data class RegisterRequestBody(
+    val username:String,
+    val password:String,
+    val email: String
+)
+
+data class UserResponse(
+    val email:String,
+    val level:Int,
+    val username:String
+)
+
+data class MessageResponse(
+    val message:String
+)
+
+interface User {
+
+    @POST("/user/login")
+    fun login(
+        @Body loginRequestBody: LoginRequestBody
+    ): Call<LoginResponse>
+
+    @GET("/user/me")
+    fun me(): Call<UserResponse>
+
+    @GET("/user/logout")
+    fun logout(): Call<MessageResponse>
+
+    @GET("/user/recommend")
+    fun recommend(): Call<List<RecipeItem>>
+
+    @POST("/user/register")
+    fun register(
+        @Body registerRequestBody: RegisterRequestBody
+    ): Call<MessageResponse>
+
+    @GET("/user/history")
+    fun history (): Call<List<RecipeItem>>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/data/model/LoggedInUser.kt b/app/src/main/java/com/example/idiotchefassistant/data/model/LoggedInUser.kt
deleted file mode 100644
index c1580f0..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/data/model/LoggedInUser.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.idiotchefassistant.data.model
-
-/**
- * Data class that captures user information for logged in users retrieved from LoginRepository
- */
-data class LoggedInUser(
-    val userId: String,
-    val displayName: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/data/retrofit/RetrofitManager.kt b/app/src/main/java/com/example/idiotchefassistant/data/retrofit/RetrofitManager.kt
deleted file mode 100644
index b71f30e..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/data/retrofit/RetrofitManager.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.example.idiotchefassistant.data.retrofit
-
-import com.example.idiotchefassistant.data.retrofit.endpoints.User
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-import java.util.concurrent.TimeUnit
-
-
-val retrofitManager = RetrofitManager()
-
-class RetrofitManager internal constructor() {
-
-    val user:User
-
-    init {
-        val okHttpClient = OkHttpClient().newBuilder()
-            .connectTimeout(30, TimeUnit.SECONDS) // 設置連線Timeout
-            .build()
-        val retrofit = Retrofit.Builder()
-            .baseUrl("http://192.168.9.51:8000")
-            .addConverterFactory(GsonConverterFactory.create())
-            .client(okHttpClient)
-            .build()
-        this.user = retrofit.create(User::class.java)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/data/retrofit/endpoints/User.kt b/app/src/main/java/com/example/idiotchefassistant/data/retrofit/endpoints/User.kt
deleted file mode 100644
index 3612d91..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/data/retrofit/endpoints/User.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.example.idiotchefassistant.data.retrofit.endpoints
-
-import com.google.gson.annotations.SerializedName
-import retrofit2.Call
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.POST
-
-data class LoginResponse(
-    val token:String
-)
-
-data class LoginRequestBody(
-    val username:String,
-    val password:String
-)
-
-data class RegisterRequestBody(
-    val username:String,
-    val password:String,
-    val email: String
-)
-
-data class UserResponse(
-    val id:Int,
-    val username:String,
-    val email:String,
-    val level:Int
-)
-
-data class MessageResponse(
-    val message:String
-)
-
-data class SearchResponse(
-    val id:Int,
-    val name:String,
-    val description:String,
-    @SerializedName("video_link")  val videoLink:String,
-    val rtype:Int
-)
-
-interface User {
-    /*
-     *  POST /user/login
-     *  It's a login endpoint
-     */
-    @POST("/user/login")
-    fun login(
-        @Body loginRequestBody: LoginRequestBody
-    ): Call<LoginResponse>
-    /*
-     *  GET /user/me
-     *  To get the token owner's information
-     */
-    @GET("/user/me")
-    fun me(
-        @Header("X-API-Key") token:String
-    ): Call<UserResponse>
-
-    /*
-     *  GET /user/logout
-     *  To logout this session.
-     */
-    @GET("/user/logout")
-    fun logout(
-        @Header("X-API-Key") token:String
-    ): Call<MessageResponse>
-
-    /*
-     *  GET /user/logout/all
-     *  To logout all sessions.
-     */
-    @GET("/user/logout/all")
-    fun logoutAll(
-        @Header("X-API-Key") token:String
-    ): Call<MessageResponse>
-
-    /*
-     *  POST /user/register
-     *  To register a new user
-     */
-    @POST("/user/register")
-    fun register(
-        @Body loginRequestBody: RegisterRequestBody
-    ): Call<MessageResponse>
-
-    /*
-     *  GET /user/searches
-     *  To get search history of the token owner
-     */
-    @GET("/user/searches")
-    fun searches(
-        @Header("X-API-Key") token:String
-    ): Call<SearchResponse>
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientAPI.kt b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientAPI.kt
similarity index 81%
rename from app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientAPI.kt
rename to app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientAPI.kt
index a36308b..f47007d 100644
--- a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientAPI.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientAPI.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.ingredientsBlock
+package com.example.idiotchefassistant.ingredients
 
 import retrofit2.http.GET
 import retrofit2.Call
diff --git a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientData.kt b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientData.kt
similarity index 56%
rename from app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientData.kt
rename to app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientData.kt
index 349b594..5dd7707 100644
--- a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientData.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientData.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.ingredientsBlock
+package com.example.idiotchefassistant.ingredients
 
 class IngredientData {
     var ingredientNames: Array<String>? = null
diff --git a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientDialogFragment.kt b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientDialogFragment.kt
similarity index 73%
rename from app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientDialogFragment.kt
rename to app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientDialogFragment.kt
index 588fd40..b82ec45 100644
--- a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientDialogFragment.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.ingredientsBlock
+package com.example.idiotchefassistant.ingredients
 
 import android.annotation.SuppressLint
 import android.os.Bundle
@@ -35,21 +35,33 @@ class IngredientDialogFragment : DialogFragment() {
         binding.listViewItems
         ingredientRepository = IngredientRepository()
         ingredientFactory = IngredientFactory(ingredientRepository)
-        ingredientViewModel = ViewModelProvider(this, ingredientFactory)[IngredientViewModel::class.java]
+        ingredientViewModel =
+            ViewModelProvider(this, ingredientFactory)[IngredientViewModel::class.java]
 
         // Set up the list and adapter
         ingredientViewModel.getData()
-        val adapter = object : ArrayAdapter<String>(requireContext(), android.R.layout.simple_list_item_1) {
-            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-                val v = super.getView(position, convertView, parent)
-                if (position == selectedPosition) {
-                    v.setBackgroundColor(ContextCompat.getColor(requireContext(), android.R.color.holo_orange_light))
-                } else {
-                    v.setBackgroundColor(ContextCompat.getColor(requireContext(), android.R.color.transparent))
+        val adapter =
+            object : ArrayAdapter<String>(requireContext(), android.R.layout.simple_list_item_1) {
+                override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+                    val v = super.getView(position, convertView, parent)
+                    if (position == selectedPosition) {
+                        v.setBackgroundColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                android.R.color.holo_orange_light
+                            )
+                        )
+                    } else {
+                        v.setBackgroundColor(
+                            ContextCompat.getColor(
+                                requireContext(),
+                                android.R.color.transparent
+                            )
+                        )
+                    }
+                    return v
                 }
-                return v
             }
-        }
 
         binding.listViewItems.adapter = adapter
         ingredientViewModel.callBack().observe(viewLifecycleOwner) { ingredientData ->
@@ -59,9 +71,9 @@ class IngredientDialogFragment : DialogFragment() {
             adapter.notifyDataSetChanged()
         }
 
-        binding.buttonSwitch.setOnClickListener{
+        binding.buttonSwitch.setOnClickListener {
             isSeason = !isSeason
-            if(isSeason)
+            if (isSeason)
                 binding.buttonSwitch.text = "尋找食材"
             else
                 binding.buttonSwitch.text = "尋找調味料"
@@ -77,11 +89,13 @@ class IngredientDialogFragment : DialogFragment() {
         binding.searchEditText.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
             }
+
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                 adapter.notifyDataSetChanged()
                 val query = s.toString()
                 ingredientViewModel.filterItems(query)
             }
+
             override fun afterTextChanged(s: Editable?) {}
         })
 
diff --git a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientFactory.kt b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientFactory.kt
similarity index 90%
rename from app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientFactory.kt
rename to app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientFactory.kt
index 5ac21c9..ae97b39 100644
--- a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientFactory.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientFactory.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.ingredientsBlock
+package com.example.idiotchefassistant.ingredients
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientRepository.kt b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientRepository.kt
similarity index 66%
rename from app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientRepository.kt
rename to app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientRepository.kt
index c34a37f..a4f6b9e 100644
--- a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientRepository.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientRepository.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.ingredientsBlock
+package com.example.idiotchefassistant.ingredients
 
 import android.util.Log
 import androidx.lifecycle.LiveData
@@ -11,7 +11,7 @@ import java.util.concurrent.Executors
 
 class IngredientRepository {
     private var ingredientList = emptyArray<String>()
-    private var seasoningList = arrayOf("醬油 soy oil", "番茄醬 ketchup")
+    private var seasoningList = arrayOf("醬油 soy sauce","牛奶 milk","番茄醬 ketchup","松露醬 truffle sauce","味噌 miso","美乃滋 mayonnaise","番茄糊 tomato paste","胡麻醬 sesame sauce","甜麵醬 sweet bean sauce","咖哩 curry","優格 yogurt","高湯 stock","豆瓣醬 chili bean sauce","抹茶 matcha","鮮奶油 cream whip","紅椒粉 paprika","八角 star anise","伍斯特醬 worcestershire sauce","花椒 sichuan pepper","芝麻油 sesame oil","味醂 mirin","清酒 sake","蠔油 oyster sauce","紹興酒 shaoxing wine","白酒 Chinese spirits","紅葡萄酒 red wine","魚露 fish sauce","沙茶醬 shacha sauce","義大利麵醬 pasta sauce","韓式辣醬 gochujang sauce","米酒 rice wine","威士忌 whisky","優酪乳 drinking yogurt","酒 wine","泰式醬 sauce thai","辣椒粉 chili powder","醋 vinegar","蜂蜜芥末醬 honey mustard","五香粉 five spice powder","玉米粉 corn powder","燒肉醬 sauce bbq","啤酒 beer","七味粉 shichimi powder","薑黃粉 turmeric sauce","冬蔭功醬 tom yum paste","紅油 chili oil","苦茶油 camellia oil","煉乳 condensed milk","咖哩粉 curry powder","紅椒粉 pepper red powder","花生醬 peanut butter")
     private var nowData = ingredientList
     private val listeners = mutableListOf<OnTaskFinish>()
 
diff --git a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientViewModel.kt b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientViewModel.kt
similarity index 97%
rename from app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientViewModel.kt
rename to app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientViewModel.kt
index ba9325c..ad2cc5c 100644
--- a/app/src/main/java/com/example/idiotchefassistant/ingredientsBlock/IngredientViewModel.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/ingredients/IngredientViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.ingredientsBlock
+package com.example.idiotchefassistant.ingredients
 
 import android.util.Log
 import androidx.lifecycle.LiveData
@@ -7,6 +7,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
 class IngredientViewModel(private var ingredientRepository: IngredientRepository): ViewModel() {
     private var userLiveData = MutableLiveData<IngredientData>()
+
     private val ingredientObserver = Observer<ArrayList<IngredientItem>> { list ->
         if (list.isNotEmpty()) {
             val names: Array<String> = list.map {
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/LoginActivity.kt b/app/src/main/java/com/example/idiotchefassistant/login/LoginActivity.kt
index 37efcba..32773cb 100644
--- a/app/src/main/java/com/example/idiotchefassistant/login/LoginActivity.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/login/LoginActivity.kt
@@ -5,7 +5,6 @@ import android.content.Intent
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import android.os.Bundle
-import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import android.text.Editable
 import android.text.TextWatcher
@@ -15,8 +14,6 @@ import android.widget.EditText
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import com.example.idiotchefassistant.databinding.ActivityLoginBinding
-
-import com.example.idiotchefassistant.R
 import com.example.idiotchefassistant.register.RegisterPage
 
 class LoginActivity : AppCompatActivity() {
@@ -36,7 +33,7 @@ class LoginActivity : AppCompatActivity() {
 
         loginViewModel = ViewModelProvider(
             this,
-            LoginViewModelFactory()
+            LoginViewModelFactory(applicationContext)
         )[LoginViewModel::class.java]
 
         loginViewModel.loginFormState.observe(this@LoginActivity, Observer {
@@ -51,19 +48,14 @@ class LoginActivity : AppCompatActivity() {
             }
         })
 
-        loginViewModel.loginResult.observe(this@LoginActivity, Observer {
-            val loginResult = it ?: return@Observer
+        loginViewModel.loginResult.observe(this@LoginActivity) { result ->
             loading.visibility = View.GONE
-            if (loginResult.error != null) {
-                showLoginFailed(loginResult.error)
-            }
-            if (loginResult.success != null) {
-                updateUiWithUser(loginResult.success)
+            Toast.makeText(applicationContext, result, Toast.LENGTH_SHORT).show()
+            if (result.contains("登入")) {
+                setResult(Activity.RESULT_OK)
+                finish()
             }
-            setResult(Activity.RESULT_OK)
-            //Complete and destroy login activity once successful
-            finish()
-        })
+        }
 
         username.afterTextChanged {
             loginViewModel.loginDataChanged(
@@ -100,20 +92,7 @@ class LoginActivity : AppCompatActivity() {
             startActivity(intent)
         }
     }
-    private fun updateUiWithUser(model: LoggedInUserView) {
-        val welcome = getString(R.string.welcome)
-        val displayName = model.displayName
-        // TODO : initiate successful logged in experience
-        Toast.makeText(
-            applicationContext,
-            "$welcome $displayName",
-            Toast.LENGTH_LONG
-        ).show()
-    }
 
-    private fun showLoginFailed(@StringRes errorString: Int) {
-        Toast.makeText(applicationContext, errorString, Toast.LENGTH_SHORT).show()
-    }
 }
 
 fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/LoginDataSource.kt b/app/src/main/java/com/example/idiotchefassistant/login/LoginDataSource.kt
deleted file mode 100644
index 58f6352..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/login/LoginDataSource.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.idiotchefassistant.login
-
-import com.example.idiotchefassistant.data.model.LoggedInUser
-import java.io.IOException
-
-/**
- * Class that handles authentication w/ login credentials and retrieves user information.
- */
-class LoginDataSource {
-
-    fun login(username: String, password: String): Result<LoggedInUser> {
-        try {
-            // TODO: handle loggedInUser authentication
-            val fakeUser = LoggedInUser(java.util.UUID.randomUUID().toString(), "Jane Doe")
-            return Result.Success(fakeUser)
-        } catch (e: Throwable) {
-            return Result.Error(IOException("Error logging in", e))
-        }
-    }
-
-    fun logout() {
-        // TODO: revoke authentication
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/LoginRepository.kt b/app/src/main/java/com/example/idiotchefassistant/login/LoginRepository.kt
index d44fd88..fbe9c98 100644
--- a/app/src/main/java/com/example/idiotchefassistant/login/LoginRepository.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/login/LoginRepository.kt
@@ -1,37 +1,128 @@
 package com.example.idiotchefassistant.login
 
-import com.example.idiotchefassistant.data.model.LoggedInUser
-
-class LoginRepository(val dataSource: LoginDataSource) {
-    // in-memory cache of the loggedInUser object
-    var user: LoggedInUser? = null
-        private set
-    val isLoggedIn: Boolean
-        get() = user != null
-
-    init {
-        // If user credentials will be cached in local storage, it is recommended it be encrypted
-        // @see https://developer.android.com/training/articles/keystore
-        user = null
+import android.content.Context
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import com.example.idiotchefassistant.AuthTokenManager
+import com.example.idiotchefassistant.LoginRequestBody
+import com.example.idiotchefassistant.LoginResponse
+import com.example.idiotchefassistant.MessageResponse
+import com.example.idiotchefassistant.MyApp
+import com.example.idiotchefassistant.UserResponse
+import com.example.idiotchefassistant.userDataService
+import com.example.idiotchefassistant.userService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class LoginRepository(private val authTokenManager: AuthTokenManager, private val context: Context) {
+    private var scope: CoroutineScope? = null
+    val message = MutableLiveData<String>()
+    val user = MutableLiveData<UserResponse>()
+
+    fun login(username: String, password: String) {
+        val body = LoginRequestBody(username, password)
+        userService.login(body).enqueue(
+            object : Callback<LoginResponse> {
+                override fun onResponse(
+                    call: Call<LoginResponse>,
+                    response: Response<LoginResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        response.body()?.let { responseBody ->
+                            scope?.launch {
+                                authTokenManager.saveAuthToken(context, responseBody.token)
+                                authTokenManager.authToken.collect { token ->
+                                    if (token != null)
+                                        Log.i("Login Service", "Login success: $token")
+                                    else
+                                        Log.i("Login Service", "No token available")
+                                }
+                            }
+                        }
+                        message.postValue("登入成功")
+                        MyApp.setLogin(true)
+                    } else if (response.code() == 401) {
+                        val errorMessage = "該名稱與信箱錯誤或密碼錯誤"
+                        Log.e("Login Service", errorMessage)
+                        message.postValue("登入失敗: $errorMessage")
+                    } else {
+                        Log.i(
+                            "Login Service",
+                            "API Failed:${response.code()} ${response.message()}"
+                        )
+                        message.postValue("登入失敗")
+                    }
+                }
+
+                override fun onFailure(call: Call<LoginResponse>, t: Throwable) {
+                    Log.e("Login Service", "API call failed: ${t.message}")
+                    message.postValue("登入失敗")
+                }
+            }
+        )
     }
 
     fun logout() {
-        user = null
-        dataSource.logout()
+        userDataService.logout().enqueue(
+            object : Callback<MessageResponse> {
+                override fun onResponse(
+                    call: Call<MessageResponse>,
+                    response: Response<MessageResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        response.body()?.let {
+                            scope?.launch {
+                                authTokenManager.clearAuthToken(context)
+                            }
+                        }
+                        message.postValue("登出成功")
+                        MyApp.setLogin(false)
+                    } else {
+                        Log.i(
+                            "Logout Service",
+                            "API Failed:${response.code()} ${response.message()}"
+                        )
+                        message.postValue("登出失敗")
+                    }
+                }
+
+                override fun onFailure(call: Call<MessageResponse>, t: Throwable) {
+                    Log.e("Logout Service", "API call failed: ${t.message}")
+                    message.postValue("登出失敗")
+                }
+            }
+        )
     }
 
-    fun login(username: String, password: String): Result<LoggedInUser> {
-        // handle login
-        val result = dataSource.login(username, password)
-        if (result is Result.Success) {
-            setLoggedInUser(result.data)
-        }
-        return result
+    fun me() {
+        userDataService.me().enqueue(
+            object : Callback<UserResponse> {
+                override fun onResponse(
+                    call: Call<UserResponse>,
+                    response: Response<UserResponse>
+                ) {
+                    if (response.isSuccessful) {
+                        response.body()?.let {
+                            val data = UserResponse(it.email, it.level, it.username)
+                            user.postValue(data)
+                            Log.i("User Service", "Me: $it")
+                        }
+                    } else
+                        Log.i("User Service", "API Failed:${response.code()} ${response.message()}")
+                }
+
+                override fun onFailure(call: Call<UserResponse>, t: Throwable) {
+                    Log.e("User Service", "API call failed: ${t.message}")
+                }
+            }
+        )
     }
 
-    private fun setLoggedInUser(loggedInUser: LoggedInUser) {
-        this.user = loggedInUser
-        // If user credentials will be cached in local storage, it is recommended it be encrypted
-        // @see https://developer.android.com/training/articles/keystore
+    fun setScope(scope: CoroutineScope) {
+        this.scope = scope
     }
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/LoginResult.kt b/app/src/main/java/com/example/idiotchefassistant/login/LoginResult.kt
deleted file mode 100644
index c40ee4b..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/login/LoginResult.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.idiotchefassistant.login
-
-/**
- * Authentication result : success (user details) or error message.
- */
-data class LoginResult(
-    val success: LoggedInUserView? = null,
-    val error: Int? = null
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModel.kt b/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModel.kt
index e2bc18a..9bb68ef 100644
--- a/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModel.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModel.kt
@@ -3,24 +3,34 @@ package com.example.idiotchefassistant.login
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.example.idiotchefassistant.AuthTokenManager
 import com.example.idiotchefassistant.R
+import com.example.idiotchefassistant.UserResponse
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 
 class LoginViewModel(private val loginRepository: LoginRepository) : ViewModel() {
 
     private val _loginForm = MutableLiveData<LoginFormState>()
     val loginFormState: LiveData<LoginFormState> = _loginForm
+    val loginResult: LiveData<String> = loginRepository.message
+    val user: LiveData<UserResponse> = loginRepository.user
 
-    private val _loginResult = MutableLiveData<LoginResult>()
-    val loginResult: LiveData<LoginResult> = _loginResult
+    private val viewModelScope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+
+    init {
+        loginRepository.setScope(viewModelScope)
+    }
 
     fun login(username: String, password: String) {
-        val result = loginRepository.login(username, password)
-        if (result is Result.Success) {
-            _loginResult.value =
-                LoginResult(success = LoggedInUserView(displayName = result.data.displayName))
-        } else {
-            _loginResult.value = LoginResult(error = R.string.login_failed)
-        }
+        loginRepository.login(username, password)
+        loginRepository.me()
+    }
+
+    fun logout(){
+        loginRepository.logout()
     }
 
     fun loginDataChanged(username: String, password: String) {
@@ -46,4 +56,9 @@ class LoginViewModel(private val loginRepository: LoginRepository) : ViewModel()
     private fun isPasswordValid(password: String): Boolean {
         return password.length > 5
     }
+
+    override fun onCleared() {
+        super.onCleared()
+        viewModelScope.cancel()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModelFactory.kt b/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModelFactory.kt
index d2b7c32..a3d35dd 100644
--- a/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModelFactory.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/login/LoginViewModelFactory.kt
@@ -1,18 +1,18 @@
 package com.example.idiotchefassistant.login
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import com.example.idiotchefassistant.AuthTokenManager
 
-class LoginViewModelFactory : ViewModelProvider.Factory {
+class LoginViewModelFactory(private val context: Context) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         if (modelClass.isAssignableFrom(LoginViewModel::class.java)) {
-            return LoginViewModel(
-                loginRepository = LoginRepository(
-                    dataSource = LoginDataSource()
-                )
-            ) as T
+            val authTokenManager = AuthTokenManager
+            val loginRepository = LoginRepository(authTokenManager, context)
+            return LoginViewModel(loginRepository) as T
         }
         throw IllegalArgumentException("Unknown ViewModel class")
     }
diff --git a/app/src/main/java/com/example/idiotchefassistant/login/Result.kt b/app/src/main/java/com/example/idiotchefassistant/login/Result.kt
index e719eca..58ff1cf 100644
--- a/app/src/main/java/com/example/idiotchefassistant/login/Result.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/login/Result.kt
@@ -1,9 +1,5 @@
 package com.example.idiotchefassistant.login
 
-/**
- * A generic class that holds a value with its loading status.
- * @param <T>
- */
 sealed class Result<out T : Any> {
 
     data class Success<out T : Any>(val data: T) : Result<T>()
diff --git a/app/src/main/java/com/example/idiotchefassistant/mainLayout/AboutUsPage.kt b/app/src/main/java/com/example/idiotchefassistant/mainLayout/AboutUsPage.kt
new file mode 100644
index 0000000..dc2d57e
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/mainLayout/AboutUsPage.kt
@@ -0,0 +1,62 @@
+package com.example.idiotchefassistant.mainLayout
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.example.idiotchefassistant.databinding.FragmentAboutUsPageBinding
+import com.example.idiotchefassistant.databinding.FragmentInformationPageBinding
+import java.util.Locale
+
+class AboutUsPage : Fragment() {
+    private var _binding: FragmentAboutUsPageBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentAboutUsPageBinding.inflate(inflater, container, false)
+        val view = binding.root
+
+        binding.yt1.setOnClickListener{
+            openYoutube(context = requireContext(), "https://www.youtube.com/@christable0202")
+        }
+        binding.yt2.setOnClickListener{
+            openYoutube(context = requireContext(), "https://www.youtube.com/@RosalinaKitchen")
+        }
+        binding.yt3.setOnClickListener{
+            openYoutube(context = requireContext(), "https://www.youtube.com/@menustudy")
+        }
+
+        return view
+    }
+
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    private fun openYoutube(context: Context, url: String) {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+
+        // 检查是否有应用可以处理这个意图
+        val resolveInfo = context.packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
+        if (resolveInfo?.activityInfo?.packageName?.lowercase(Locale.ROOT)?.contains("youtube") == true) {
+            context.startActivity(intent)
+        } else {
+            // 没有 YouTube 应用，使用浏览器打开
+            val webIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            webIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(webIntent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/CameraPage.kt b/app/src/main/java/com/example/idiotchefassistant/mainLayout/CameraPage.kt
similarity index 98%
rename from app/src/main/java/com/example/idiotchefassistant/CameraPage.kt
rename to app/src/main/java/com/example/idiotchefassistant/mainLayout/CameraPage.kt
index c558f20..e40d636 100644
--- a/app/src/main/java/com/example/idiotchefassistant/CameraPage.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/mainLayout/CameraPage.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant
+package com.example.idiotchefassistant.mainLayout
 
 import android.Manifest
 import android.content.Intent
@@ -19,7 +19,7 @@ import androidx.camera.core.Preview
 import androidx.camera.core.CameraSelector
 import android.util.Log
 import android.util.Size
-import com.example.idiotchefassistant.resultBlock.ResultPage
+import com.example.idiotchefassistant.result.ResultPage
 import com.example.idiotchefassistant.databinding.ActivityCameraPageBinding
 import java.io.File
 import java.text.SimpleDateFormat
@@ -46,7 +46,8 @@ class CameraPage : AppCompatActivity() {
             initializeCamera()
         } else {
             ActivityCompat.requestPermissions(
-                this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS)
+                this, REQUIRED_PERMISSIONS, REQUEST_CODE_PERMISSIONS
+            )
         }
         // Set up the listeners for take photo and video capture buttons
         viewBinding.captureButton.setOnClickListener { capturePhotos() }
diff --git a/app/src/main/java/com/example/idiotchefassistant/mainLayout/HistoryPage.kt b/app/src/main/java/com/example/idiotchefassistant/mainLayout/HistoryPage.kt
new file mode 100644
index 0000000..e463804
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/mainLayout/HistoryPage.kt
@@ -0,0 +1,100 @@
+package com.example.idiotchefassistant.mainLayout
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.idiotchefassistant.MyApp
+import com.example.idiotchefassistant.databinding.FragmentHistoryPageBinding
+import com.example.idiotchefassistant.login.LoginActivity
+import com.example.idiotchefassistant.recipe.RecipeItem
+import com.example.idiotchefassistant.recipe.RecipeItemAdapter
+import com.example.idiotchefassistant.recipe.RecipePage
+import com.example.idiotchefassistant.userDataService
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class HistoryPage : Fragment(), RecipeItemAdapter.OnItemClickListener {
+    private var _binding: FragmentHistoryPageBinding? = null
+    private val binding get() = _binding!!
+    private val _historyItems = MutableLiveData<List<RecipeItem>>()
+    private var historyItems: LiveData<List<RecipeItem>> = _historyItems
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentHistoryPageBinding.inflate(inflater, container, false)
+        val view = binding.root
+
+        val items = arrayListOf<RecipeItem>()
+        val recycleView = binding.RecipeRecycleView
+        recycleView.layoutManager = LinearLayoutManager(requireContext())
+
+        val adapter = RecipeItemAdapter(items)
+        adapter.setOnItemClickListener(this)
+        recycleView.adapter = adapter
+
+        historyItems.observe(viewLifecycleOwner){ data ->
+            items.clear()
+            items.addAll(data)
+            adapter.notifyDataSetChanged()
+        }
+        val remind = binding.remindBlock
+        binding.login.setOnClickListener{
+            val intent = Intent(activity, LoginActivity::class.java)
+            startActivity(intent)
+        }
+        MyApp.isLogin.observe(viewLifecycleOwner) { isLoggedIn ->
+            recycleView.isVisible = isLoggedIn
+            if (isLoggedIn)
+                history()
+            remind.isVisible = !isLoggedIn
+        }
+        return view
+    }
+
+    private fun history(){
+        userDataService.history().enqueue(object :
+            Callback<List<RecipeItem>> {
+            override fun onResponse(
+                call: Call<List<RecipeItem>>,
+                response: Response<List<RecipeItem>>
+            ) {
+                if (response.isSuccessful) {
+                    _historyItems.value = response.body()
+                    Log.i("userHistory","Success:${response.body().toString()}")
+                } else {
+                    Log.i("userHistory","Failed:${response.code()} ${response.message()}")
+                    _historyItems.value = emptyList()
+                }
+            }
+
+            override fun onFailure(call: Call<List<RecipeItem>>, t: Throwable) {
+                Log.e("userHistory", "API call failed: ${t.message}")
+                _historyItems.value = emptyList()
+            }
+        })
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    override fun onItemClick(item: RecipeItem) {
+        val intent = Intent(activity, RecipePage::class.java)
+            .putExtra("rid", item.rid)
+        Log.i("rid","rid is: ${item.rid}")
+        startActivity(intent)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/mainLayout/HomePage.kt b/app/src/main/java/com/example/idiotchefassistant/mainLayout/HomePage.kt
new file mode 100644
index 0000000..305bdc3
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/mainLayout/HomePage.kt
@@ -0,0 +1,97 @@
+package com.example.idiotchefassistant.mainLayout
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.example.idiotchefassistant.databinding.FragmentHomePageBinding
+import com.example.idiotchefassistant.recipe.RecipeItem
+import com.example.idiotchefassistant.recipe.RecipeItemAdapter
+import com.example.idiotchefassistant.recipe.RecipePage
+import com.example.idiotchefassistant.userDataService
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class HomePage : Fragment(), RecipeItemAdapter.OnItemClickListener {
+    private var _binding: FragmentHomePageBinding? = null
+    private val binding get() = _binding!!
+    private val _recommendItems = MutableLiveData<List<RecipeItem>>()
+    private var recommendItems: LiveData<List<RecipeItem>> = _recommendItems
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentHomePageBinding.inflate(inflater, container, false)
+        val view = binding.root
+
+        binding.CameraBtn.setOnClickListener {
+            val intent = Intent(activity, CameraPage::class.java)
+            startActivity(intent)
+        }
+
+        val items = arrayListOf<RecipeItem>()
+        val recycleView = binding.RecipeRecycleView
+        recycleView.layoutManager = LinearLayoutManager(requireContext())
+
+        val adapter = RecipeItemAdapter(items)
+        adapter.setOnItemClickListener(this)
+        recycleView.adapter = adapter
+
+        recommendItems.observe(viewLifecycleOwner){ data ->
+            items.clear()
+            items.addAll(data)
+            adapter.notifyDataSetChanged()
+        }
+
+        recommend()
+
+        return view
+    }
+
+    private fun recommend(){
+        userDataService.recommend().enqueue(
+            object : Callback<List<RecipeItem>> {
+                override fun onResponse(
+                    call: Call<List<RecipeItem>>,
+                    response: Response<List<RecipeItem>>
+                ) {
+                    if (response.isSuccessful) {
+                        _recommendItems.postValue(response.body())
+                        Log.i("UserRecommend","Success:${response.body().toString()}")
+
+                    } else{
+                        _recommendItems.postValue(emptyList())
+                        Log.i("UserRecommend", "API Failed:${response.code()} ${response.message()}")
+                    }
+                }
+
+                override fun onFailure(call: Call<List<RecipeItem>>, t: Throwable) {
+                    _recommendItems.postValue(emptyList())
+                    Log.e("UserRecommend", "API call failed: ${t.message}")
+                }
+            }
+        )
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    override fun onItemClick(item: RecipeItem){
+        val intent = Intent(activity, RecipePage::class.java)
+            .putExtra("rid", item.rid)
+        Log.i("rid","rid is: ${item.rid}")
+        startActivity(intent)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/mainLayout/InfoPage.kt b/app/src/main/java/com/example/idiotchefassistant/mainLayout/InfoPage.kt
new file mode 100644
index 0000000..b105738
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/mainLayout/InfoPage.kt
@@ -0,0 +1,90 @@
+package com.example.idiotchefassistant.mainLayout
+
+import android.content.Intent
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.example.idiotchefassistant.MyApp
+import com.example.idiotchefassistant.UserResponse
+import com.example.idiotchefassistant.databinding.FragmentInformationPageBinding
+import com.example.idiotchefassistant.login.LoginActivity
+import com.example.idiotchefassistant.userDataService
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class InfoPage : Fragment() {
+    private var _binding: FragmentInformationPageBinding? = null
+    private val binding get() = _binding!!
+    private val _userData = MutableLiveData<UserResponse>()
+    private var userData: LiveData<UserResponse> = _userData
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentInformationPageBinding.inflate(inflater, container, false)
+        val view = binding.root
+
+        val info = binding.userData
+        val remind = binding.remindBlock
+        val email = binding.email
+        val name = binding.name
+        val login = binding.login
+
+        login.setOnClickListener{
+            val intent = Intent(activity, LoginActivity::class.java)
+            startActivity(intent)
+        }
+        MyApp.isLogin.observe(viewLifecycleOwner) { isLoggedIn ->
+            info.isVisible = isLoggedIn
+            if (isLoggedIn)
+                me()
+            remind.isVisible = !isLoggedIn
+        }
+
+        userData.observe(viewLifecycleOwner){ data ->
+            email.text = data.email
+            name.text = data.username
+        }
+
+        return view
+    }
+
+    private fun me(){
+        userDataService.me().enqueue(object :
+            Callback<UserResponse> {
+            override fun onResponse(
+                call: Call<UserResponse>,
+                response: Response<UserResponse>
+            ) {
+                if (response.isSuccessful) {
+                    _userData.value = response.body()
+                    Log.i("userHistory","Success:${response.body().toString()}")
+                } else {
+                    Log.i("userHistory","Failed:${response.code()} ${response.message()}")
+                    _userData.value = UserResponse("", 0, "")
+                }
+            }
+
+            override fun onFailure(call: Call<UserResponse>, t: Throwable) {
+                Log.e("userHistory", "API call failed: ${t.message}")
+                _userData.value = UserResponse("", 0, "")
+            }
+        })
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/MainActivity.kt b/app/src/main/java/com/example/idiotchefassistant/mainLayout/MainActivity.kt
similarity index 62%
rename from app/src/main/java/com/example/idiotchefassistant/MainActivity.kt
rename to app/src/main/java/com/example/idiotchefassistant/mainLayout/MainActivity.kt
index f4a0147..48275c4 100644
--- a/app/src/main/java/com/example/idiotchefassistant/MainActivity.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/mainLayout/MainActivity.kt
@@ -1,23 +1,34 @@
-package com.example.idiotchefassistant
+package com.example.idiotchefassistant.mainLayout
 
+import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
-import com.example.idiotchefassistant.searchBlock.SearchPage
+import androidx.lifecycle.ViewModelProvider
+import com.example.idiotchefassistant.AuthTokenManager
+import com.example.idiotchefassistant.MyApp
+import com.example.idiotchefassistant.R
+import com.example.idiotchefassistant.search.SearchPage
 import com.example.idiotchefassistant.databinding.ActivityMainBinding
 import com.example.idiotchefassistant.login.LoginActivity
+import com.example.idiotchefassistant.login.LoginViewModel
+import com.example.idiotchefassistant.login.LoginViewModelFactory
 import com.google.android.material.navigation.NavigationView
 
 class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
     private lateinit var binding: ActivityMainBinding
     private lateinit var drawerLayout: DrawerLayout
+    private lateinit var loginViewModel: LoginViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -28,8 +39,17 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         val toolbar = binding.toolbar
         setSupportActionBar(toolbar)
 
+        loginViewModel = ViewModelProvider(
+            this,
+            LoginViewModelFactory(applicationContext)
+        )[LoginViewModel::class.java]
+
+        if (AuthTokenManager.getAuthTokenSync() != null)
+            MyApp.setLogin(true)
+
         drawerLayout = binding.drawerLayout
         val navigationView = binding.navView
+        val menu = navigationView.menu
         navigationView.setNavigationItemSelectedListener(this)
         val toggle = ActionBarDrawerToggle(
             this, drawerLayout, toolbar, R.string.open_nav, R.string.close_nav
@@ -37,6 +57,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         drawerLayout.addDrawerListener(toggle)
         toggle.syncState()
 
+        MyApp.isLogin.observe(this) { isLoggedIn ->
+            menu.findItem(R.id.nav_login).isVisible = !isLoggedIn
+            menu.findItem(R.id.nav_logout).isVisible = isLoggedIn
+        }
+
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                 .replace(R.id.fragment_container, HomePage()).commit()
@@ -80,21 +105,41 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                 .replace(R.id.fragment_container, HomePage()).commit()
 
             R.id.nav_history -> supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, HomePage()).commit()
+                .replace(R.id.fragment_container, HistoryPage()).commit()
 
-            R.id.nav_info -> supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, HomePage()).commit()
+            R.id.nav_about -> supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, AboutUsPage()).commit()
 
-            R.id.nav_setting -> supportFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, SettingsFragment()).commit()
+            R.id.nav_info -> supportFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, InfoPage()).commit()
 
             R.id.nav_login -> {
                 val intent = Intent(this, LoginActivity::class.java)
                 startActivity(intent)
             }
+
+            R.id.nav_logout -> {
+                logout()
+            }
         }
         drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
 
+    private fun logout() {
+        AlertDialog.Builder(this)
+            .setTitle("登出確認")
+            .setMessage("你確定要登出嗎?")
+            .setPositiveButton("Yes") { _, _ ->
+                loginViewModel.logout()
+                loginViewModel.loginResult.observe(this) { result ->
+                    Toast.makeText(applicationContext, result, Toast.LENGTH_SHORT).show()
+                    if (result.contains("登出")) {
+                        setResult(Activity.RESULT_OK)
+                    }
+                }
+            }
+            .setNegativeButton("No", null)
+            .show()
+    }
 }
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipe/PostCommentPage.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/PostCommentPage.kt
new file mode 100644
index 0000000..28a78aa
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/PostCommentPage.kt
@@ -0,0 +1,81 @@
+package com.example.idiotchefassistant.recipe
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RatingBar
+import androidx.fragment.app.DialogFragment
+import com.example.idiotchefassistant.databinding.FragmentPostCommentBinding
+import com.example.idiotchefassistant.recipeAddTokenService
+import com.example.idiotchefassistant.recipeService
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class PostCommentPage : DialogFragment() {
+    private var _binding: FragmentPostCommentBinding? = null
+    private val binding get() = _binding!!
+
+    @SuppressLint("SetTextI18n")
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentPostCommentBinding.inflate(inflater, container, false)
+        val view = binding.root
+        val rating = binding.reviewStar
+        val comment = binding.commentBlock
+        val close = binding.closeButton
+        val upload = binding.uploadButton
+        val rid = arguments?.getInt("rid", 0) ?: 0
+
+        rating.onRatingBarChangeListener = RatingBar.OnRatingBarChangeListener { ratingBar, star, fromUser ->
+            if (fromUser) {
+                val roundedRate = Math.round(star)
+                ratingBar.rating = roundedRate.toFloat()
+            }
+        }
+
+        close.setOnClickListener{
+            dismiss()
+        }
+
+        upload.setOnClickListener{
+            post(rid, comment.text.toString(), rating.rating.toInt())
+            dismiss()
+        }
+
+        return view
+    }
+
+    private fun post(rid: Int, content: String, rate: Int){
+        Log.i("postComment","Content:$rid $content $rate")
+        val body = CommentBody(rid, content, rate)
+        recipeAddTokenService.postComment(body).enqueue(object :
+            Callback<MessageBody> {
+            override fun onResponse(
+                call: Call<MessageBody>,
+                response: Response<MessageBody>
+            ) {
+                if (response.isSuccessful) {
+                    Log.i("postComment","Success:${response.body().toString()}")
+                } else {
+                    Log.i("postComment","Failed:${response.code()} ${response.message()}")
+                }
+            }
+
+            override fun onFailure(call: Call<MessageBody>, t: Throwable) {
+                Log.e("postComment", "API call failed: ${t.message}")
+            }
+        })
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
+
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeAPI.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeAPI.kt
new file mode 100644
index 0000000..ef1e449
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeAPI.kt
@@ -0,0 +1,29 @@
+package com.example.idiotchefassistant.recipe
+
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+data class CommentBody(
+    val rid: Int,
+    val content: String,
+    val rate: Int
+)
+
+data class MessageBody(
+    val message: String
+)
+
+interface RecipeAPI {
+    @GET("/recipes/content/{rid}")
+    fun getRecipeContent(
+        @Path("rid") rid: Int
+    ): Call<RecipeData>
+
+    @POST("/recipes/comment")
+    fun postComment(
+        @Body commentBody: CommentBody
+    ): Call<MessageBody>
+}
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeCommentsAdapter.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeCommentsAdapter.kt
new file mode 100644
index 0000000..4bad9a0
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeCommentsAdapter.kt
@@ -0,0 +1,33 @@
+package com.example.idiotchefassistant.recipe
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.RatingBar
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.example.idiotchefassistant.R
+
+class RecipeCommentsAdapter(private var items: List<Comment>) :
+    RecyclerView.Adapter<RecipeCommentsAdapter.ViewHolder>() {
+
+    inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val name: TextView = view.findViewById(R.id.user_name)
+        val rate: RatingBar = view.findViewById(R.id.user_rating)
+        val content: TextView = view.findViewById(R.id.user_comment)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.recipe_comment_item, parent, false)
+        return ViewHolder(view)
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.name.text = items[position].username
+        holder.rate.rating = items[position].score.toFloat()
+        holder.content.text = items[position].content
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeData.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeData.kt
similarity index 72%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeData.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeData.kt
index eeea740..61df915 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeData.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeData.kt
@@ -1,18 +1,18 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 class RecipeData {
     val title: String = "Unknown"
-    //    val author: String,
     val description: String? = null
     val video: String? = null
-    val rtype: String? = null
     val score: Float = 0.toFloat()
+    val rtype: String? = null
+    val author: String? = null
     val comments: ArrayList<Comment>? = null
     val iids: ArrayList<Int> = arrayListOf()
 }
 
 data class Comment(
-    val name: String,
+    val username: String,
     val content: String,
-    val review: Int
+    val score: Int
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeFactory.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeFactory.kt
similarity index 91%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeFactory.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeFactory.kt
index f364a37..885e7e9 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeFactory.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeFactory.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeIngredientsAdapter.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeIngredientsAdapter.kt
similarity index 94%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeIngredientsAdapter.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeIngredientsAdapter.kt
index a7bdcd6..52252be 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeIngredientsAdapter.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeIngredientsAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeItem.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeItem.kt
similarity index 79%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeItem.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeItem.kt
index 01009c5..28b062f 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeItem.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeItem.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -8,7 +8,7 @@ data class RecipeItem(
     val rid:Int,
     val title:String,
     val link:String,
-    val score:Int
+    val score:Float
 ): Parcelable
 
 //data class CommitItem(val userImg: Int, val userName:String, val context:String, val review:Int)
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeItemAdapter.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeItemAdapter.kt
similarity index 92%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeItemAdapter.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeItemAdapter.kt
index 951cc9f..5f0fdff 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeItemAdapter.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeItemAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import android.util.Log
 import android.view.LayoutInflater
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import com.example.idiotchefassistant.R
 import com.example.idiotchefassistant.databinding.RecipeItemListBinding
+import java.text.DecimalFormat
 
 class RecipeItemAdapter(private var items: List<RecipeItem>) :
     RecyclerView.Adapter<RecipeItemAdapter.ViewHolder>() {
@@ -28,8 +29,9 @@ class RecipeItemAdapter(private var items: List<RecipeItem>) :
 
         fun bind(item: RecipeItem) {
             binding.itemTitle.text = item.title
-            binding.itemReview.text = item.score.toString()
-            val videoId = item.link?.let {
+            val df = DecimalFormat("#.#")
+            binding.itemReview.text = df.format(item.score)
+            val videoId = item.link.let {
                 val regex = "https?://(?:www\\.)?youtube\\.com/watch\\?v=([\\w-]+)".toRegex()
                 val matchResult = regex.find(it)
                 matchResult?.groups?.get(1)?.value
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipePage.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipePage.kt
similarity index 66%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipePage.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipePage.kt
index 1ca24fb..cd30086 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipePage.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipePage.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import android.content.Context
 import android.content.Intent
@@ -6,13 +6,16 @@ import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import coil.load
+import com.example.idiotchefassistant.MyApp
 import com.example.idiotchefassistant.R
 import com.example.idiotchefassistant.databinding.ActivityRecipePageBinding
+import java.text.DecimalFormat
 import java.util.Locale
 
 class RecipePage : AppCompatActivity() {
@@ -33,11 +36,20 @@ class RecipePage : AppCompatActivity() {
 
         // get recipe content
         val rid = intent.getIntExtra("rid", -1)
-        recipeViewModel.getData(rid)
+        MyApp.isLogin.observe(this) { isLoggedIn ->
+            if (isLoggedIn){
+                recipeViewModel.getDataInLogin(rid)
+            }
+            else{
+                recipeViewModel.getData(rid)
+            }
+        }
 
         recipeViewModel.callBack().observe(this) { data ->
             Log.d("SearchPage", "Received items: $data")
+            // name
             binding.recipeName.text = data?.title ?: "Unknown"
+            // video link
             val imageLink = recipeViewModel.link2Image(data?.video)
             binding.recipeImage.load(imageLink)
             imageLink.let {
@@ -49,15 +61,41 @@ class RecipePage : AppCompatActivity() {
             binding.recipeImage.setOnClickListener{
                 openYoutube(this, data.video.toString())
             }
+            // score
             val floatValue: Float = (data?.score ?: 0).toFloat()
-            binding.recipeReviewNum.text = floatValue.toString()
+            val df = DecimalFormat("#.#")
+            binding.recipeReviewNum.text = df.format(floatValue)
             binding.recipeReviewStar.rating = floatValue
-            // create ingredients adapter
+            // author
+            binding.author.text = data?.author ?: "Unknown"
+            // ingredients
             recipeViewModel.getIngredients(data.iids).observe(this) { ingredients ->
                 val adapter = RecipeIngredientsAdapter(ingredients)
                 binding.ingredients.layoutManager = LinearLayoutManager(this)
                 binding.ingredients.adapter = adapter
             }
+            // comments
+            val items = data.comments?.toList()
+            val adapter = items?.let { RecipeCommentsAdapter(it) }
+            binding.comments.layoutManager = LinearLayoutManager(this)
+            binding.comments.adapter = adapter
+            Log.i("recipe comment", "${data.comments}")
+        }
+
+        // comments
+        binding.postButton.setOnClickListener{
+            MyApp.isLogin.observe(this) { isLoggedIn ->
+                if (isLoggedIn) {
+                    val dialog = PostCommentPage()
+                    val bundle = Bundle()
+                    bundle.putInt("rid", rid)
+                    dialog.arguments = bundle
+                    dialog.show(supportFragmentManager, "PostCommentPage")
+                }
+                else {
+                    Toast.makeText(this, "Please log in to post comments", Toast.LENGTH_SHORT).show()
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeRepository.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeRepository.kt
similarity index 65%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeRepository.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeRepository.kt
index 6f06e7c..a64538e 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeRepository.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeRepository.kt
@@ -1,10 +1,11 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.example.idiotchefassistant.ingredientService
-import com.example.idiotchefassistant.ingredientsBlock.IngredientItem
+import com.example.idiotchefassistant.ingredients.IngredientItem
+import com.example.idiotchefassistant.recipeAddTokenService
 import com.example.idiotchefassistant.recipeService
 import retrofit2.Call
 import retrofit2.Callback
@@ -31,6 +32,33 @@ class RecipeRepository {
             ){
                 if(response.isSuccessful){
                     liveData.postValue(response.body())
+                    Log.i("getRecipeContent", "Success:$rid ${response.body()?.iids} ${response.body()?.score}")
+                }
+                else{
+                    liveData.postValue(RecipeData())
+                    Log.e("getRecipeContent", "Failed:${response.code()} ${response.message()}")
+                }
+            }
+
+            override fun onFailure(call: Call<RecipeData>, t: Throwable){
+                Log.e("getRecipeContent", "API call failed: ${t.message}")
+                liveData.postValue(RecipeData())
+            }
+        })
+        return liveData
+    }
+
+    fun getRecipeContentIsLogin(rid: Int): LiveData<RecipeData>{
+        val liveData = MutableLiveData<RecipeData>()
+        recipeAddTokenService.getRecipeContent(rid).enqueue(object: Callback<RecipeData> {
+            override fun onResponse(
+                call: Call<RecipeData>,
+                response: Response<RecipeData>
+            ){
+                if(response.isSuccessful){
+                    val result = response.body()
+                    liveData.postValue(response.body())
+                    Log.i("getRecipeContent", "Success:$rid ${result?.iids} ${result?.score} ${result?.author} ${result?.comments}")
                 }
                 else{
                     liveData.postValue(RecipeData())
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeViewModel.kt b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeViewModel.kt
similarity index 90%
rename from app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeViewModel.kt
rename to app/src/main/java/com/example/idiotchefassistant/recipe/RecipeViewModel.kt
index c76cfbe..cdf063f 100644
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeViewModel.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/recipe/RecipeViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.recipeBlock
+package com.example.idiotchefassistant.recipe
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -22,6 +22,12 @@ class RecipeViewModel(private var recipeRepository: RecipeRepository):ViewModel(
         }
     }
 
+    fun getDataInLogin(rid: Int) {
+        recipeRepository.getRecipeContentIsLogin(rid).observeForever { r ->
+            userLiveData.postValue(r)
+        }
+    }
+
     fun getIngredients(ids: ArrayList<Int>): LiveData<List<String>>{
         val liveData = MutableLiveData<List<String>>()
         recipeRepository.getIngredients().observeForever{ list ->
diff --git a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeAPI.kt b/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeAPI.kt
deleted file mode 100644
index ccb0665..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/recipeBlock/RecipeAPI.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.idiotchefassistant.recipeBlock
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface RecipeAPI {
-    @GET("/recipes/content/{rid}")
-    fun getRecipeContent(
-        @Path("rid") rid: Int
-    ): Call<RecipeData>
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/register/RegisterData.kt b/app/src/main/java/com/example/idiotchefassistant/register/RegisterData.kt
index 9c549da..bb4f711 100644
--- a/app/src/main/java/com/example/idiotchefassistant/register/RegisterData.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/register/RegisterData.kt
@@ -1,7 +1,5 @@
 package com.example.idiotchefassistant.register
 
-import android.provider.ContactsContract.CommonDataKinds.Email
-
 data class RegisterData (
     val name: String,
     val email: String,
diff --git a/app/src/main/java/com/example/idiotchefassistant/register/RegisterPage.kt b/app/src/main/java/com/example/idiotchefassistant/register/RegisterPage.kt
index 1f5e07c..b998448 100644
--- a/app/src/main/java/com/example/idiotchefassistant/register/RegisterPage.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/register/RegisterPage.kt
@@ -48,18 +48,14 @@ class RegisterPage : AppCompatActivity() {
             }
         })
 
-        registerViewModel.registerResult.observe(this@RegisterPage, Observer {
-            val registerResult = it ?: return@Observer
+        registerViewModel.registerResult.observe(this@RegisterPage) { result ->
             loading.visibility = View.GONE
-            if (registerResult.isEmpty()) {
-                Toast.makeText(applicationContext, registerResult, Toast.LENGTH_SHORT).show()
+            Toast.makeText(applicationContext, result, Toast.LENGTH_SHORT).show()
+            if (result.contains("註冊")) {
+                setResult(Activity.RESULT_OK)
+                finish()
             }
-            if (registerResult.isNotEmpty()) {
-                Toast.makeText(applicationContext, registerResult, Toast.LENGTH_SHORT).show()
-            }
-            setResult(Activity.RESULT_OK)
-            finish()
-        })
+        }
 
         username.afterTextChanged {
             val infoData = RegisterData(
@@ -92,23 +88,36 @@ class RegisterPage : AppCompatActivity() {
         }
 
         passwordRetype.apply {
-            val infoData = RegisterData(
-                username.text.toString(),
-                email.text.toString(),
-                password.text.toString(),
-                passwordRetype.text.toString()
-            )
             afterTextChanged {
+                val infoData = RegisterData(
+                    username.text.toString(),
+                    email.text.toString(),
+                    password.text.toString(),
+                    passwordRetype.text.toString()
+                )
                 registerViewModel.registerDataChange(infoData)
             }
             setOnEditorActionListener { _, actionId, _ ->
                 when (actionId) {
-                    EditorInfo.IME_ACTION_DONE ->
+                    EditorInfo.IME_ACTION_DONE -> {
+                        val infoData = RegisterData(
+                            username.text.toString(),
+                            email.text.toString(),
+                            password.text.toString(),
+                            passwordRetype.text.toString()
+                        )
                         registerViewModel.register(infoData)
+                    }
                 }
                 false
             }
             register.setOnClickListener {
+                val infoData = RegisterData(
+                    username.text.toString(),
+                    email.text.toString(),
+                    password.text.toString(),
+                    passwordRetype.text.toString()
+                )
                 loading.visibility = View.VISIBLE
                 registerViewModel.register(infoData)
             }
diff --git a/app/src/main/java/com/example/idiotchefassistant/register/RegisterRepository.kt b/app/src/main/java/com/example/idiotchefassistant/register/RegisterRepository.kt
index 32c7220..3ef1abf 100644
--- a/app/src/main/java/com/example/idiotchefassistant/register/RegisterRepository.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/register/RegisterRepository.kt
@@ -1,37 +1,43 @@
 package com.example.idiotchefassistant.register
 
 import android.util.Log
-import com.example.idiotchefassistant.data.retrofit.endpoints.MessageResponse
-import com.example.idiotchefassistant.data.retrofit.endpoints.RegisterRequestBody
+import androidx.lifecycle.MutableLiveData
+import com.example.idiotchefassistant.MessageResponse
+import com.example.idiotchefassistant.RegisterRequestBody
 import com.example.idiotchefassistant.userService
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
 class RegisterRepository {
-    var data: RegisterData? = null
+    val message = MutableLiveData<String>()
 
-    fun register(data: RegisterData): MessageResponse{
-        var result = MessageResponse(String())
-        val registerRequestBody = RegisterRequestBody(data.name, data.email, data.password)
+    fun register(data: RegisterData){
+        val registerRequestBody = RegisterRequestBody(data.name, data.password, data.email)
         userService.register(registerRequestBody).enqueue(
             object : Callback<MessageResponse> {
                 override fun onResponse(
                     call: Call<MessageResponse>,
                     response: Response<MessageResponse>
                 ) {
-                    if (response.isSuccessful){
-                        result = response.body()!!
+                    if (response.isSuccessful && response.body() != null){
+                        message.postValue("註冊成功")
+                        Log.i("Register Service","API Success:${response.code()} ${response.message()}")
+                    }
+                    else if(response.code() == 409){
+                        val errorMessage = response.errorBody()?.string() ?: "該名稱或信箱已註冊"
+                        Log.e("Register Service", "Conflict: $errorMessage")
+                        message.postValue("註冊失敗: $errorMessage")
                     }
                     else{
-                        Log.i("register","Failed:${response.code()} ${response.message()}")
+                        Log.e("Register Service","API Failed:${response.code()} ${response.message()}")
+                        message.postValue("註冊失敗")
                     }
                 }
                 override fun onFailure(call: Call<MessageResponse>, t: Throwable) {
-                    Log.e("register", "API call failed: ${t.message}")
+                    Log.e("Register Service", "API call failed: ${t.message}")
                 }
             }
         )
-        return result
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/register/RegisterViewModel.kt b/app/src/main/java/com/example/idiotchefassistant/register/RegisterViewModel.kt
index 3e9e4cc..28af996 100644
--- a/app/src/main/java/com/example/idiotchefassistant/register/RegisterViewModel.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/register/RegisterViewModel.kt
@@ -9,18 +9,10 @@ import com.example.idiotchefassistant.R
 class RegisterViewModel(private val registerRepository: RegisterRepository) : ViewModel() {
     private val _registerForm = MutableLiveData<RegisterFormState>()
     val registerFormState: LiveData<RegisterFormState> = _registerForm
-    private val _registerResult = MutableLiveData<String>()
-    val registerResult: LiveData<String> = _registerResult
+    val registerResult: LiveData<String> = registerRepository.message
 
-
-    fun register(infoData: RegisterData){
-        val result = registerRepository.register(infoData).message
-        if(result.isNotEmpty()){
-            _registerResult.value = result
-        }
-        else{
-            _registerResult.value = "註冊失敗"
-        }
+    fun register(data: RegisterData){
+        registerRepository.register(data)
     }
 
     fun registerDataChange(infoData: RegisterData) {
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/DetectAPI.kt b/app/src/main/java/com/example/idiotchefassistant/result/DetectAPI.kt
similarity index 100%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/DetectAPI.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/DetectAPI.kt
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ImageDetailFragment.kt b/app/src/main/java/com/example/idiotchefassistant/result/ImageDetailFragment.kt
similarity index 97%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ImageDetailFragment.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ImageDetailFragment.kt
index 4948991..8729461 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ImageDetailFragment.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ImageDetailFragment.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ImagePagerAdapter.kt b/app/src/main/java/com/example/idiotchefassistant/result/ImagePagerAdapter.kt
similarity index 95%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ImagePagerAdapter.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ImagePagerAdapter.kt
index 6cdde35..0059601 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ImagePagerAdapter.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ImagePagerAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultData.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultData.kt
similarity index 73%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultData.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultData.kt
index d06df90..3bde794 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultData.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultData.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 class ResultData {
     var result: Map<Int, IngItem>? = null
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultFactory.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultFactory.kt
similarity index 91%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultFactory.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultFactory.kt
index 1429ead..fec4744 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultFactory.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultFactory.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultItem.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultItem.kt
similarity index 61%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultItem.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultItem.kt
index da5be65..9436496 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultItem.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultItem.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 data class ResultItem(
     val image: ArrayList<String>,
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultItemAdapter.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultItemAdapter.kt
similarity index 98%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultItemAdapter.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultItemAdapter.kt
index 5f5e81c..6c606f9 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultItemAdapter.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultItemAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 import android.util.Log
 import android.view.LayoutInflater
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultPage.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultPage.kt
similarity index 92%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultPage.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultPage.kt
index a1a6887..10101f0 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultPage.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultPage.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 import android.content.Intent
 import android.os.Bundle
@@ -10,12 +10,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
-import com.example.idiotchefassistant.ingredientsBlock.IngredientDialogFragment
-import com.example.idiotchefassistant.searchBlock.SearchPage
+import com.example.idiotchefassistant.ingredients.IngredientDialogFragment
+import com.example.idiotchefassistant.search.SearchPage
 import com.example.idiotchefassistant.databinding.ActivityResultPageBinding
-import com.example.idiotchefassistant.ingredientsBlock.IngredientFactory
-import com.example.idiotchefassistant.ingredientsBlock.IngredientRepository
-import com.example.idiotchefassistant.ingredientsBlock.IngredientViewModel
+import com.example.idiotchefassistant.ingredients.IngredientFactory
+import com.example.idiotchefassistant.ingredients.IngredientRepository
+import com.example.idiotchefassistant.ingredients.IngredientViewModel
 
 class ResultPage : AppCompatActivity(), ResultItemAdapter.OnItemClickListener, IngredientDialogFragment.OnItemSelectedListener {
     private lateinit var binding: ActivityResultPageBinding
@@ -89,9 +89,8 @@ class ResultPage : AppCompatActivity(), ResultItemAdapter.OnItemClickListener, I
 
         binding.searchButton.setOnClickListener {
             val iids = ArrayList(resultRepository.getData()?.result?.keys?: emptyList())
-            resultViewModel.resultSearch().observe(this){ rList->
+            resultViewModel.resultSearch().observe(this){
                 val intent = Intent(this, SearchPage::class.java).apply {
-                    putParcelableArrayListExtra("rItems", ArrayList(rList))
                     putIntegerArrayListExtra("iids", iids)
                 }
                 startActivity(intent)
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultRepository.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultRepository.kt
similarity index 91%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultRepository.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultRepository.kt
index 97407d0..bd776b3 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultRepository.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultRepository.kt
@@ -1,8 +1,8 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
+import com.example.idiotchefassistant.recipe.RecipeItem
 import com.example.idiotchefassistant.resultSearchService
 import retrofit2.Call
 import retrofit2.Callback
@@ -11,6 +11,7 @@ import java.util.concurrent.Executors
 
 class ResultRepository {
     private var nowData: MutableLiveData<ResultData> = MutableLiveData(ResultData())
+    private var dataIsEmpty: MutableLiveData<Boolean> = MutableLiveData(false)
     fun loadData(task: OnTaskFinish): MutableLiveData<ResultData> {
         Executors.newSingleThreadExecutor().submit {
             val results = ResultData()
diff --git a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultViewModel.kt b/app/src/main/java/com/example/idiotchefassistant/result/ResultViewModel.kt
similarity index 97%
rename from app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultViewModel.kt
rename to app/src/main/java/com/example/idiotchefassistant/result/ResultViewModel.kt
index f59613c..aba1351 100644
--- a/app/src/main/java/com/example/idiotchefassistant/resultBlock/ResultViewModel.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/result/ResultViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.resultBlock
+package com.example.idiotchefassistant.result
 
 import android.util.Log
 import androidx.lifecycle.LiveData
@@ -6,14 +6,14 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.example.idiotchefassistant.detectService
 import com.example.idiotchefassistant.ingredientService
-import com.example.idiotchefassistant.ingredientsBlock.IngredientItem
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
+import com.example.idiotchefassistant.ingredients.IngredientItem
+import com.example.idiotchefassistant.recipe.RecipeItem
 import okhttp3.MultipartBody
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 import java.io.File
-import com.example.idiotchefassistant.resultBlock.ResultRepository.OnTaskFinish
+import com.example.idiotchefassistant.result.ResultRepository.OnTaskFinish
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody.Companion.asRequestBody
 
diff --git a/app/src/main/java/com/example/idiotchefassistant/searchBlock/ResultSearchAPI.kt b/app/src/main/java/com/example/idiotchefassistant/search/ResultSearchAPI.kt
similarity index 79%
rename from app/src/main/java/com/example/idiotchefassistant/searchBlock/ResultSearchAPI.kt
rename to app/src/main/java/com/example/idiotchefassistant/search/ResultSearchAPI.kt
index 8dc375a..bb574b3 100644
--- a/app/src/main/java/com/example/idiotchefassistant/searchBlock/ResultSearchAPI.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/search/ResultSearchAPI.kt
@@ -1,6 +1,6 @@
-package com.example.idiotchefassistant.searchBlock
+package com.example.idiotchefassistant.search
 
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
+import com.example.idiotchefassistant.recipe.RecipeItem
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
diff --git a/app/src/main/java/com/example/idiotchefassistant/search/SearchData.kt b/app/src/main/java/com/example/idiotchefassistant/search/SearchData.kt
new file mode 100644
index 0000000..8623f8f
--- /dev/null
+++ b/app/src/main/java/com/example/idiotchefassistant/search/SearchData.kt
@@ -0,0 +1,7 @@
+package com.example.idiotchefassistant.search
+
+import com.example.idiotchefassistant.recipe.RecipeItem
+
+class SearchData {
+    var list: ArrayList<RecipeItem>? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchFactory.kt b/app/src/main/java/com/example/idiotchefassistant/search/SearchFactory.kt
similarity index 91%
rename from app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchFactory.kt
rename to app/src/main/java/com/example/idiotchefassistant/search/SearchFactory.kt
index 51b3b1f..7b7e08a 100644
--- a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchFactory.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/search/SearchFactory.kt
@@ -1,4 +1,4 @@
-package com.example.idiotchefassistant.searchBlock
+package com.example.idiotchefassistant.search
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchPage.kt b/app/src/main/java/com/example/idiotchefassistant/search/SearchPage.kt
similarity index 52%
rename from app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchPage.kt
rename to app/src/main/java/com/example/idiotchefassistant/search/SearchPage.kt
index bb61b2f..bcb563f 100644
--- a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchPage.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/search/SearchPage.kt
@@ -1,20 +1,22 @@
-package com.example.idiotchefassistant.searchBlock
+package com.example.idiotchefassistant.search
 
 import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.example.idiotchefassistant.MainActivity
+import com.example.idiotchefassistant.mainLayout.MainActivity
 import com.example.idiotchefassistant.databinding.ActivitySearchPageBinding
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
-import com.example.idiotchefassistant.recipeBlock.RecipeItemAdapter
-import com.example.idiotchefassistant.recipeBlock.RecipePage
+import com.example.idiotchefassistant.recipe.RecipeItem
+import com.example.idiotchefassistant.recipe.RecipeItemAdapter
+import com.example.idiotchefassistant.recipe.RecipePage
 
 class SearchPage : AppCompatActivity(), RecipeItemAdapter.OnItemClickListener {
     private lateinit var binding: ActivitySearchPageBinding
@@ -32,10 +34,18 @@ class SearchPage : AppCompatActivity(), RecipeItemAdapter.OnItemClickListener {
         searchFactory = SearchFactory(searchRepository)
         searchViewModel = ViewModelProvider(this, searchFactory)[SearchViewModel::class.java]
 
+        val recipeList = binding.RecipeRecycleView
+        val home = binding.HomeBtn
+        val keyword = binding.EditText
+        val search = binding.SearchBtn
+        val back = binding.backPage
+        val next = binding.nextPage
+        val offset = binding.offset
+
         val adapter = RecipeItemAdapter(emptyList())
         adapter.setOnItemClickListener(this)
-        binding.RecipeRecycleView.layoutManager = LinearLayoutManager(this)
-        binding.RecipeRecycleView.adapter = adapter
+        recipeList.layoutManager = LinearLayoutManager(this)
+        recipeList.adapter = adapter
 
 //      Observe live data
         searchViewModel.callBack().observe(this){data ->
@@ -43,43 +53,39 @@ class SearchPage : AppCompatActivity(), RecipeItemAdapter.OnItemClickListener {
         }
 
 //      upload recycleView
-        val rItems = intent.getParcelableArrayListExtra<RecipeItem>("rItems")
-        val item = mutableListOf<RecipeItem>()
-        rItems?.forEach { r ->
-            item.add(RecipeItem(r.rid, r.title, r.link, r.score))
-        }
         val iids = intent.getIntegerArrayListExtra("iids")?: emptyList<Int>()
         searchViewModel.setIids(iids.toList())
+        searchViewModel.iidsSearch()
 
-        val searchData = SearchData()
-        searchData.list = ArrayList(item)
-        searchViewModel.uploadData(searchData)
-
-        binding.HomeBtn.setOnClickListener{
+        home.setOnClickListener{
             val intent = Intent(this, MainActivity::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
             startActivity(intent)
         }
-        binding.EditText.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
 
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                val newKeyword = s.toString()
-                searchViewModel.setKeyword(newKeyword)
+        keyword.apply {
+            afterTextChanged {
+                searchViewModel.setKeyword(keyword.text.toString())
             }
-
-            override fun afterTextChanged(s: Editable?) {}
-        })
-        binding.SearchBtn.setOnClickListener{
-            searchViewModel.keywordSearch()
-        }
-        binding.backPage.setOnClickListener{
-            searchViewModel.backPage().observe(this){ isLastPage ->
-                if(!isLastPage){
-                    Toast.makeText(this, "已經是第一頁了", Toast.LENGTH_LONG).show()
+            setOnEditorActionListener { _, actionId, _ ->
+                when (actionId) {
+                    EditorInfo.IME_ACTION_DONE ->
+                        searchViewModel.keywordSearch()
                 }
+                false
+            }
+            search.setOnClickListener{
+                searchViewModel.keywordSearch()
             }
         }
-        binding.nextPage.setOnClickListener{
+
+        back.setOnClickListener{
+            if(searchViewModel.nowOffset.value == 0)
+                Toast.makeText(this, "已經是第一頁了", Toast.LENGTH_LONG).show()
+            else
+                searchViewModel.backPage()
+        }
+        next.setOnClickListener{
             searchViewModel.nextPage().observe(this) { isLastPage ->
                 if (isLastPage) {
                     searchViewModel.backPage()
@@ -87,9 +93,9 @@ class SearchPage : AppCompatActivity(), RecipeItemAdapter.OnItemClickListener {
                 }
             }
         }
-        searchViewModel.nowOffset.observe(this) { offset ->
-            val s = offset + 1
-            binding.offset.text = s.toString()
+        searchViewModel.nowOffset.observe(this) { n ->
+            val s = n + 1
+            offset.text = s.toString()
         }
     }
 
@@ -101,5 +107,17 @@ class SearchPage : AppCompatActivity(), RecipeItemAdapter.OnItemClickListener {
     }
 }
 
+fun EditText.afterTextChanged(afterTextChanged: (String) -> Unit) {
+    this.addTextChangedListener(object : TextWatcher {
+        override fun afterTextChanged(editable: Editable?) {
+            afterTextChanged.invoke(editable.toString())
+        }
+
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {}
+    })
+}
+
 
 
diff --git a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchRepository.kt b/app/src/main/java/com/example/idiotchefassistant/search/SearchRepository.kt
similarity index 96%
rename from app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchRepository.kt
rename to app/src/main/java/com/example/idiotchefassistant/search/SearchRepository.kt
index c791494..7af0f9e 100644
--- a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchRepository.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/search/SearchRepository.kt
@@ -1,9 +1,9 @@
-package com.example.idiotchefassistant.searchBlock
+package com.example.idiotchefassistant.search
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
+import com.example.idiotchefassistant.recipe.RecipeItem
 import com.example.idiotchefassistant.resultSearchService
 import retrofit2.Call
 import retrofit2.Callback
diff --git a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchViewModel.kt b/app/src/main/java/com/example/idiotchefassistant/search/SearchViewModel.kt
similarity index 92%
rename from app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchViewModel.kt
rename to app/src/main/java/com/example/idiotchefassistant/search/SearchViewModel.kt
index 18c71dd..21c81eb 100644
--- a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchViewModel.kt
+++ b/app/src/main/java/com/example/idiotchefassistant/search/SearchViewModel.kt
@@ -1,9 +1,8 @@
-package com.example.idiotchefassistant.searchBlock
+package com.example.idiotchefassistant.search
 
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
 
 class SearchViewModel(private var searchRepository: SearchRepository): ViewModel() {
@@ -55,6 +54,12 @@ class SearchViewModel(private var searchRepository: SearchRepository): ViewModel
         search()
     }
 
+    fun iidsSearch(){
+        searchByIds = true
+        Log.i("SVM", "Search iids by: (${_nowOffset.value}, ${iids})")
+        search()
+    }
+
     private fun search(): LiveData<Boolean>{
         val isLastPage = MutableLiveData<Boolean>()
         val liveData = if (searchByIds){
diff --git a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchData.kt b/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchData.kt
deleted file mode 100644
index 0fe6a4b..0000000
--- a/app/src/main/java/com/example/idiotchefassistant/searchBlock/SearchData.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.example.idiotchefassistant.searchBlock
-
-import com.example.idiotchefassistant.recipeBlock.RecipeItem
-
-class SearchData {
-    var list: ArrayList<RecipeItem>? = null
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/logo.png b/app/src/main/res/drawable-nodpi/logo.png
index 9910608..13ae01d 100644
Binary files a/app/src/main/res/drawable-nodpi/logo.png and b/app/src/main/res/drawable-nodpi/logo.png differ
diff --git a/app/src/main/res/drawable/baseline_close_24.xml b/app/src/main/res/drawable/baseline_close_24.xml
new file mode 100644
index 0000000..0f72147
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_close_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FF5A00" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/baseline_person_24.xml b/app/src/main/res/drawable/baseline_person_24.xml
new file mode 100644
index 0000000..ddc8322
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_person_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
index 9910608..3e94db5 100644
Binary files a/app/src/main/res/drawable/logo.png and b/app/src/main/res/drawable/logo.png differ
diff --git a/app/src/main/res/layout/activity_camera_page.xml b/app/src/main/res/layout/activity_camera_page.xml
index 0ba09ba..4dc9305 100644
--- a/app/src/main/res/layout/activity_camera_page.xml
+++ b/app/src/main/res/layout/activity_camera_page.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".mainLayout.MainActivity">
 
     <androidx.camera.view.PreviewView
         android:id="@+id/viewFinder"
@@ -16,22 +16,24 @@
 
     <Button
         android:id="@+id/capture_button"
-        android:layout_width="110dp"
-        android:layout_height="110dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginBottom="36dp"
         android:elevation="2dp"
         android:text="@string/start_capture"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/upload_button"
-        android:layout_width="110dp"
-        android:layout_height="110dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginBottom="36dp"
         android:elevation="2dp"
         android:text="@string/upload_image"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/capture_button" />
diff --git a/app/src/main/res/layout/activity_history_page.xml b/app/src/main/res/layout/activity_history_page.xml
deleted file mode 100644
index 615827c..0000000
--- a/app/src/main/res/layout/activity_history_page.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/Style_color"
-    tools:context=".searchBlock.SearchPage">
-
-    <RelativeLayout
-        android:id="@+id/HeadBar"
-        android:layout_width="match_parent"
-        android:layout_height="20dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:background="@color/Style_color">
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/PageHead"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        app:layout_constraintStart_toStartOf="@+id/HeadBar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/HeadBar"
-        app:layout_constraintVertical_bias="0"
-        android:background="@color/Style_color">
-
-        <ImageView
-            android:id="@+id/SearchBtn"
-            android:layout_height="50dp"
-            android:layout_width="50dp"
-            android:contentDescription="@string/img_des"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:padding="14dp"
-            android:src="@drawable/search_24" />
-
-        <EditText
-            android:id="@+id/EditText"
-            android:layout_width="300dp"
-            android:layout_height="48dp"
-            android:padding="10dp"
-            android:layout_marginBottom="10dp"
-            android:layout_toEndOf="@id/SearchBtn"
-            android:background="@color/white"
-            android:inputType="text"
-            android:autofillHints="autofill"
-            android:hint="@string/enter_recipe_name"
-            android:textColorHint="@color/black"/>
-
-    </RelativeLayout>
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/RecipeRecycleView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintVertical_weight="0.1"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/PageHead"
-        app:layout_constraintTop_toBottomOf="@+id/PageHead"
-        app:flow_verticalBias="1"
-        tools:listitem="@layout/recipe_item_list" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2d941c0..8614e20 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
     android:id="@+id/drawer_layout"
     android:fitsSystemWindows="true"
     tools:openDrawer="start"
-    tools:context=".MainActivity">
+    tools:context=".mainLayout.MainActivity">
 <!--main page-->
     <LinearLayout
         android:layout_width="match_parent"
@@ -37,6 +37,7 @@
         android:layout_gravity="start"
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/nav_menu"
+        app:itemShapeFillColor="@color/Nothing"
         app:itemIconTint="@color/Style_color"
         app:itemTextColor="@color/Style_color"/>
 
diff --git a/app/src/main/res/layout/activity_recipe_page.xml b/app/src/main/res/layout/activity_recipe_page.xml
index 15df6f2..04a3238 100644
--- a/app/src/main/res/layout/activity_recipe_page.xml
+++ b/app/src/main/res/layout/activity_recipe_page.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="20dp"
-    tools:context=".recipeBlock.RecipePage">
+    tools:context=".recipe.RecipePage">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,6 +32,13 @@
             android:src="@drawable/logo"
             android:contentDescription="@string/img_des" />
 
+        <TextView
+            android:id="@+id/video_remind"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/recipe_video_remind"
+            />
+
         <!-- Recipe Review -->
         <LinearLayout
             android:layout_width="wrap_content"
@@ -56,6 +64,23 @@
                 android:scaleY="0.6"
                 android:stepSize="1"/>
         </LinearLayout>
+
+        <TextView
+            android:id="@+id/author_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp"
+            android:text="@string/recipe_author_title"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:paddingTop="16dp" />
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dp"/>
+
         <!-- Ingredients Menu -->
         <TextView
             android:id="@+id/ingredients_title"
@@ -83,32 +108,24 @@
             android:textSize="18sp"
             android:textStyle="bold"
             android:paddingTop="16dp" />
-        <!-- Comment Bar -->
-        <EditText
-            android:id="@+id/comment_bar"
-            android:layout_width="300dp"
-            android:layout_height="48dp"
-            android:autofillHints="autofill"
-            android:inputType="text"
-            android:padding="10dp"
-            android:hint="@string/leave_a_comment"
-            android:paddingTop="16dp" />
 
         <Button
-            android:layout_width="wrap_content"
+            android:id="@+id/postButton"
+            android:layout_width="300dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:padding="10dp"
             android:textStyle="bold"
-            android:text="@string/upload"/>
+            android:text="@string/post_comment"/>
 
         <!-- Community Comments Title -->
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/Comments"
-            android:layout_width="350dp"
-            android:layout_height="450dp"
+            android:id="@+id/comments"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:padding="10dp"
             tools:itemCount="5"
-            tools:listitem="@layout/recipe_commit_item"
+            tools:listitem="@layout/recipe_comment_item"
             android:nestedScrollingEnabled="false"/>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/activity_result_page.xml b/app/src/main/res/layout/activity_result_page.xml
index 17af5d4..25d36cc 100644
--- a/app/src/main/res/layout/activity_result_page.xml
+++ b/app/src/main/res/layout/activity_result_page.xml
@@ -9,8 +9,6 @@
         android:layout_width="350dp"
         android:layout_height="450dp"
         android:layout_below="@+id/addButton"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
         android:layout_marginStart="30dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="30dp"
@@ -26,7 +24,8 @@
         android:layout_alignParentEnd="true"
         android:layout_marginTop="50dp"
         android:layout_marginHorizontal="30dp"
-        android:text="Add Ingredient" />
+        android:text="@string/add_ingredient"
+        android:textStyle="bold"/>
 
     <Button
         android:id="@+id/searchButton"
@@ -37,6 +36,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="100dp"
         android:layout_marginHorizontal="30dp"
+        android:textStyle="bold"
+        android:text="@string/search" />
 
-        android:text="search" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_search_page.xml b/app/src/main/res/layout/activity_search_page.xml
index 8b8d9bd..89a03f6 100644
--- a/app/src/main/res/layout/activity_search_page.xml
+++ b/app/src/main/res/layout/activity_search_page.xml
@@ -5,8 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/Style_color"
-    tools:context=".searchBlock.SearchPage">
+    tools:context=".search.SearchPage">
 
     <RelativeLayout
         android:id="@+id/HeadBar"
@@ -33,19 +32,21 @@
             android:padding="14dp"
             android:src="@drawable/nav_home_24"
             android:contentDescription="@string/img_des"
+            android:background="@color/Nothing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
+
         <ImageView
-            android:id="@+id/SearchBtn"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_alignParentEnd="true"
-            android:padding="14dp"
-            android:src="@drawable/search_24"
+            android:id="@+id/back_page"
+            android:layout_width="40dp"
+            android:layout_height="30dp"
+            android:layout_alignParentBottom="true"
+            android:background="@color/Nothing"
+            android:src="@drawable/baseline_arrow_left_24"
             android:contentDescription="@string/img_des"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            />
+
 
         <EditText
             android:id="@+id/EditText"
@@ -54,19 +55,22 @@
             android:padding="10dp"
             android:layout_marginBottom="10dp"
             android:layout_toEndOf="@id/HomeBtn"
-            android:background="@color/white"
             android:inputType="text"
+            android:background="@color/white"
             android:autofillHints="autofill"
             android:hint="@string/enter_recipe_name"/>
 
         <ImageView
-            android:id="@+id/back_page"
-            android:layout_width="40dp"
-            android:layout_height="30dp"
-            android:layout_alignParentBottom="true"
-            android:src="@drawable/baseline_arrow_left_24"
+            android:id="@+id/SearchBtn"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_alignParentEnd="true"
+            android:padding="14dp"
+            android:src="@drawable/search_24"
             android:contentDescription="@string/img_des"
-            />
+            android:background="@color/Nothing"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/offset"
@@ -78,6 +82,7 @@
             android:layout_toEndOf="@id/back_page"
             android:text=""
             android:textAlignment="center"
+            android:background="@color/Nothing"
             android:textColor="@color/white"
             android:textStyle="bold" />
 
@@ -87,6 +92,7 @@
             android:layout_height="30dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
+            android:background="@color/Nothing"
             android:src="@drawable/baseline_arrow_right_24"
             android:contentDescription="@string/img_des"
             />
diff --git a/app/src/main/res/layout/fragment_about_us_page.xml b/app/src/main/res/layout/fragment_about_us_page.xml
new file mode 100644
index 0000000..482bea3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about_us_page.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/page_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:paddingTop="16dp"
+        android:text="@string/about_us_title"
+        android:textSize="28sp"
+        android:textStyle="bold"
+        android:textColor="@color/Style_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <TextView
+        android:id="@+id/content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/about_us_content"
+        app:layout_constraintEnd_toEndOf="@id/page_title"
+        app:layout_constraintStart_toStartOf="@id/page_title"
+        app:layout_constraintTop_toBottomOf="@id/page_title" />
+
+    <TextView
+        android:id="@+id/thanks_for"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:paddingTop="16dp"
+        android:text="@string/about_us_title2"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="@id/content"
+        app:layout_constraintStart_toStartOf="@id/content"
+        app:layout_constraintTop_toBottomOf="@id/content" />
+
+    <TextView
+        android:id="@+id/subtitle1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:paddingTop="16dp"
+        android:text="@string/about_us_subtitle1"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="@id/page_title"
+        app:layout_constraintTop_toBottomOf="@id/thanks_for" />
+
+    <TextView
+        android:id="@+id/yt1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/about_us_yt1"
+        app:layout_constraintStart_toStartOf="@id/subtitle1"
+        app:layout_constraintTop_toBottomOf="@id/subtitle1" />
+
+    <TextView
+        android:id="@+id/yt2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/about_us_yt2"
+        app:layout_constraintStart_toStartOf="@id/yt1"
+        app:layout_constraintTop_toBottomOf="@id/yt1" />
+
+    <TextView
+        android:id="@+id/yt3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/about_us_yt3"
+        app:layout_constraintStart_toStartOf="@id/yt2"
+        app:layout_constraintTop_toBottomOf="@id/yt2" />
+
+
+    <TextView
+        android:id="@+id/subtitle2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:paddingTop="16dp"
+        android:text="@string/about_us_subtitle2"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="@id/yt3"
+        app:layout_constraintTop_toBottomOf="@id/yt3" />
+
+    <TextView
+        android:id="@+id/content2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/about_us_content2"
+        app:layout_constraintStart_toStartOf="@id/subtitle2"
+        app:layout_constraintTop_toBottomOf="@id/subtitle2" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_history_page.xml b/app/src/main/res/layout/fragment_history_page.xml
new file mode 100644
index 0000000..3144fbc
--- /dev/null
+++ b/app/src/main/res/layout/fragment_history_page.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:context=".mainLayout.HomePage">
+
+    <RelativeLayout
+        android:id="@+id/HeadBar"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:background="@color/Style_color">
+    </RelativeLayout>
+
+    <!--recipe list-->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/RecipeRecycleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/HeadBar"
+        tools:listitem="@layout/recipe_item_list" />
+
+    <RelativeLayout
+        android:id="@+id/remind_block"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/remind_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:padding="10dp"
+            android:text="@string/remind_login"
+            android:textSize="20sp" />
+
+        <Button
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/remind_message"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:text="@string/action_sign_in"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 850a23e..7c6ac20 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    tools:context=".HomePage">
+    tools:context=".mainLayout.HomePage">
     <!--camera-->
     <RelativeLayout
         android:id="@+id/PageTail"
@@ -20,6 +20,7 @@
             android:layout_centerInParent="true"
             android:layout_marginBottom="10dp"
             android:paddingBottom="40dp"
+            android:background="@color/Nothing"
             android:src="@drawable/camera_24" />
     </RelativeLayout>
     <!--recipe list-->
diff --git a/app/src/main/res/layout/fragment_image_detail.xml b/app/src/main/res/layout/fragment_image_detail.xml
index d090fc9..bb65975 100644
--- a/app/src/main/res/layout/fragment_image_detail.xml
+++ b/app/src/main/res/layout/fragment_image_detail.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:gravity="center"
     android:orientation="vertical"
-    tools:context=".resultBlock.ImageDetailFragment">
+    tools:context=".result.ImageDetailFragment">
 
     <androidx.viewpager2.widget.ViewPager2
     android:id="@+id/viewPager"
diff --git a/app/src/main/res/layout/fragment_information_page.xml b/app/src/main/res/layout/fragment_information_page.xml
new file mode 100644
index 0000000..64335ff
--- /dev/null
+++ b/app/src/main/res/layout/fragment_information_page.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+xmlns:app="http://schemas.android.com/apk/res-auto">
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/user_data"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/head"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/img_des"
+        android:src="@drawable/logo"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:padding="40dp" />
+    <TextView
+        android:id="@+id/email_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/head"
+        app:layout_constraintEnd_toEndOf="@id/head"
+        app:layout_constraintTop_toBottomOf="@id/head"
+        android:padding="10dp"
+        android:text="@string/your_email"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:paddingTop="16dp" />
+    <TextView
+        android:id="@+id/email"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/head"
+        app:layout_constraintEnd_toEndOf="@id/head"
+        app:layout_constraintTop_toBottomOf="@id/email_title"
+        android:padding="10dp" />
+    <TextView
+        android:id="@+id/name_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/head"
+        app:layout_constraintEnd_toEndOf="@id/head"
+        app:layout_constraintTop_toBottomOf="@id/email"
+        android:padding="10dp"
+        android:text="@string/your_name"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:paddingTop="16dp" />
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/head"
+        app:layout_constraintEnd_toEndOf="@id/head"
+        app:layout_constraintTop_toBottomOf="@id/name_title"
+        android:padding="10dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+<RelativeLayout
+    android:id="@+id/remind_block"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <TextView
+        android:id="@+id/remind_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:padding="10dp"
+        android:text="@string/remind_login"
+        android:textSize="20sp" />
+
+    <Button
+        android:id="@+id/login"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/remind_message"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:text="@string/action_sign_in"
+        android:textSize="15sp"
+        android:textStyle="bold" />
+</RelativeLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_post_comment.xml b/app/src/main/res/layout/fragment_post_comment.xml
new file mode 100644
index 0000000..7cc5df5
--- /dev/null
+++ b/app/src/main/res/layout/fragment_post_comment.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:padding="20dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:id="@+id/closeButton"
+        android:contentDescription="@string/img_des"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/baseline_close_24"
+        />
+    <RatingBar
+        android:id="@+id/review_star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:numStars="5"
+        android:isIndicator="false"
+        android:rating="5"
+        android:layout_marginTop="50dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/closeButton"/>
+    <EditText
+        android:id="@+id/comment_block"
+        android:layout_width="360dp"
+        android:layout_height="100dp"
+        android:autofillHints="autofill"
+        android:inputType=""
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/review_star"
+        android:hint="@string/leave_a_comment"/>
+    <Button
+        android:id="@+id/uploadButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_margin="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/comment_block"
+        android:text="@string/upload"
+        android:textColor="@color/white"
+        android:textStyle="bold"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/recipe_commit_item.xml b/app/src/main/res/layout/recipe_comment_item.xml
similarity index 90%
rename from app/src/main/res/layout/recipe_commit_item.xml
rename to app/src/main/res/layout/recipe_comment_item.xml
index ffa9449..6baebb8 100644
--- a/app/src/main/res/layout/recipe_commit_item.xml
+++ b/app/src/main/res/layout/recipe_comment_item.xml
@@ -1,8 +1,10 @@
 <!-- res/layout/community_comment_item.xml -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
 
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recipe_comment_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/recipe_item_list.xml b/app/src/main/res/layout/recipe_item_list.xml
index 95af09f..a973281 100644
--- a/app/src/main/res/layout/recipe_item_list.xml
+++ b/app/src/main/res/layout/recipe_item_list.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
     android:orientation="horizontal">
 
     <ImageView
@@ -42,6 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:textColor="@color/white"
+            android:background="@color/Nothing"
             tools:text="5.0" />
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main_header.xml b/app/src/main/res/menu/menu_main_header.xml
index a1bd974..ca30eed 100644
--- a/app/src/main/res/menu/menu_main_header.xml
+++ b/app/src/main/res/menu/menu_main_header.xml
@@ -4,6 +4,7 @@
     <item
         android:id="@+id/search_btn"
         android:icon="@drawable/search_24"
-        android:title="@string/search_title"
-        app:showAsAction="always"/>
+        android:title="@string/app_name"
+        app:showAsAction="always"
+        />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml
index d3bd0c5..9c5eadd 100644
--- a/app/src/main/res/menu/nav_menu.xml
+++ b/app/src/main/res/menu/nav_menu.xml
@@ -9,22 +9,22 @@
         <item
             android:id="@+id/nav_home"
             android:icon="@drawable/nav_home_24"
-            android:title="Home"/>
+            android:title="@string/home"/>
 
         <item
             android:id="@+id/nav_history"
             android:icon="@drawable/history_24"
-            android:title="History"/>
+            android:title="@string/history"/>
 
         <item
-            android:id="@+id/nav_setting"
-            android:icon="@drawable/settings_24"
-            android:title="Setting"/>
+            android:id="@+id/nav_about"
+            android:icon="@drawable/info_24"
+            android:title="@string/about_us"/>
 
         <item
             android:id="@+id/nav_info"
-            android:icon="@drawable/info_24"
-            android:title="About"/>
+            android:icon="@drawable/baseline_person_24"
+            android:title="@string/info"/>
 
     </group>
 
@@ -34,12 +34,12 @@
             <item
                 android:id="@+id/nav_login"
                 android:icon="@drawable/login_24"
-                android:title="Login"/>
+                android:title="@string/login"/>
 
-            <!--<item
+            <item
                 android:id="@+id/nav_logout"
                 android:icon="@drawable/logout_24"
-                android:name="Logout"/>-->
+                android:title="@string/logout"/>
         </menu>
     </item>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 842d99b..39f4fe6 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,9 +3,10 @@
     <style name="Base.Theme.IdiotChefAssistant" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Customize your dark theme here. -->
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-        <item name="colorPrimary">@color/Style_color_night</item>
-        <item name="colorPrimaryVariant">@color/Style_color_night</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <item name="colorAccent">@color/Style_color_night</item>
+        <item name="colorPrimary">@color/Style_color</item>
+        <item name="colorPrimaryVariant">@color/Style_color</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorAccent">@color/Style_color</item>
     </style>
+    <style name="Theme.IdiotChefAssistant" parent="Base.Theme.IdiotChefAssistant"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 121d54f..858d63f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#FF000000</color>
+    <color name="black">#191919</color>
     <color name="white">#FFFFFFFF</color>
     <color name="Style_color">#FF6200</color>
-    <color name="Style_color_night">#361E00</color>
     <color name="Gray">#BDB6B6</color>
+    <color name="Nothing">#00BDB6B6</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b6ad602..1390df9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,8 +19,8 @@
     <string name="user_image">user img</string>
 
     <!-- Preference Titles -->
-    <string name="messages_header">Setting</string>
-    <string name="sync_header">interface setting</string>
+    <string name="messages_header">設定</string>
+    <string name="sync_header">介面設定</string>
 
     <!-- Messages Preferences -->
     <string name="history_title">歷史紀錄</string>
@@ -33,17 +33,16 @@
     <!-- res/values/strings.xml -->
     <string name="user_review">Review: %d stars</string>
 
-    <string name="take_photo">Take Photo</string>
-    <string name="start_capture">Start Capture</string>
-    <string name="stop_capture">Stop Capture</string>
-    <string name="title_activity_result_page">ResultPage</string>
+    <string name="take_photo">拍攝</string>
+    <string name="start_capture">拍攝</string>
+    <string name="stop_capture">停止</string>
 
     <!-- Messages Preferences -->
     <string name="signature_title">Your signature</string>
     <string name="attachment_summary_on">Automatically download attachments for incoming emails
     </string>
     <string name="attachment_summary_off">Only download attachments when manually requested</string>
-    <string name="upload_image">Upload</string>
+    <string name="upload_image">上傳</string>
     <string name="Confirm">確認</string>
     <string name="Cancel">取消</string>
     <string name="enter_the_ingredient">輸入食材</string>
@@ -59,4 +58,27 @@
     <string name="prompt_user_name">使用者名稱</string>
     <string name="register_title">註冊帳號</string>
     <string name="prompt_password_retype">重新輸入密碼</string>
+    <string name="remind_login">尚未登入?</string>
+    <string name="post_comment">撰寫評論</string>
+    <string name="add_ingredient">新增食材</string>
+    <string name="search">搜尋</string>
+    <string name="recipe_video_remind">點擊上方圖片即可觀看教學</string>
+    <string name="recipe_author_title">作者:</string>
+    <string name="your_email">你的信箱</string>
+    <string name="your_name">你的名字</string>
+    <string name="home">主頁</string>
+    <string name="history">歷史紀錄</string>
+    <string name="info">個人資料</string>
+    <string name="about_us">關於我們</string>
+    <string name="about_us_title">關於我們 - 傻瓜廚師助手\n生成式AI控制與食譜推薦系統</string>
+    <string name="about_us_content">我們是國立彰化師範大學資訊工程學系學士畢業專題組。\n主要功能使用Gemini AI模型辨識食材，以辨識到的食材推薦資料庫裡的食譜。\n有手機APP版和網頁版，提供友善界面功能。\n\nThis project, "Dummy Chef Assistance: \nRecipes control and recommendation systems using AI applications" integrates advanced Gemini API ingredient recognition technology with algorithmic filtering to recommend recipes based on identified ingredients. \nThe system aims to enhance user experience by providing relevant and high-quality recipe suggestions. \nIt is available as a mobile app and a web version, offering user-friendly interface functionality.</string>
+    <string name="about_us_title2">特別感謝</string>
+    <string name="about_us_subtitle1">提供我們食譜教學影片授權的YouTuber</string>
+    <string name="about_us_yt1">克里斯餐桌：https://www.youtube.com/@christable0202</string>
+    <string name="about_us_yt2">Rosalina\'s Kitchen 蘿潔塔的廚房: https://www.youtube.com/@RosalinaKitchen</string>
+    <string name="about_us_yt3">菜單研究所：https://www.youtube.com/@menustudy</string>
+    <string name="about_us_subtitle2">網路上的資源</string>
+    <string name="about_us_content2">Gemini API: 提供强大的圖片辨識\nAPI Flaticon: 提供免費的Icon。\n注：本網頁Icon來源為 flaticon</string>
+    <string name="login">登入</string>
+    <string name="logout">登出</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index d35ec89..39af076 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,8 +4,9 @@
         <!-- Customize your light theme here. -->
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
         <item name="colorPrimary">@color/Style_color</item>
-        <item name="colorPrimaryDark">#9A5603</item>
         <item name="colorAccent">@color/Style_color</item>
+        <item name="colorPrimaryVariant">@color/Style_color</item>
+        <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="Theme.IdiotChefAssistant" parent="Base.Theme.IdiotChefAssistant" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1702a78..e29d520 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,6 +3,8 @@ agp = "8.5.1"
 cameraCore = "1.3.4"
 coilCompose = "2.4.0"
 converterGson = "2.6.0"
+datastorePreferences = "1.0.0"
+datastorePreferencesVersion = "1.1.1"
 dotsindicator = "4.3"
 glide = "4.15.1"
 kotlin = "1.9.0"
@@ -11,6 +13,7 @@ junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 appcompat = "1.6.1"
+kotlinxCoroutinesAndroid = "1.7.3"
 lifecycleCompiler = "2.8.5"
 lifecycleExtensions = "2.2.0"
 material = "1.10.0"
@@ -33,6 +36,8 @@ androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", versi
 androidx-camera-video = { module = "androidx.camera:camera-video", version.ref = "cameraCore" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "cameraCore" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
+androidx-datastore-preferences-v111 = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferencesVersion" }
 androidx-lifecycle-compiler = { module = "androidx.lifecycle:lifecycle-compiler", version.ref = "lifecycleCompiler" }
 androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycleExtensions" }
 androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationUiKtx" }
@@ -46,6 +51,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }