From dfe8bd37d45821676959c45c1177ea1073cca947 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 10:10:49 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 74ae6aa..b6ab983 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/dialog_country.xml
@@ -14,28 +14,28 @@
<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
+ <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
+ <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_marginLeft="@dimen/w10dp"
android:layout_weight="1"/>
</LinearLayout>
<View
@@ -44,7 +44,7 @@
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/dialog_country_ok"
@@ -53,7 +53,7 @@
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"
@@ -65,7 +65,7 @@
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