-
Notifications
You must be signed in to change notification settings - Fork 12
/
Copy pathlocal_history.patch
104 lines (95 loc) · 4.49 KB
/
local_history.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
Index: app/src/main/res/layout/fragment_product_details.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/layout/fragment_product_details.xml b/app/src/main/res/layout/fragment_product_details.xml
--- a/app/src/main/res/layout/fragment_product_details.xml
+++ b/app/src/main/res/layout/fragment_product_details.xml (date 1685927466726)
@@ -27,16 +27,35 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
- <ImageView
- android:id="@+id/img_close"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:src="@drawable/ic_close"
- android:padding="5dp"
- app:tint="@color/g_black" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/img_close"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:src="@drawable/ic_close"
+ android:padding="5dp"
+ app:tint="@color/g_black" />
+
+ <de.hdodenhof.circleimageview.CircleImageView
+ android:id="@+id/vr_icon"
+ android:layout_width="60dp"
+ android:layout_height="60dp"
+ android:layout_marginLeft="280dp"
+ android:src="@drawable/vr_2glasses"
+ app:civ_border_color="@color/g_blue100"
+ app:civ_border_width="2dp" />
+
+ </LinearLayout>
+
+
+
</androidx.cardview.widget.CardView>
@@ -151,30 +170,17 @@
<br.com.simplepass.loadingbutton.customViews.CircularProgressButton
android:id="@+id/btn_add_to_cart"
style="@style/blueButtonStyle"
- android:layout_width="150dp"
+ android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"
android:layout_marginTop="45dp"
android:layout_marginBottom="20dp"
android:text="Add to cart"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="@id/linear_color_sizes"
app:layout_constraintStart_toStartOf="@id/linear_color_sizes"
app:layout_constraintTop_toBottomOf="@id/linear_color_sizes"
app:spinning_bar_color="@color/white" />
- <de.hdodenhof.circleimageview.CircleImageView
- android:id="@+id/profile_image"
- android:layout_width="70dp"
- android:layout_height="70dp"
- android:src="@drawable/vr_glasses"
- app:civ_border_color="@color/g_blue100"
- app:civ_border_width="2dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="@id/linear_color_sizes"
- app:layout_constraintHorizontal_bias="0.818"
- app:layout_constraintStart_toStartOf="@id/linear_color_sizes"
- app:layout_constraintTop_toBottomOf="@id/linear_color_sizes"
- app:layout_constraintVertical_bias="0.6" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
Index: app/src/main/java/com/example/fragments/shopping/ProductDetailsFragment.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/fragments/shopping/ProductDetailsFragment.kt b/app/src/main/java/com/example/fragments/shopping/ProductDetailsFragment.kt
--- a/app/src/main/java/com/example/fragments/shopping/ProductDetailsFragment.kt
+++ b/app/src/main/java/com/example/fragments/shopping/ProductDetailsFragment.kt (date 1685840420241)
@@ -56,6 +56,10 @@
imgClose.setOnClickListener {
findNavController().navigateUp()
}
+
+ vrIcon.setOnClickListener {
+
+ }
if(product.colors.isNullOrEmpty()){
tvProductColor.visibility = View.INVISIBLE