Skip to content

Commit b59da3d

Browse files
GensjavaGensjava
committed
Service
1 parent 2653787 commit b59da3d

File tree

7 files changed

+179
-38
lines changed

7 files changed

+179
-38
lines changed

‎Android/SmartShopNew/main/res/layout/activity_main.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<android.support.v4.widget.DrawerLayout
22
android:id="@+id/drawer_layout"
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">
76

8-
<!-- The main content view -->
97
<FrameLayout
108
android:id="@+id/content_frame"
119
android:layout_width="match_parent"
1210
android:layout_height="match_parent"/>
13-
<!-- The navigation drawer -->
1411

1512
<ListView android:id="@+id/left_drawer"
1613
android:layout_width="240dp"
@@ -20,6 +17,12 @@
2017
android:choiceMode="singleChoice"
2118
android:divider="@android:color/transparent"
2219
android:dividerHeight="0dp"/>
23-
20+
<ListView
21+
android:id="@+id/right_drawer"
22+
android:layout_width="240dp"
23+
android:layout_height="match_parent"
24+
android:layout_gravity="end"
25+
android:background="@color/sub_main_orange"
26+
/>
2427

2528
</android.support.v4.widget.DrawerLayout>

‎Android/SmartShopNew/main/res/layout/main_category_grid.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@
1616
>
1717
</GridView>
1818

19-
2019
</LinearLayout>

‎Android/SmartShopNew/main/res/layout/main_cellgrid.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
android:gravity="center_vertical"
1313
/>
1414

15-
1615
</LinearLayout>

‎Android/SmartShopNew/main/res/layout/main_list.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,4 @@
2525
android:gravity="center"
2626
android:textColor="@android:color/darker_gray"/>
2727

28-
<Button
29-
android:id="@+id/lvMain_button"
30-
style="?android:attr/buttonStyleSmall"
31-
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
33-
android:layout_gravity="center_horizontal"
34-
android:text="Попробуйте еще раз"
35-
android:visibility="invisible"/>
36-
3728
</LinearLayout>

‎Android/SmartShopNew/main/res/layout/product_item.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,36 @@
2727
android:padding="3dp"
2828
app:fillColor="#FF5252"/>
2929

30+
<RelativeLayout
31+
android:layout_width="fill_parent"
32+
android:layout_height="25dp"
33+
android:alpha="2"
34+
android:background="@color/main_orange_text">
35+
36+
<ImageView
37+
android:id="@+id/product_item_image_heart"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:layout_alignParentBottom="true"
41+
android:layout_alignParentEnd="true"
42+
android:layout_alignParentRight="true"
43+
android:src="@drawable/ic_heart_a"/>
44+
45+
<RatingBar
46+
android:id="@+id/ratingBar"
47+
style="?android:attr/ratingBarStyleSmall"
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:layout_alignParentBottom="true"
51+
android:layout_alignParentLeft="true"
52+
android:layout_alignParentStart="true"/>
53+
</RelativeLayout>
54+
55+
<Space
56+
android:layout_width="20px"
57+
android:layout_height="20px"
58+
/>
59+
3060
<TextView
3161
android:id="@+id/item_text_name_product"
3262
android:layout_width="match_parent"

‎Android/SmartShopNew/main/res/layout/product_list_item.xml

