Skip to content

Commit 609e26b

Browse files
sicp618sicp618
committed
修改私有项目图标
1 parent b2d131e commit 609e26b

12 files changed

Lines changed: 126 additions & 108 deletions

File tree

‎app/src/enterprise/res/layout/init_fragment_project_set.xml‎

Lines changed: 91 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,143 @@
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"
4-
android:layout_height="match_parent"
5-
android:background="@color/divide"
6-
android:orientation="vertical">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:background="@color/divide"
7+
android:orientation="vertical">
78

89
<LinearLayout
9-
android:layout_width="match_parent"
10-
android:id="@+id/layoutManager"
11-
android:layout_height="wrap_content"
12-
android:orientation="vertical">
10+
android:layout_width="match_parent"
11+
android:id="@+id/layoutManager"
12+
android:layout_height="wrap_content"
13+
android:orientation="vertical">
1314

1415

1516
<LinearLayout
16-
android:layout_width="match_parent"
17-
android:layout_height="wrap_content"
18-
android:background="@color/stand_bg"
19-
android:gravity="center_vertical"
20-
android:orientation="horizontal"
21-
android:padding="14dp">
17+
android:layout_width="match_parent"
18+
android:layout_height="wrap_content"
19+
android:background="@color/stand_bg"
20+
android:gravity="center_vertical"
21+
android:orientation="horizontal"
22+
android:padding="14dp">
2223

2324
<FrameLayout
24-
android:layout_width="60dp"
25-
android:layout_height="60dp"
26-
android:background="@drawable/round_icon_path"
27-
android:src="@color/font_black">
28-
29-
<ImageView
30-
android:id="@+id/projectIcon"
3125
android:layout_width="60dp"
3226
android:layout_height="60dp"
3327
android:background="@drawable/round_icon_path"
34-
android:padding="1dp"
35-
android:src="@color/font_black" />
28+
android:src="@color/font_black">
3629

3730
<ImageView
38-
android:layout_width="60dp"
39-
android:layout_height="60dp"
40-
android:background="@drawable/round_icon_mask"
41-
android:padding="1dp"
42-
android:scaleType="center"
43-
android:src="@drawable/ic_project_icon_edit" />
31+
android:id="@+id/projectIcon"
32+
android:layout_width="60dp"
33+
android:layout_height="60dp"
34+
android:background="@drawable/round_icon_path"
35+
android:padding="1dp"
36+
android:src="@color/font_black"/>
37+
38+
<ImageView
39+
android:layout_width="60dp"
40+
android:layout_height="60dp"
41+
android:background="@drawable/round_icon_mask"
42+
android:padding="1dp"
43+
android:scaleType="center"
44+
android:src="@drawable/ic_project_icon_edit"/>
4445

4546
</FrameLayout>
4647

4748
<View
48-
android:id="@+id/iconPrivate"
49-
android:layout_width="18dp"
50-
android:layout_height="18dp"
51-
android:layout_marginLeft="14dp"
52-
android:background="@drawable/ic_project_private1"
53-
android:visibility="gone" />
49+
android:id="@+id/iconPrivate"
50+
android:layout_width="18dp"
51+
android:layout_height="18dp"
52+
android:layout_marginLeft="14dp"
53+
tools:visibility="visible"
54+
android:background="@drawable/ic_share_project1"
55+
android:visibility="gone"/>
5456

5557
<TextView
56-
android:id="@+id/projectName"
57-
android:layout_width="wrap_content"
58-
android:layout_height="wrap_content"
59-
android:layout_marginLeft="8dp"
60-
android:lines="1"
61-
android:text="Medium Text"
62-
android:textAppearance="?android:attr/textAppearanceMedium"
63-
android:textColor="@color/font_1"
64-
android:textSize="18sp" />
58+
android:id="@+id/projectName"
59+
android:layout_width="wrap_content"
60+
android:layout_height="wrap_content"
61+
android:layout_marginLeft="8dp"
62+
android:lines="1"
63+
android:text="Medium Text"
64+
android:textAppearance="?android:attr/textAppearanceMedium"
65+
android:textColor="@color/font_1"
66+
android:textSize="18sp"/>
6567

6668
</LinearLayout>
6769

6870
<View
69-
android:layout_width="match_parent"
70-
android:layout_height="1dp"
71-
android:layout_marginLeft="14dp"
72-
android:background="@color/divide" />
71+
android:layout_width="match_parent"
72+
android:layout_height="1dp"
73+
android:layout_marginLeft="14dp"
74+
android:background="@color/divide"/>
7375

7476
<EditText
75-
android:id="@+id/description"
76-
android:layout_width="match_parent"
77-
android:layout_height="wrap_content"
78-
android:background="@color/stand_bg"
79-
android:gravity="start"
80-
android:hint="填写项目描述..."
81-
android:lines="5"
82-
android:maxLines="5"
83-
android:padding="14dp"
84-
android:textColor="@color/font_1"
85-
android:textSize="15sp" />
77+
android:id="@+id/description"
78+
android:layout_width="match_parent"
79+
android:layout_height="wrap_content"
80+
android:background="@color/stand_bg"
81+
android:gravity="start"
82+
android:hint="填写项目描述..."
83+
android:lines="5"
84+
android:maxLines="5"
85+
android:padding="14dp"
86+
android:textColor="@color/font_1"
87+
android:textSize="15sp"/>
8688

