Skip to content

Commit 7a8473b

Browse files
author
fengpeng
committed
调整选项配置
1 parent c411626 commit 7a8473b

4 files changed

Lines changed: 130 additions & 127 deletions

File tree

‎picker/src/main/res/layout/activity_preview.xml‎

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,98 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/rootView"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:background="@color/pick_review_background">
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:id="@+id/rootView"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:background="@color/pick_review_background">
88

99
<pizzk.media.picker.view.PhotoViewPager
10-
android:id="@+id/photoPager"
11-
android:layout_width="0dp"
12-
android:layout_height="0dp"
13-
app:layout_constraintBottom_toBottomOf="parent"
14-
app:layout_constraintLeft_toLeftOf="parent"
15-
app:layout_constraintRight_toRightOf="parent"
16-
app:layout_constraintTop_toTopOf="parent" />
10+
android:id="@+id/photoPager"
11+
android:layout_width="0dp"
12+
android:layout_height="0dp"
13+
app:layout_constraintBottom_toBottomOf="parent"
14+
app:layout_constraintLeft_toLeftOf="parent"
15+
app:layout_constraintRight_toRightOf="parent"
16+
app:layout_constraintTop_toTopOf="parent"/>
1717

1818
<android.support.v7.widget.Toolbar
19-
android:id="@+id/toolbar"
20-
style="@style/PickToolbar"
21-
app:layout_constraintTop_toTopOf="parent"
22-
app:theme="@style/PickToolbarTheme" />
19+
app:layout_constraintLeft_toLeftOf="parent"
20+
app:layout_constraintRight_toRightOf="parent"
21+
android:id="@+id/toolbar"
22+
style="@style/PickToolbar"
23+
app:layout_constraintTop_toTopOf="parent"
24+
app:theme="@style/PickToolbarTheme"/>
2325

2426
<android.support.v7.widget.RecyclerView
25-
android:id="@+id/selectRecycleView"
26-
android:layout_width="match_parent"
27-
android:layout_height="@dimen/album_preview_bottom_gallery"
28-
android:background="@color/pick_preview_overlay"
29-
app:layout_constraintBottom_toTopOf="@+id/rlBottom" />
27+
android:id="@+id/selectRecycleView"
28+
android:layout_width="match_parent"
29+
android:layout_height="@dimen/album_preview_bottom_gallery"
30+
android:background="@color/pick_preview_overlay"
31+
app:layout_constraintBottom_toTopOf="@+id/rlBottom"/>
3032

3133
<RelativeLayout
32-
android:id="@+id/rlBottom"
33-
android:layout_width="match_parent"
34-
android:layout_height="@dimen/picker_toolbar_height"
35-
android:background="@color/pick_preview_overlay"
36-
app:layout_constraintBottom_toBottomOf="parent">
34+
android:id="@+id/rlBottom"
35+
android:layout_width="match_parent"
36+
android:layout_height="@dimen/picker_toolbar_height"
37+
android:background="@color/pick_preview_overlay"
38+
app:layout_constraintBottom_toBottomOf="parent">
3739

3840
<View
39-
android:id="@+id/vBottomLine"
40-
android:layout_width="match_parent"
41-
android:layout_height="@dimen/album_preview_bottom_line"
42-
android:background="@color/pick_review_bottom_line" />
41+
android:id="@+id/vBottomLine"
42+
android:layout_width="match_parent"
43+
android:layout_height="@dimen/album_preview_bottom_line"
44+
android:background="@color/pick_review_bottom_line"/>
4345

4446
<TextView
45-
android:id="@+id/tvEdit"
46-
style="@style/BottomToolText"
47-
android:layout_alignParentLeft="true"
48-
android:layout_centerVertical="true"
49-
android:text="@string/pick_media_edit"
50-
android:visibility="gone" />
47+
android:id="@+id/tvEdit"
48+
style="@style/BottomToolText"
49+
android:layout_alignParentLeft="true"
50+
android:layout_centerVertical="true"
51+
android:text="@string/pick_media_edit"
52+
android:visibility="gone"/>
5153

5254
<LinearLayout
53-
android:id="@+id/llCenter"
54-
android:layout_width="wrap_content"
55-
android:layout_height="match_parent"
56-
android:layout_centerInParent="true"
57-
android:orientation="horizontal"
58-
android:visibility="gone">
55+
android:id="@+id/llCenter"
56+
android:layout_width="wrap_content"
57+
android:layout_height="match_parent"
58+
android:layout_centerInParent="true"
59+
android:orientation="horizontal"
60+
android:visibility="gone">
5961

