diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f7ff58a..4d3fe76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,9 @@
         android:theme="@style/Theme.Ecommerce_serang"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.profile.mystore.AddProductActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.profile.mystore.EditStoreProfileActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/AddProductActivity.kt b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/AddProductActivity.kt
new file mode 100644
index 0000000..d55ed70
--- /dev/null
+++ b/app/src/main/java/com/alya/ecommerce_serang/ui/profile/mystore/AddProductActivity.kt
@@ -0,0 +1,21 @@
+package com.alya.ecommerce_serang.ui.profile.mystore
+
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.alya.ecommerce_serang.R
+
+class AddProductActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(R.layout.activity_add_product)
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_text_field.xml b/app/src/main/res/drawable/bg_text_field.xml
new file mode 100644
index 0000000..7563150
--- /dev/null
+++ b/app/src/main/res/drawable/bg_text_field.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners android:radius="5dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/black_100" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_upload.png b/app/src/main/res/drawable/ic_upload.png
new file mode 100644
index 0000000..f0db59c
Binary files /dev/null and b/app/src/main/res/drawable/ic_upload.png differ
diff --git a/app/src/main/res/layout/activity_add_product.xml b/app/src/main/res/layout/activity_add_product.xml
new file mode 100644
index 0000000..eb51e99
--- /dev/null
+++ b/app/src/main/res/layout/activity_add_product.xml
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    tools:context=".ui.profile.mystore.AddProductActivity">
+
+    <include layout="@layout/header" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingVertical="@dimen/vertical_safe_area"
+            android:paddingHorizontal="@dimen/horizontal_safe_area">
+
+            <!-- Foto Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <!-- Label Foto Produk -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Foto Produk"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                    <!-- TextView sebagai link untuk upload gambar -->
+                    <TextView
+                        android:id="@+id/tv_tambah_foto"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Tambah Foto"
+                        style="@style/body_small"
+                        android:textColor="@color/blue_500"
+                        android:padding="4dp"
+                        android:clickable="true"
+                        android:focusable="true"/>
+
+                </LinearLayout>
+
+                <!-- ImageView untuk preview gambar -->
+                <ImageView
+                    android:id="@+id/iv_preview_foto"
+                    android:layout_width="72dp"
+                    android:layout_height="72dp"
+                    android:layout_marginTop="8dp"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="Preview Gambar"
+                    android:src="@drawable/ic_upload"/>
+
+            </LinearLayout>
+
+            <!-- Nama Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Nama Produk"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/edt_nama_produk"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_text_field"
+                    android:hint="Isi nama produk di sini"
+                    android:padding="8dp"
+                    style="@style/body_small"
+                    android:layout_marginTop="10dp"/>
+
+            </LinearLayout>
+
+            <!-- Kategori Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Kategori Produk"
+                        style="@style/body_medium"
+                        android:layout_marginEnd="4dp"/>
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        style="@style/body_medium"
+                        android:textColor="@color/red_required"
+                        android:layout_gravity="end"/>
+
+                </LinearLayout>
+
+                <EditText
+                    android:id="@+id/KategoriProduk"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/border"
+                    android:hint="Masukkan teks..."
+                    android:padding="8dp"
+                    android:textSize="14sp"
+                    android:textColorHint="#C4C4C7"
+                    android:layout_marginTop="@dimen/space_m"/>
+
+
+            </LinearLayout>
+
+
+            <!-- Deskripsi Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Deskripsi Produk"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:layout_gravity="end"/>
+
+
+                </LinearLayout>
+
+
+                <EditText
+                    android:id="@+id/DeskripsiProduk"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/border"
+                    android:hint="Masukkan teks..."
+                    android:padding="8dp"
+                    android:textSize="14sp"
+                    android:textColorHint="#C4C4C7"
+                    android:layout_marginTop="@dimen/space_m"
+                    />
+
+
+            </LinearLayout>
+
+
+            <!-- Harga Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <!-- Label Harga Produk -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Harga Produk"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:layout_gravity="end"/>
+                </LinearLayout>
+
+
+                <!-- Input Harga dengan Prefix "Rp" -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:background="@drawable/border"
+                    android:layout_marginTop="@dimen/space_m">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Rp"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:textColor="@color/black_100"
+                        android:padding="8dp" />
+
+
+                    <EditText
+                        android:id="@+id/HargaProduk"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@null"
+                        android:hint="Masukkan harga..."
+                        android:inputType="number"
+                        android:padding="8dp"
+                        android:textColorHint="#C4C4C7"
+                        android:textSize="14sp" />
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <!-- Stok Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Stok Produk"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:layout_gravity="end"/>
+
+
+                </LinearLayout>
+
+
+                <EditText
+                    android:id="@+id/StokProduk"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/border"
+                    android:hint="Masukkan teks..."
+                    android:padding="8dp"
+                    android:textSize="14sp"
+                    android:textColorHint="#C4C4C7"
+                    android:layout_marginTop="@dimen/space_m"
+                    />
+            </LinearLayout>
+
+
+            <!-- Minimum Pemesanan -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Minimum Pemesanan"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:layout_gravity="end"/>
+
+
+                </LinearLayout>
+
+
+                <EditText
+                    android:id="@+id/MinimumPemesanan"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/border"
+                    android:hint="Masukkan teks..."
+                    android:padding="8dp"
+                    android:textSize="14sp"
+                    android:textColorHint="#C4C4C7"
+                    android:layout_marginTop="@dimen/space_m"
+                    />
+            </LinearLayout>
+
+
+            <!-- Berat Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <!-- Label Berat Produk -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Berat Produk"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:layout_gravity="end"/>
+                </LinearLayout>
+
+
+                <!-- Input Berat dengan Suffix "gram" -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:background="@drawable/border">
+
+
+                    <EditText
+                        android:id="@+id/BeratProduk"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:hint="Masukkan berat..."
+                        android:inputType="number"
+                        android:textSize="14sp"
+                        android:textColorHint="#C4C4C7"
+                        android:background="@null"
+                        android:padding="8dp"/>
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="gram"
+                        android:textSize="14sp"
+                        android:textStyle="bold"
+                        android:textColor="@color/black_100"
+                        android:padding="8dp"/>
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <!-- Kondisi Produk -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <!-- Label Kondisi Produk -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Kondisi Produk"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:textColor="@color/red"
+                        android:layout_gravity="end"/>
+                </LinearLayout>
+
+
+                <!-- Spinner Dropdown dengan Chevron -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:background="@drawable/border"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="@dimen/space_m">
+
+
+                    <Spinner
+                        android:id="@+id/KondisiProduk"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:padding="8dp"
+                        android:background="@null"/>
+
+
+                    <!-- Chevron Down Icon -->
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:src="@drawable/down"
+                        android:contentDescription="Chevron Down" />
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <!-- Produk Aktif -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginBottom="24dp">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Produk Aktif"
+                        android:textStyle="bold"
+                        android:layout_marginRight="4dp"/>
+
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="*"
+                        android:layout_gravity="end"/>
+
+
+                    <Switch
+                        android:id="@+id/ProdukAktif"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"/>
+
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+
+            <Button
+                android:id="@+id/btnSubmit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Simpan Produk"
+                android:textColor="@color/white"
+                android:backgroundTint="@color/blue_500"
+                android:padding="8dp"
+                android:textSize="16sp"
+                android:textAllCaps="false"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_edit_store_profile.xml b/app/src/main/res/layout/activity_edit_store_profile.xml
index 88ea1d4..ac2e9cf 100644
--- a/app/src/main/res/layout/activity_edit_store_profile.xml
+++ b/app/src/main/res/layout/activity_edit_store_profile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
@@ -7,4 +7,43 @@
     android:layout_height="match_parent"
     tools:context=".ui.profile.mystore.EditStoreProfileActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <include layout="@layout/header" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:id="@+id/layout_profile_pic"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_gravity="center">