8789
</LinearLayout>
8890

89-
<include layout="@layout/divide_middle_15" />
91+
<include layout="@layout/divide_middle_15"/>
9092

9193
<LinearLayout
92-
android:id="@+id/layoutOwner"
93-
android:layout_width="match_parent"
94-
android:layout_height="wrap_content"
95-
android:orientation="vertical">
94+
android:id="@+id/layoutOwner"
95+
android:layout_width="match_parent"
96+
android:layout_height="wrap_content"
97+
android:orientation="vertical">
9698

9799
<include
98-
android:id="@+id/itemTransfer"
99-
android:visibility="gone"
100-
layout="@layout/init_common_item" />
100+
android:id="@+id/itemTransfer"
101+
android:visibility="gone"
102+
layout="@layout/init_common_item"/>
101103

102104
<!--<include layout="@layout/divideline_15" />-->
103105

104106
<include
105-
android:id="@+id/itemArchive"
106-
android:visibility="gone"
107-
layout="@layout/init_common_item" />
107+
android:id="@+id/itemArchive"
108+
android:visibility="gone"
109+
layout="@layout/init_common_item"/>
108110

109-
<include layout="@layout/divideline_15" />
111+
<include layout="@layout/divideline_15"/>
110112

111113
<include
112-
android:id="@+id/item"
113-
layout="@layout/init_common_item" />
114+
android:id="@+id/item"
115+
layout="@layout/init_common_item"/>
114116

115117
</LinearLayout>
116118

117119

118120
<RelativeLayout
119-
android:id="@+id/layoutQuit"
120-
android:layout_width="match_parent"
121-
android:layout_height="@dimen/project_item_height"
122-
android:background="@drawable/list_item_selector"
123-
android:clickable="true"
124-
android:paddingLeft="14dp"
125-
android:paddingRight="14dp">
121+
android:id="@+id/layoutQuit"
122+
android:layout_width="match_parent"
123+
android:layout_height="@dimen/project_item_height"
124+
android:background="@drawable/list_item_selector"
125+
android:clickable="true"
126+
android:paddingLeft="14dp"
127+
android:paddingRight="14dp">
126128

127129
<TextView
128-
android:layout_width="wrap_content"
129-
android:layout_height="wrap_content"
130-
android:layout_centerHorizontal="true"
131-
android:layout_centerInParent="true"
132-
android:layout_centerVertical="true"
133-
android:text="退出项目"
134-
android:textColor="@color/font_red"
135-
android:textSize="@dimen/project_icon_text" />
130+
android:layout_width="wrap_content"
131+
android:layout_height="wrap_content"
132+
android:layout_centerHorizontal="true"
133+
android:layout_centerInParent="true"
134+
android:layout_centerVertical="true"
135+
android:text="退出项目"
136+
android:textColor="@color/font_red"
137+
android:textSize="@dimen/project_icon_text"/>
136138

137139
</RelativeLayout>
138140

139-
<include layout="@layout/divide_bottom_15" />
141+
<include layout="@layout/divide_bottom_15"/>
140142

141143
</LinearLayout>

‎app/src/main/java/net/coding/program/project/ProjectListFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
310310
ProjectObject item = (ProjectObject) getItem(position);
311311