6062
<View
61-
android:id="@+id/vCenter"
62-
android:layout_width="@dimen/pick_radio_size"
63-
android:layout_height="@dimen/pick_radio_size"
64-
android:layout_gravity="center_vertical"
65-
android:background="@drawable/pick_radio_checked" />
63+
android:id="@+id/vCenter"
64+
android:layout_width="@dimen/pick_radio_size"
65+
android:layout_height="@dimen/pick_radio_size"
66+
android:layout_gravity="center_vertical"
67+
android:background="@drawable/pick_radio_checked"/>
6668

6769
<TextView
68-
android:id="@+id/tvCenter"
69-
style="@style/BottomToolText"
70-
android:paddingLeft="@dimen/pick_radio_margin"
71-
android:paddingRight="0dp"
72-
android:text="@string/pick_media_origin_picture" />
70+
android:id="@+id/tvCenter"
71+
style="@style/BottomToolText"
72+
android:paddingLeft="@dimen/pick_radio_margin"
73+
android:paddingRight="0dp"
74+
android:text="@string/pick_media_origin_picture"/>
7375
</LinearLayout>
7476

7577

7678
<LinearLayout
77-
android:id="@+id/llSelect"
78-
android:layout_width="wrap_content"
79-
android:layout_height="match_parent"
80-
android:layout_alignParentRight="true"
81-
android:orientation="horizontal">
79+
android:id="@+id/llSelect"
80+
android:layout_width="wrap_content"
81+
android:layout_height="match_parent"
82+
android:layout_alignParentRight="true"
83+
android:orientation="horizontal">
8284

8385
<ImageView
84-
android:id="@+id/check"
85-
style="@style/PickCheckbox"
86-
android:layout_gravity="center_vertical"
87-
android:padding="10dp" />
86+
android:id="@+id/check"
87+
style="@style/PickCheckbox"
88+
android:layout_gravity="center_vertical"
89+
android:padding="10dp"/>
8890

8991
<TextView
90-
android:id="@+id/tvSelect"
91-
style="@style/BottomToolText"
92-
android:paddingLeft="0dp"
93-
android:text="@string/pick_media_select" />
92+
android:id="@+id/tvSelect"
93+
style="@style/BottomToolText"
94+
android:paddingLeft="0dp"
95+
android:text="@string/pick_media_select"/>
9496
</LinearLayout>
9597

9698
</RelativeLayout>

‎picker/src/main/res/layout/pick_photo_list_item.xml‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<android.support.constraint.ConstraintLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
xmlns:app="http://schemas.android.com/apk/res-auto"
5-
android:layout_width="wrap_content"
6-
android:layout_height="wrap_content"
7-
android:foreground="?android:attr/selectableItemBackground"
8-
android:minHeight="@dimen/pick_photo_min_size"
9-
android:minWidth="@dimen/pick_photo_min_size"
10-
android:orientation="vertical">
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
android:layout_width="wrap_content"
6+
android:layout_height="wrap_content"
7+
android:minHeight="@dimen/pick_photo_min_size"
8+
android:minWidth="@dimen/pick_photo_min_size"
9+
android:orientation="vertical">
1110

1211
<ImageView
13-
android:id="@+id/imgHint"
14-
android:layout_width="0dp"
15-
android:layout_height="0dp"
16-
android:background="@drawable/shape_pick_photo_dash"
17-
android:contentDescription="@string/description"
18-
android:scaleType="center"
19-
android:src="@mipmap/icon_pick_photo_capture"
20-
android:visibility="gone"
21-
app:layout_constraintBottom_toTopOf="@+id/tvHint"
22-
app:layout_constraintDimensionRatio="1:1"
23-
app:layout_constraintEnd_toEndOf="parent"
24-
app:layout_constraintStart_toStartOf="parent"
25-
app:layout_constraintTop_toTopOf="parent"/>
12+
android:id="@+id/imgHint"
13+
android:layout_width="0dp"
14+
android:layout_height="0dp"
15+
android:background="@drawable/shape_pick_photo_dash"
16+
android:contentDescription="@string/description"
17+
android:scaleType="center"
18+
android:src="@mipmap/icon_pick_photo_capture"
19+
android:visibility="gone"
20+
android:foreground="?android:attr/selectableItemBackground"
21+
app:layout_constraintBottom_toTopOf="@+id/tvHint"
22+
app:layout_constraintDimensionRatio="1:1"
23+
app:layout_constraintEnd_toEndOf="parent"
24+
app:layout_constraintStart_toStartOf="parent"
25+
app:layout_constraintTop_toTopOf="parent"/>
2626

