Skip to content

Commit

Permalink
Merge branch 'dev/and' into fix/anddetailview-scroll
Browse files Browse the repository at this point in the history
  • Loading branch information
EunhoKang authored Dec 9, 2023
2 parents e65ae44 + a57ccaa commit 79c07da
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions android/app/src/main/res/layout/activity_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
android:layout_marginTop="12dp"
android:layout_marginEnd="12dp"
android:contentDescription="@string/share_product"
android:enabled="@{viewModel.state.isReady}"
app:icon="@drawable/ic_share"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_detail_product" />
Expand Down Expand Up @@ -158,6 +159,7 @@
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginTop="8dp"
android:enabled="@{viewModel.state.isReady}"
android:text="@string/add_to_tracking_list"
android:visibility="@{viewModel.state.isTracking ? View.GONE : View.VISIBLE}"
app:icon="@drawable/ic_track"
Expand Down Expand Up @@ -185,6 +187,7 @@
android:layout_height="48dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="4dp"
android:enabled="@{viewModel.state.isReady}"
android:text="@string/edit_target_price"
android:visibility="@{viewModel.state.isTracking ? View.VISIBLE : View.GONE}"
app:icon="@drawable/ic_edit"
Expand All @@ -200,6 +203,7 @@
android:layout_height="48dp"
android:layout_marginStart="4dp"
android:layout_marginTop="8dp"
android:enabled="@{viewModel.state.isReady}"
android:onClick="@{() -> viewModel.sendDeleteTrackingEvent()}"
android:text="@string/delete_tracking"
android:visibility="@{viewModel.state.isTracking ? View.VISIBLE : View.GONE}"
Expand Down Expand Up @@ -289,6 +293,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="@{viewModel.state.isReady}"
android:text="@string/day" />

<Button
Expand All @@ -297,6 +302,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="@{viewModel.state.isReady}"
android:text="@string/week" />

<Button
Expand All @@ -305,6 +311,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="@{viewModel.state.isReady}"
android:text="@string/month" />

<Button
Expand All @@ -313,6 +320,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:enabled="@{viewModel.state.isReady}"
android:text="@string/quarter" />

</com.google.android.material.button.MaterialButtonToggleGroup>
Expand Down

0 comments on commit 79c07da

Please sign in to comment.