Lines changed: 59 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,61 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="match_parent" android:layout_height="match_parent"
4-
android:background="@android:color/background_light"
5-
android:orientation="vertical"
6-
android:weightSum="1">
7-
8-
<ImageView
9-
android:id="@+id/main_product_item_imege"
10-
android:layout_width="150dp"
11-
android:layout_height="120dp"
12-
android:background="@android:color/background_light"
13-
android:focusable="false"
14-
android:focusableInTouchMode="false"
15-
android:scaleType="fitCenter"
16-
android:src="@drawable/ic_action_cart"
17-
/>
18-
19-
<TextView
20-
android:id="@+id/main_product_item_price"
21-
android:layout_width="wrap_content"
22-
android:layout_height="20dp"
23-
android:layout_column="5"
24-
android:layout_row="2"/>
25-
</LinearLayout>
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:padding="4dp">
6+
7+
<android.support.v7.widget.CardView
8+
android:id="@+id/cv"
9+
android:layout_width="match_parent"
10+
android:layout_height="160dp"
11+
>
12+
13+
14+
<RelativeLayout
15+
android:layout_width="match_parent"
16+
android:layout_height="wrap_content"
17+
android:background="@android:color/background_light"
18+
android:clickable="true">
19+
20+
<ImageView
21+
android:id="@+id/main_product_item_imege"
22+
android:layout_width="match_parent"
23+
android:layout_height="90dp"
24+
android:background="@android:color/background_light"
25+
android:focusable="false"
26+
android:focusableInTouchMode="false"
27+
android:scaleType="fitCenter"
28+
android:src="@drawable/ic_action_cart"
29+
/>
30+
31+
<TextView
32+
android:id="@+id/main_product_item_name"
33+
android:layout_width="match_parent"
34+
android:layout_height="wrap_content"
35+
android:layout_below="@+id/main_product_item_imege"
36+
android:layout_centerHorizontal="true"
37+
android:textSize="12sp"
38+
android:textStyle="bold"/>
39+
40+
<TextView
41+
android:id="@+id/main_product_item_price"
42+
android:layout_width="match_parent"
43+
android:layout_height="wrap_content"
44+
android:layout_below="@+id/main_product_item_name"
45+
android:layout_centerHorizontal="true"
46+
android:textColor="@color/main_orange"
47+
android:textSize="12sp"/>
48+
49+
<ImageView
50+
android:id="@+id/main_product_item_by"
51+
android:layout_width="wrap_content"
52+
android:layout_height="wrap_content"
53+
android:layout_alignParentBottom="true"
54+
android:layout_alignParentEnd="true"
55+
android:layout_alignParentRight="true"
56+
android:src="@drawable/ic_action_by_a"/>
57+
58+
</RelativeLayout>
59+
60+
</android.support.v7.widget.CardView>
61+
</LinearLayout>

‎Android/SmartShopNew/main/res/layout/product_list_item_from_category.xml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:padding="4dp"
6+
>
7+
<android.support.v7.widget.CardView
8+
android:id="@+id/cv"
9+
android:layout_width="match_parent"
10+
android:layout_height="115dp"
11+
12+
>
13+
<RelativeLayout
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
17+
>
18+
<ImageView
19+
android:id="@+id/product_from_category_photo"
20+
android:layout_width="90dp"
21+
android:layout_height="80dp"
22+
android:layout_alignParentLeft="true"
23+
android:layout_alignParentTop="true"
24+
android:layout_marginRight="16dp"
25+
/>
26+
27+
<TextView
28+
android:id="@+id/product_from_category_name"
29+
android:layout_width="match_parent"
30+
android:layout_height="wrap_content"
31+
android:layout_alignParentTop="true"
32+
android:layout_toRightOf="@+id/product_from_category_photo"
33+
android:textSize="15sp"
34+
/>
35+
36+
<TextView
37+
android:id="@+id/product_from_category_age"
38+
android:layout_width="match_parent"
39+
android:layout_height="26dp"
40+
android:layout_below="@+id/product_from_category_name"
41+
android:layout_toRightOf="@+id/product_from_category_photo"
42+
android:textSize="10sp"
43+
/>
44+
45+
<TextView
46+
android:id="@+id/product_from_category_price"
47+
android:layout_width="match_parent"
48+
android:layout_height="26dp"
49+
android:layout_below="@+id/product_from_category_age"
50+
android:layout_toRightOf="@+id/product_from_category_photo"
51+
android:textColor="@color/main_orange"
52+
android:textSize="12sp"/>
53+
54+
<ImageView
55+
android:id="@+id/product_from_category_im_cart"
56+
android:layout_width="wrap_content"
57+
android:layout_height="wrap_content"
58+
android:layout_alignParentBottom="true"
59+
android:layout_alignParentEnd="true"
60+
android:layout_alignParentRight="true"
61+
android:src="@drawable/ic_action_by_a"/>
62+
63+
<ImageView
64+
android:id="@+id/product_from_category_im_heart"
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:layout_alignTop="@+id/product_from_category_im_cart"
68+
android:layout_toLeftOf="@+id/product_from_category_im_cart"
69+
android:layout_toStartOf="@+id/product_from_category_im_cart"
70+
android:src="@drawable/ic_heart_a"/>
71+
72+
<ImageView
73+
android:id="@+id/product_from_category_im_star"
74+
android:layout_width="wrap_content"
75+
android:layout_height="wrap_content"
76+
android:layout_alignTop="@+id/product_from_category_im_heart"
77+
android:layout_toLeftOf="@+id/product_from_category_im_heart"
78+
android:layout_toStartOf="@+id/product_from_category_im_heart"
79+
android:src="@drawable/ic_action_star"/>
80+
81+
</RelativeLayout>
82+
</android.support.v7.widget.CardView>
83+
</LinearLayout>

0 commit comments

Comments
 (0)