312312
holder.privatePin.setVisibility(item.isPin() ? View.VISIBLE : View.INVISIBLE);
313-
holder.privateIcon.setVisibility(item.isPublic() ? View.INVISIBLE : View.VISIBLE);
313+
holder.privateIcon.setVisibility(!item.isShared() ? View.INVISIBLE : View.VISIBLE);
314314
String ownerName = item.owner_user_name;
315315
holder.content.setText(ownerName);
316-
if (!item.isPublic()) {
316+
if (item.isShared()) {
317317
holder.name.setVisibility(View.VISIBLE);
318318
holder.name.setText(item.name);
319319
holder.name2.setVisibility(View.INVISIBLE);

‎app/src/main/java/net/coding/program/project/init/setting/ProjectSetFragment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@ protected void init() {
6868
iconfromNetwork(projectIcon, mProjectObject.icon, ImageLoadTool.optionsRounded2);
6969
projectName.setText(mProjectObject.name);
7070
description.setText(mProjectObject.description);
71-
if (!mProjectObject.isPublic()) {
72-
iconPrivate.setVisibility(View.VISIBLE);
73-
}
71+
iconPrivate.setVisibility(mProjectObject.isShared() ? View.VISIBLE : View.GONE);
72+
7473
description.addTextChangedListener(new SimpleTextWatcher() {
7574

7675
@Override

‎app/src/main/java/net/coding/program/search/SearchResultListFragment.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
221221

222222
ProjectObject item = (ProjectObject) getItem(position);
223223

224-
holder.privateIcon.setVisibility(item.getType() == 1 ? View.INVISIBLE : View.VISIBLE);
225-
224+
holder.privateIcon.setVisibility(item.getType() == 1 ? View.VISIBLE : View.INVISIBLE);
226225

227226
String name = "";
228227
try {
@@ -237,15 +236,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
237236
holder.tv_fork_count.setText(item.getForkCountString());
238237
holder.badge.setVisibility(View.INVISIBLE);
239238
if (item.getType() == 1) {
240-
holder.name2.setVisibility(View.VISIBLE);
241-
HoloUtils.setHoloText(holder.name2, item.name);
242-
holder.name.setVisibility(View.INVISIBLE);
243-
holder.content.setVisibility(View.GONE);
244-
} else {
245239
holder.name.setVisibility(View.VISIBLE);
246240
HoloUtils.setHoloText(holder.name, item.name);
247241
holder.name2.setVisibility(View.INVISIBLE);
248242
holder.content.setVisibility(View.VISIBLE);
243+
} else {
244+
holder.name2.setVisibility(View.VISIBLE);
245+
HoloUtils.setHoloText(holder.name2, item.name);
246+
holder.name.setVisibility(View.INVISIBLE);
247+
holder.content.setVisibility(View.GONE);
249248
}
250249
holder.ll_bottom_menu.setVisibility(item.getType() == 1 ? View.VISIBLE : View.GONE);
251250
iconfromNetwork(holder.image, item.icon, ImageLoadTool.optionsRounded2);

‎app/src/main/java/net/coding/program/user/team/TeamProjectListActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
174174
}
175175

176176
ProjectObject data = getItem(position);
177-
holder.privateIcon.setVisibility(data.isPublic() ? View.GONE : View.VISIBLE);
177+
holder.privateIcon.setVisibility(!data.isShared() ? View.GONE : View.VISIBLE);
178178
holder.name.setText(data.name);
179179
holder.txtDesc.setText(data.owner_user_name);
180180
imagefromNetwork(holder.icon, data.icon, ImageLoadTool.optionsRounded2);

‎app/src/main/res/drawable-hdpi/ic_project_private1.png‎

-951 Bytes
Binary file not shown.

‎app/src/main/res/drawable/ic_share_project1.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:height="18dp"
3+
android:viewportHeight="50"
4+
android:viewportWidth="50"
5+
android:width="18dp">
6+
<path
7+
android:fillColor="#76808E"
8+
android:pathData="m31.6 26.7q0-2-1.4-3.4t-3.4-1.4q-1.9 0-3.2 1.3l-5.4-2.7q0-0.3 0-0.5t0-0.5l5.4-2.7q1.3 1.3 3.2 1.3 2 0 3.4-1.4t1.4-3.4-1.4-3.3-3.4-1.4-3.4 1.4-1.4 3.3q0 0.2 0.1 0.5l-5.4 2.7q-1.4-1.3-3.2-1.3-2 0-3.4 1.4t-1.4 3.4 1.4 3.4 3.4 1.4q1.8 0 3.2-1.3l5.4 2.7q-0.1 0.3-0.1 0.5 0 1.9 1.4 3.3t3.4 1.4 3.4-1.4 1.4-3.3z m5.7-17.4v21.4q0 2.7-1.9 4.6t-4.5 1.8h-21.5q-2.6 0-4.5-1.8t-1.9-4.6v-21.4q0-2.7 1.9-4.6t4.5-1.8h21.5q2.6 0 4.5 1.8t1.9 4.6z" />
9+
</vector>

‎app/src/main/res/layout/init_fragment_project_set.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
android:layout_width="18dp"
4949
android:layout_height="18dp"
5050
android:layout_marginLeft="14dp"
51-
android:background="@drawable/ic_project_private1"
51+
android:background="@drawable/ic_share_project1"
5252
android:visibility="gone" />
5353

5454
<TextView

‎app/src/main/res/layout/project_all_list_item.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
<View
4040
android:id="@+id/privateIcon"
41-
android:layout_width="14dp"
42-
android:layout_height="14dp"
41+
android:layout_width="18dp"
42+
android:layout_height="18dp"
4343
android:layout_alignTop="@id/icon"
4444
android:layout_marginLeft="20dp"
4545
android:layout_marginTop="6dp"
4646
android:layout_toRightOf="@id/icon"
47-
android:background="@drawable/ic_project_private1"
47+
android:background="@drawable/ic_share_project1"
4848
android:visibility="visible" />
4949

5050
<TextView

‎app/src/main/res/layout/project_home_list_head_head.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
android:layout_alignStart="@+id/projectAuthor"
7070
android:layout_alignTop="@+id/projectAuthor"
7171
android:layout_marginTop="4.5dp"
72-
android:background="@drawable/ic_project_private1"
72+
android:background="@drawable/ic_share_project1"
7373
android:visibility="gone" />
7474

7575
<ImageView

0 commit comments

Comments
 (0)