From 109ffe9a777658936a38d0c146579a67c60a0d17 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 11 五月 2017 17:48:48 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
index 30a8fe5..b6ab983 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <LinearLayout
-        android:id="@+id/pop_single_ll"
+        android:id="@+id/dialog_country_linear_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -14,31 +14,29 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="20dp"
+            android:padding="@dimen/w20dp"
             android:gravity="center"
             android:text="@string/country"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/text_size_big"
+            android:textSize="@dimen/w16dp"
             android:background="@color/colorPrimary"/>
         <LinearLayout
-            android:layout_width="300dp"
+            android:layout_width="@dimen/w300dp"
             android:layout_height="wrap_content"
-            android:paddingLeft="@dimen/view_size_10"
-            android:paddingRight="@dimen/view_size_10"
+            android:paddingLeft="@dimen/w10dp"
+            android:paddingRight="@dimen/w10dp"
             android:orientation="horizontal">
-            <com.wx.wheelview.widget.WheelView
-                android:id="@+id/pop_country_title"
+            <cn.com.basic.face.dialog.wheelview.widget.WheelView
+                android:id="@+id/dialog_country_name_first_letter"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"></com.wx.wheelview.widget.WheelView>
-
-            <com.wx.wheelview.widget.WheelView
-                android:id="@+id/pop_country_name"
+                android:layout_weight="1"/>
+            <cn.com.basic.face.dialog.wheelview.widget.WheelView
+                android:id="@+id/dialog_country_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/view_size_10"
-                android:layout_weight="1"></com.wx.wheelview.widget.WheelView>
-
+                android:layout_marginLeft="@dimen/w10dp"
+                android:layout_weight="1"/>
         </LinearLayout>
         <View
             android:layout_width="match_parent"
@@ -46,28 +44,28 @@
             android:background="@color/colorText_5"/>
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
+            android:layout_height="@dimen/h50dp"
             android:orientation="horizontal">
             <TextView
-                android:id="@+id/pop_country_confirm"
+                android:id="@+id/dialog_country_ok"
                 android:layout_weight="1"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/confirm"
-                android:textSize="@dimen/text_size_big"/>
+                android:textSize="@dimen/w16dp"/>
             <View
                 android:layout_width="0.5dp"
                 android:layout_height="match_parent"
                 android:background="@color/colorText_5"/>
             <TextView
-                android:id="@+id/pop_country_cancel"
+                android:id="@+id/dialog_country_cancel"
                 android:layout_weight="1"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:text="@string/cancel"
-                android:textSize="@dimen/text_size_big"/>
+                android:textSize="@dimen/w16dp"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

--
Gitblit v1.8.0