Skip to content

Commit

Permalink
Merge branch 'issue/13370-pt-ii-entry-points-to-error-screen' of http…
Browse files Browse the repository at this point in the history
…s://github.com/woocommerce/woocommerce-android into issue/13370-pt-ii-entry-points-to-error-screen
  • Loading branch information
JorgeMucientes committed Jan 31, 2025
2 parents 7776bc0 + d7c0eef commit 49a1560
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions WooCommerce/src/main/res/layout/fragment_product_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,19 @@

</com.google.android.material.appbar.CollapsingToolbarLayout>

<com.google.android.material.button.MaterialButton
android:id="@+id/openUploadScreenButton"
style="@style/Woo.Button.Outlined"
android:textColor="@color/color_error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_extra_large"
android:layout_marginEnd="@dimen/margin_extra_large"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_small_medium"
android:visibility="visible"
tools:visibility="visible"
android:text="@string/product_open_upload_screen" />
</com.google.android.material.appbar.AppBarLayout>

<androidx.core.widget.NestedScrollView
Expand All @@ -123,19 +136,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<com.google.android.material.button.MaterialButton
android:id="@+id/openUploadScreenButton"
style="@style/Woo.Button.Outlined"
android:textColor="@color/color_error"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_extra_large"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_extra_large"
android:visibility="visible"
tools:visibility="visible"
android:text="@string/product_open_upload_screen" />

<LinearLayout
android:id="@+id/promoComposableContainer"
android:layout_width="match_parent"
Expand Down

0 comments on commit 49a1560

Please sign in to comment.