+
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:id="@+id/iv_profile"
+                    android:layout_width="77dp"
+                    android:layout_height="77dp"
+                    android:src="@drawable/placeholder_image"
+                    android:scaleType="centerCrop"
+                    app:shapeAppearanceOverlay="@style/circular_image"/>
+
+                <Button
+                    style="@style/button.small.secondary.short"
+                    android:id="@+id/btn_edit_store_profile"
+                    android:text="Ubah Profil"
+                    android:layout_marginTop="25dp"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>
\ 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
deleted file mode 100644
index 3bd6689..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.Ecommerce_serang" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-    </style>
-</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 2fbe35e..8aa4f32 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
     <color name="black">#1B1C1F</color>
     <color name="white">#FDFDFD</color>
     <color name="light_gray">#F7F7F7</color>
+    <color name="red_required">#FF1919</color>
     
     <color name="blue_50">#edf5f9</color>
     <color name="blue_100">#c6e1ed</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a584758..b6827b1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -127,7 +127,7 @@
     <style name="body_medium">
         <item name="android:textSize">14sp</item>
         <item name="android:lineSpacingExtra">20sp</item>
-        <item name="android:letterSpacing">0.25</item>
+        <item name="android:letterSpacing">0.025</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:fontFamily">@font/dmsans_regular</item>
     </style>