2727
<ImageView
28-
android:id="@+id/imgTarget"
29-
android:layout_width="0dp"
30-
android:layout_height="0dp"
31-
android:background="@drawable/shape_pick_photo_solid"
32-
android:contentDescription="@string/description"
33-
android:padding="@dimen/pick_photo_split_line"
34-
android:scaleType="centerCrop"
35-
android:visibility="gone"
36-
app:layout_constraintBottom_toTopOf="@+id/tvHint"
37-
app:layout_constraintDimensionRatio="1:1"
38-
app:layout_constraintEnd_toEndOf="parent"
39-
app:layout_constraintStart_toStartOf="parent"
40-
app:layout_constraintTop_toTopOf="parent"/>
28+
android:id="@+id/imgTarget"
29+
android:layout_width="0dp"
30+
android:layout_height="0dp"
31+
android:background="@drawable/shape_pick_photo_solid"
32+
android:contentDescription="@string/description"
33+
android:padding="@dimen/pick_photo_split_line"
34+
android:scaleType="centerCrop"
35+
android:visibility="gone"
36+
app:layout_constraintBottom_toTopOf="@+id/tvHint"
37+
app:layout_constraintDimensionRatio="1:1"
38+
app:layout_constraintEnd_toEndOf="parent"
39+
app:layout_constraintStart_toStartOf="parent"
40+
app:layout_constraintTop_toTopOf="parent"/>
4141

4242
<TextView
43-
android:id="@+id/tvHint"
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:layout_gravity="center_horizontal"
47-
android:includeFontPadding="false"
48-
android:paddingBottom="5dp"
49-
android:paddingTop="5dp"
50-
android:text="@string/description"
51-
android:textColor="@color/pick_photo_hint_text_color"
52-
android:textSize="13sp"
53-
android:visibility="visible"
54-
app:layout_constraintBottom_toBottomOf="parent"
55-
app:layout_constraintEnd_toEndOf="parent"
56-
app:layout_constraintStart_toStartOf="parent"/>
43+
android:id="@+id/tvHint"
44+
android:layout_width="wrap_content"
45+
android:layout_height="wrap_content"
46+
android:layout_gravity="center_horizontal"
47+
android:includeFontPadding="false"
48+
android:paddingBottom="5dp"
49+
android:paddingTop="5dp"
50+
android:text="@string/description"
51+
android:textColor="@color/pick_photo_hint_text_color"
52+
android:textSize="13sp"
53+
android:visibility="visible"
54+
app:layout_constraintBottom_toBottomOf="parent"
55+
app:layout_constraintEnd_toEndOf="parent"
56+
app:layout_constraintStart_toStartOf="parent"/>
5757

5858
<ImageView
59-
android:id="@+id/imgDelete"
60-
android:layout_width="wrap_content"
61-
android:layout_height="wrap_content"
62-
android:layout_alignParentRight="true"
63-
android:layout_alignParentTop="true"
64-
android:contentDescription="@string/description"
65-
android:padding="@dimen/pick_photo_delete_margin"
66-
android:scaleType="centerInside"
67-
android:src="@mipmap/icon_pick_photo_delete"
68-
android:visibility="visible"
69-
app:layout_constraintDimensionRatio="1:1"
70-
app:layout_constraintEnd_toEndOf="parent"
71-
app:layout_constraintTop_toTopOf="parent"/>
59+
android:id="@+id/imgDelete"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:layout_alignParentRight="true"
63+
android:layout_alignParentTop="true"
64+
android:contentDescription="@string/description"
65+
android:padding="@dimen/pick_photo_delete_margin"
66+
android:scaleType="centerInside"
67+
android:src="@mipmap/icon_pick_photo_delete"
68+
android:visibility="visible"
69+
app:layout_constraintDimensionRatio="1:1"
70+
app:layout_constraintEnd_toEndOf="parent"
71+
app:layout_constraintTop_toTopOf="parent"/>
7272

7373
</android.support.constraint.ConstraintLayout>

‎picker/src/main/res/values/dimens.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@
2323
<dimen name="pick_photo_delete_margin">5dp</dimen>
2424
<dimen name="pick_chose_bkg_radius">2dp</dimen>
2525
<dimen name="pick_chose_split_line">0.1dp</dimen>
26+
<dimen name="pick_choose_item_text_size">16sp</dimen>
2627
</resources>

‎picker/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<style name="PickChoseText">
6464
<item name="android:layout_width">wrap_content</item>
6565
<item name="android:layout_height">wrap_content</item>
66-
<item name="android:textSize">16sp</item>
66+
<item name="android:textSize">@dimen/pick_choose_item_text_size</item>
6767
<item name="android:layout_marginLeft">25dp</item>
6868
<item name="android:layout_marginTop">12dp</item>
6969
<item name="android:layout_marginBottom">12dp</item>

0 commit comments

Comments
 (0)