小狼 преди 5 години
родител
ревизия
fd56f490e5

+ 3 - 3
app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/MySetTwoActivity.java

@@ -221,7 +221,7 @@ public class MySetTwoActivity extends PresenterActivity implements View.OnClickL
221 221
         popupWindow.setAnimationStyle(R.style.pop_anim);
222 222
         popupWindow.setOutsideTouchable(true);
223 223
         popupWindow.setFocusable(true);
224
-        popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 0);
224
+        popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 30);
225 225
         light(0.8f);
226 226
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
227 227
             @Override
@@ -255,7 +255,7 @@ public class MySetTwoActivity extends PresenterActivity implements View.OnClickL
255 255
         popupWindow.setAnimationStyle(R.style.pop_anim);
256 256
         popupWindow.setOutsideTouchable(true);
257 257
         popupWindow.setFocusable(true);
258
-        popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 0);
258
+        popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 30);
259 259
         light(0.8f);
260 260
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
261 261
             @Override
@@ -327,7 +327,7 @@ public class MySetTwoActivity extends PresenterActivity implements View.OnClickL
327 327
         popupWindow.setAnimationStyle(R.style.pop_anim);
328 328
         popupWindow.setOutsideTouchable(true);
329 329
         popupWindow.setFocusable(true);
330
-        popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 0);
330
+        popupWindow.showAtLocation(layout, Gravity.BOTTOM, 0, 30);
331 331
         light(0.8f);
332 332
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
333 333
             @Override

+ 46 - 45
app/src/main/res/layout/newphoto_layout.xml

@@ -3,56 +3,57 @@
3 3
     xmlns:app="http://schemas.android.com/apk/res-auto"
4 4
     android:id="@+id/pop_root_ly"
5 5
     android:layout_width="match_parent"
6
-    android:layout_height="wrap_content"
7
-    android:layout_margin="5dp"
8
-    android:background="#cccccc"
6
+    android:layout_height="match_parent"
7
+    android:gravity="center_horizontal"
9 8
     android:orientation="vertical">
10
-    <android.support.v7.widget.CardView
11
-        android:layout_width="match_parent"
12
-        android:layout_height="wrap_content"
13
-        app:cardCornerRadius="5dp">
14
-        <LinearLayout
9
+
10
+    <LinearLayout
11
+        android:layout_width="355px"
12
+        android:layout_height="166px"
13
+        android:orientation="vertical"
14
+        android:background="@drawable/mytime"
15
+        android:gravity="center_horizontal"
16
+        >
17
+
18
+        <TextView
19
+            android:id="@+id/bt1"
15 20
             android:layout_width="match_parent"
16 21
             android:layout_height="wrap_content"
17
-            android:orientation="vertical">
18
-            <TextView
19
-                android:id="@+id/bt1"
20
-                android:layout_width="match_parent"
21
-                android:layout_height="40dp"
22
-                android:gravity="center"
23
-                android:text="相机"
24
-                android:textColor="@color/black"
25
-                android:background="#ffffff"
26
-                android:textSize="18sp" />
27
-            <View
28
-                android:layout_width="match_parent"
29
-                android:layout_height="1dp"
30
-                android:background="?android:attr/listDivider"
31
-                android:padding="2dp" />
32
-            <TextView
33
-                android:id="@+id/bt2"
34
-                android:layout_width="match_parent"
35
-                android:layout_height="40dp"
36
-                android:gravity="center"
37
-                android:text="相册"
38
-                android:textColor="@color/black"
39
-                android:background="#ffffff"
40
-                android:textSize="18sp" />
41
-        </LinearLayout>
42
-    </android.support.v7.widget.CardView>
43
-    <android.support.v7.widget.CardView
44
-        android:layout_width="match_parent"
45
-        android:layout_marginTop="5dp"
46
-        android:layout_marginBottom="5dp"
47
-        android:layout_height="wrap_content">
22
+            android:text="相机"
23
+            android:textColor="#333333"
24
+            android:textSize="20px"
25
+            android:gravity="center"
26
+            android:layout_marginTop="22px"
27
+            />
28
+        <View
29
+            android:layout_width="325px"
30
+            android:layout_height="1px"
31
+            android:background="#E9E9E9"
32
+            android:layout_marginTop="10px"
33
+            />
48 34
         <TextView
49
-            android:id="@+id/bt3"
35
+            android:id="@+id/bt2"
50 36
             android:layout_width="match_parent"
51
-            android:layout_height="40dp"
37
+            android:layout_height="48px"
38
+            android:text="相册"
39
+            android:textColor="#333333"
40
+            android:textSize="20px"
52 41
             android:gravity="center"
42
+            />
43
+
44
+        <View
45
+            android:layout_width="325px"
46
+            android:layout_height="1px"
47
+            android:background="#E9E9E9"
48
+            />
49
+        <TextView
50
+            android:id="@+id/bt3"
51
+            android:layout_width="match_parent"
52
+            android:layout_height="48px"
53 53
             android:text="取消"
54
-            android:textColor="@color/black"
55
-            android:background="#ffffff"
56
-            android:textSize="18sp" />
57
-    </android.support.v7.widget.CardView>
54
+            android:textColor="#333333"
55
+            android:textSize="20px"
56
+            android:gravity="center"
57
+            />
58
+    </LinearLayout>
58 59
 </LinearLayout>

+ 36 - 27
app/src/main/res/layout/newsex_layout.xml

@@ -1,34 +1,43 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
     android:layout_width="match_parent"
4
-    android:layout_height="118px"
4
+    android:layout_height="match_parent"
5 5
     android:orientation="vertical"
6
-    android:background="#ffffff"
6
+
7 7
     android:gravity="center_horizontal"
8 8
     >
9
-    <TextView
10
-        android:id="@+id/bt4"
11
-        android:layout_width="match_parent"
12
-        android:layout_height="wrap_content"
13
-        android:text="男"
14
-        android:textColor="#333333"
15
-        android:textSize="20px"
16
-        android:gravity="center"
17
-        android:layout_marginTop="22px"
18
-        />
19
-    <View
20
-        android:layout_width="325px"
21
-        android:layout_height="1px"
22
-        android:background="#E9E9E9"
23
-        android:layout_marginTop="10px"
24
-        />
25
-    <TextView
26
-        android:id="@+id/bt5"
27
-        android:layout_width="match_parent"
28
-        android:layout_height="48px"
29
-        android:text="女"
30
-        android:textColor="#333333"
31
-        android:textSize="20px"
32
-        android:gravity="center"
33
-        />
9
+    <LinearLayout
10
+        android:layout_width="355px"
11
+        android:layout_height="116px"
12
+        android:orientation="vertical"
13
+        android:background="@drawable/mytime"
14
+        android:gravity="center_horizontal"
15
+        >
16
+        <TextView
17
+            android:id="@+id/bt4"
18
+            android:layout_width="match_parent"
19
+            android:layout_height="wrap_content"
20
+            android:text="男"
21
+            android:textColor="#333333"
22
+            android:textSize="20px"
23
+            android:gravity="center"
24
+            android:layout_marginTop="22px"
25
+            />
26
+        <View
27
+            android:layout_width="325px"
28
+            android:layout_height="1px"
29
+            android:background="#E9E9E9"
30
+            android:layout_marginTop="10px"
31
+            />
32
+        <TextView
33
+            android:id="@+id/bt5"
34
+            android:layout_width="match_parent"
35
+            android:layout_height="48px"
36
+            android:text="女"
37
+            android:textColor="#333333"
38
+            android:textSize="20px"
39
+            android:gravity="center"
40
+            />
41
+    </LinearLayout>
42
+
34 43
 </LinearLayout>

+ 49 - 41
app/src/main/res/layout/newtype_layout.xml

@@ -1,49 +1,57 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
     android:layout_width="match_parent"
4
-    android:layout_height="166px"
4
+    android:layout_height="match_parent"
5 5
     android:orientation="vertical"
6
-    android:background="#ffffff"
7 6
     android:gravity="center_horizontal"
8 7
     >
9
-    <TextView
10
-        android:id="@+id/bt6"
11
-        android:layout_width="match_parent"
12
-        android:layout_height="wrap_content"
13
-        android:text="上班族"
14
-        android:textColor="#333333"
15
-        android:textSize="20px"
16
-        android:gravity="center"
17
-        android:layout_marginTop="22px"
18
-        />
19
-    <View
20
-        android:layout_width="325px"
21
-        android:layout_height="1px"
22
-        android:background="#E9E9E9"
23
-        android:layout_marginTop="10px"
24
-        />
25
-    <TextView
26
-        android:id="@+id/bt7"
27
-        android:layout_width="match_parent"
28
-        android:layout_height="48px"
29
-        android:text="个体户"
30
-        android:textColor="#333333"
31
-        android:textSize="20px"
32
-        android:gravity="center"
33
-        />
8
+    <LinearLayout
9
+        android:layout_width="355px"
10
+        android:layout_height="166px"
11
+        android:orientation="vertical"
12
+        android:background="@drawable/mytime"
13
+        android:gravity="center_horizontal"
14
+        >
34 15
 
35
-    <View
36
-        android:layout_width="325px"
37
-        android:layout_height="1px"
38
-        android:background="#E9E9E9"
39
-        />
40
-    <TextView
41
-        android:id="@+id/bt8"
42
-        android:layout_width="match_parent"
43
-        android:layout_height="48px"
44
-        android:text="企业主"
45
-        android:textColor="#333333"
46
-        android:textSize="20px"
47
-        android:gravity="center"
48
-        />
16
+        <TextView
17
+            android:id="@+id/bt6"
18
+            android:layout_width="match_parent"
19
+            android:layout_height="wrap_content"
20
+            android:text="上班族"
21
+            android:textColor="#333333"
22
+            android:textSize="20px"
23
+            android:gravity="center"
24
+            android:layout_marginTop="22px"
25
+            />
26
+        <View
27
+            android:layout_width="325px"
28
+            android:layout_height="1px"
29
+            android:background="#E9E9E9"
30
+            android:layout_marginTop="10px"
31
+            />
32
+        <TextView
33
+            android:id="@+id/bt7"
34
+            android:layout_width="match_parent"
35
+            android:layout_height="48px"
36
+            android:text="个体户"
37
+            android:textColor="#333333"
38
+            android:textSize="20px"
39
+            android:gravity="center"
40
+            />
41
+
42
+        <View
43
+            android:layout_width="325px"
44
+            android:layout_height="1px"
45
+            android:background="#E9E9E9"
46
+            />
47
+        <TextView
48
+            android:id="@+id/bt8"
49
+            android:layout_width="match_parent"
50
+            android:layout_height="48px"
51
+            android:text="企业主"
52
+            android:textColor="#333333"
53
+            android:textSize="20px"
54
+            android:gravity="center"
55
+            />
56
+    </LinearLayout>
49 57
 </LinearLayout>