Skip to content

F
fastdevelop
Commit d8d1ec06 by gao.chao
Options

尺寸适配

parent 6c215fe6
Showing with 224 additions and 321 deletions
app/src/main/java/com/mayi/demo/ViewActviity.java
package com.mayi.demo; package com.mayi.demo;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.view.View; import android.view.View;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
...@@ -18,10 +19,13 @@ import com.mayi.fastdevelop.view.wheel.ChangeTimeDialog; ...@@ -18,10 +19,13 @@ import com.mayi.fastdevelop.view.wheel.ChangeTimeDialog;
*/ */
public class ViewActviity extends BaseActivity { public class ViewActviity extends BaseActivity {
private Handler handler;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.test_layout); setContentView(R.layout.test_layout);
handler = new Handler();
findViewById(R.id.b1).setOnClickListener(new View.OnClickListener() { findViewById(R.id.b1).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -75,12 +79,12 @@ public class ViewActviity extends BaseActivity { ...@@ -75,12 +79,12 @@ public class ViewActviity extends BaseActivity {
DialogUtils.showCommonDialog("标题", "左边", "右边", v.getContext(), new DialogUtils.DefaultDialogListener() { DialogUtils.showCommonDialog("标题", "左边", "右边", v.getContext(), new DialogUtils.DefaultDialogListener() {
@Override @Override
public void onClickLeft() { public void onClickLeft() {
ToastUtil.show(ViewActviity.this,"点击左边"); ToastUtil.show(ViewActviity.this, "点击左边");
} }
@Override @Override
public void onClickRight() { public void onClickRight() {
ToastUtil.show(ViewActviity.this,"点击右边"); ToastUtil.show(ViewActviity.this, "点击右边");
} }
}); });
} }
...@@ -92,12 +96,12 @@ public class ViewActviity extends BaseActivity { ...@@ -92,12 +96,12 @@ public class ViewActviity extends BaseActivity {
DialogUtils.showCommonDialog("标题", v.getContext(), new DialogUtils.DefaultDialogListener() { DialogUtils.showCommonDialog("标题", v.getContext(), new DialogUtils.DefaultDialogListener() {
@Override @Override
public void onClickLeft() { public void onClickLeft() {
ToastUtil.show(ViewActviity.this,"取消"); ToastUtil.show(ViewActviity.this, "取消");
} }
@Override @Override
public void onClickRight() { public void onClickRight() {
ToastUtil.show(ViewActviity.this,"确定"); ToastUtil.show(ViewActviity.this, "确定");
} }
}); });
} }
...@@ -109,7 +113,7 @@ public class ViewActviity extends BaseActivity { ...@@ -109,7 +113,7 @@ public class ViewActviity extends BaseActivity {
DialogUtils.showTipsDialog("12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", v.getContext(), new DialogUtils.TipsDialogListener() { DialogUtils.showTipsDialog("12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", v.getContext(), new DialogUtils.TipsDialogListener() {
@Override @Override
public void onClickOK() { public void onClickOK() {
ToastUtil.show(ViewActviity.this,"确定"); ToastUtil.show(ViewActviity.this, "确定");
} }
}); });
} }
...@@ -121,7 +125,7 @@ public class ViewActviity extends BaseActivity { ...@@ -121,7 +125,7 @@ public class ViewActviity extends BaseActivity {
DialogUtils.showTipsDialog("1234567890yiersn", v.getContext(), new DialogUtils.TipsDialogListener() { DialogUtils.showTipsDialog("1234567890yiersn", v.getContext(), new DialogUtils.TipsDialogListener() {
@Override @Override
public void onClickOK() { public void onClickOK() {
ToastUtil.show(ViewActviity.this,"确定"); ToastUtil.show(ViewActviity.this, "确定");
} }
}); });
} }
...@@ -166,6 +170,19 @@ public class ViewActviity extends BaseActivity { ...@@ -166,6 +170,19 @@ public class ViewActviity extends BaseActivity {
gotoActivity(TestListLazyLoadingActivity.class); gotoActivity(TestListLazyLoadingActivity.class);
} }
}); });
findViewById(R.id.b15).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showLoadingDialog();
handler.postDelayed(new Runnable() {
@Override
public void run() {
dismssLoadingDialog();
}
}, 2000);
}
});
} }
} }
app/src/main/res/layout/activity_banner.xml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<com.youth.banner.Banner <com.youth.banner.Banner
android:id="@+id/banner1" android:id="@+id/banner1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_150" /> android:layout_height="@dimen/size_150" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<com.youth.banner.Banner <com.youth.banner.Banner
android:id="@+id/banner2" android:id="@+id/banner2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_150" /> android:layout_height="@dimen/size_150" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
app/src/main/res/layout/activity_fragment_interactive.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<TextView <TextView
android:id="@+id/tv" android:id="@+id/tv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_40" /> android:layout_height="@dimen/size_40" />
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
......
app/src/main/res/layout/activity_fragment_interactive_2.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<TextView <TextView
android:id="@+id/tv" android:id="@+id/tv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_40" /> android:layout_height="@dimen/size_40" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_my.xml
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
android:id="@+id/tv" android:id="@+id/tv"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/im_dp_20"/> android:layout_marginTop="@dimen/size_20"/>
<Button <Button
android:id="@+id/b1" android:id="@+id/b1"
......
app/src/main/res/layout/item_tv.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:padding="@dimen/im_dp_5" android:padding="@dimen/size_5"
android:text="加载中。。。" android:text="加载中。。。"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/txt_size_28px" /> android:textSize="@dimen/text_size_14" />
app/src/main/res/layout/test_layout.xml
...@@ -96,5 +96,11 @@ ...@@ -96,5 +96,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="懒加载" /> android:text="懒加载" />
<Button
android:id="@+id/b15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="展示Loading" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
\ No newline at end of file
app/src/main/res/layout/title_activity_layout.xml
...@@ -8,31 +8,31 @@ ...@@ -8,31 +8,31 @@
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title1" android:id="@+id/title1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" android:layout_height="@dimen/size_50"
android:layout_marginTop="@dimen/im_dp_20" /> android:layout_marginTop="@dimen/size_20" />
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title2" android:id="@+id/title2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" android:layout_height="@dimen/size_50"
android:layout_marginTop="@dimen/im_dp_20" /> android:layout_marginTop="@dimen/size_20" />
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title3" android:id="@+id/title3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" android:layout_height="@dimen/size_50"
android:layout_marginTop="@dimen/im_dp_20" /> android:layout_marginTop="@dimen/size_20" />
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title4" android:id="@+id/title4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" android:layout_height="@dimen/size_50"
android:layout_marginTop="@dimen/im_dp_20" /> android:layout_marginTop="@dimen/size_20" />
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title5" android:id="@+id/title5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" android:layout_height="@dimen/size_50"
android:layout_marginTop="@dimen/im_dp_20" /> android:layout_marginTop="@dimen/size_20" />
</LinearLayout> </LinearLayout>
fastDevelop/src/main/res/drawable/bg_progress_rount_border_accent.xml
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<!-- 设置背景 --> <!-- 设置背景 -->
<item android:id="@android:id/background"> <item android:id="@android:id/background">
<shape> <shape>
<corners android:radius="5dp"/> <corners android:radius="@dimen/size_5"/>
<stroke <stroke
android:width="@dimen/line_height" android:width="@dimen/size_1"
android:color="@color/colorAccent"/> android:color="@color/colorAccent"/>
<solid android:color="@color/white"/> <solid android:color="@color/white"/>
</shape> </shape>
......
fastDevelop/src/main/res/drawable/bg_white_border_accent_rectangle.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners android:radius="@dimen/shape_radius_default"/> <corners android:radius="@dimen/size_4"/>
<solid android:color="@color/white"/> <solid android:color="@color/white"/>
<stroke <stroke
android:width="@dimen/line_height" android:width="@dimen/size_1"
android:color="@color/colorAccent"/> android:color="@color/colorAccent"/>
</shape> </shape>
\ No newline at end of file
fastDevelop/src/main/res/drawable/btn_accont_grey_radius.xml
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<item android:state_enabled="true"> <item android:state_enabled="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="@dimen/shape_radius_default"/> <corners android:radius="@dimen/size_4"/>
<solid android:color="@color/color_DF0029"/> <solid android:color="@color/color_DF0029"/>
</shape> </shape>
</item> </item>
<item android:state_enabled="false"> <item android:state_enabled="false">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="@dimen/shape_radius_default"/> <corners android:radius="@dimen/size_4"/>
<solid android:color="@color/border_grey"/> <solid android:color="@color/border_grey"/>
</shape> </shape>
</item> </item>
......
fastDevelop/src/main/res/layout/activity_login.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<ImageView
android:id="@+id/img_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="70dp"
android:src="@mipmap/ic_launcher" />
<LinearLayout
android:id="@+id/ll_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/img_logo"
android:layout_marginTop="25dp"
android:background="@color/white"
android:orientation="vertical"
android:padding="@dimen/space_30px">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="45dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/space_20px"
android:paddingRight="@dimen/space_20px">
<!--帐号-->
<TextView
style="@style/txt_normal"
android:gravity="center"
android:minWidth="70dp"
android:text="@string/account" />
<EditText
android:id="@+id/edit_account"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:hint="@string/hint_input_account"
android:inputType="number"
android:maxLength="@integer/phone_length"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/txt_color_hint"
android:textSize="@dimen/txt_size_28px" />
</LinearLayout>
<View style="@style/line_h" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="45dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/space_20px"
android:paddingRight="@dimen/space_20px">
<!--密码-->
<TextView
style="@style/txt_normal"
android:gravity="center"
android:minWidth="70dp"
android:text="@string/pwd" />
<EditText
android:id="@+id/edit_pwd"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@null"
android:digits="@string/digits"
android:hint="@string/hint_pwd"
android:inputType="textPassword"
android:maxLength="@integer/pwd_max_length"
android:maxLines="1"
android:textColor="@color/txt_black"
android:textColorHint="@color/txt_color_hint"
android:textSize="@dimen/txt_size_28px" />
<ImageView
android:id="@+id/img_eye"
android:layout_width="45dp"
android:layout_height="45dp"
android:padding="@dimen/space_30px"
android:src="@mipmap/icon_close_eyes" />
</LinearLayout>
<View style="@style/line_h" />
</LinearLayout>
<!--登录-->
<Button
android:id="@+id/btn_login"
android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_44"
android:layout_below="@id/ll_input"
android:layout_marginLeft="@dimen/space_30px"
android:layout_marginRight="@dimen/space_30px"
android:layout_marginTop="@dimen/space_20px"
android:background="@drawable/btn_accont_grey_radius"
android:gravity="center"
android:text="@string/login"
android:textColor="@color/color_enable_white_grey_light"
android:textSize="@dimen/txt_size_32px" />
<!--<TextView-->
<!--android:id="@+id/txt_froget_pwd"-->
<!--style="@style/txt_normal"-->
<!--android:layout_alignParentRight="true"-->
<!--android:layout_below="@id/btn_login"-->
<!--android:layout_gravity="right"-->
<!--android:gravity="center"-->
<!--android:padding="@dimen/space_30px"-->
<!--android:text="@string/txt_froget_pwd"-->
<!--android:textColor="@color/color_DF0029" />-->
</RelativeLayout>
\ No newline at end of file
fastDevelop/src/main/res/layout/activity_scanner.xml
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
android:text="11@string/qr_sclaing" android:text="11@string/qr_sclaing"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textColorHint="@color/txt_color_hint" android:textColorHint="@color/txt_color_hint"
android:textSize="@dimen/txt_size_32px" android:textSize="@dimen/text_size_16"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" android:visibility="gone"
tools:visibility="gone" /> tools:visibility="gone" />
...@@ -42,5 +42,5 @@ ...@@ -42,5 +42,5 @@
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/im_view_title" android:id="@+id/im_view_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height" /> android:layout_height="@dimen/size_50" />
</FrameLayout> </FrameLayout>
fastDevelop/src/main/res/layout/dialog_common_loading.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp" android:layout_width="@dimen/size_80"
android:layout_height="80dp" android:layout_height="@dimen/size_80"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/bg_common_loading_dialog"> android:background="@drawable/bg_common_loading_dialog">
<RelativeLayout <RelativeLayout
android:layout_width="80dp" android:layout_width="@dimen/size_80"
android:layout_height="80dp" android:layout_height="@dimen/size_80"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:padding="15dp"> android:padding="@dimen/size_15">
<ProgressBar <ProgressBar
android:layout_width="30dp" android:layout_width="@dimen/size_30"
android:layout_height="30dp" android:layout_height="@dimen/size_30"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:indeterminateDrawable="@drawable/progress_cirle" /> android:indeterminateDrawable="@drawable/progress_cirle" />
</RelativeLayout> </RelativeLayout>
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/size_8"
android:text="加载中..." android:text="加载中..."
android:textSize="14sp" android:textSize="@dimen/text_size_14"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
fastDevelop/src/main/res/layout/dialog_default_sure.xml
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="@dimen/size_120"
android:layout_marginLeft="20dp" android:layout_marginLeft="@dimen/size_20"
android:layout_marginRight="20dp" android:layout_marginRight="@dimen/size_20"
android:background="@drawable/bg_dialog_shape" android:background="@drawable/bg_dialog_shape"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
...@@ -18,15 +18,15 @@ ...@@ -18,15 +18,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/im_dp_20" android:layout_marginTop="@dimen/size_20"
android:gravity="center" android:gravity="center"
android:text="标题" android:text="标题"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_36px" /> android:textSize="@dimen/text_size_18" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="@dimen/size_50"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_32px" /> android:textSize="@dimen/text_size_16" />
<View <View
android:layout_width="@dimen/im_dp_0.5" android:layout_width="@dimen/size_1"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_666666" /> android:background="@color/color_666666" />
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
android:gravity="center" android:gravity="center"
android:text="@string/sure" android:text="@string/sure"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_32px" /> android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_0.5" android:layout_height="@dimen/size_1"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/im_dp_50" android:layout_marginBottom="@dimen/size_50"
android:background="@color/color_666666" /> android:background="@color/color_666666" />
</RelativeLayout> </RelativeLayout>
......
fastDevelop/src/main/res/layout/dialog_default_tips.xml
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="@dimen/size_20"
android:layout_marginRight="20dp" android:layout_marginRight="@dimen/size_20"
android:background="@drawable/bg_dialog_shape" android:background="@drawable/bg_dialog_shape"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
...@@ -18,25 +18,25 @@ ...@@ -18,25 +18,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:padding="@dimen/im_dp_10" android:padding="@dimen/size_10"
android:gravity="center" android:gravity="center"
android:text="内容" android:text="内容"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_36px" /> android:textSize="@dimen/text_size_18" />
<TextView <TextView
android:id="@+id/tv_ok" android:id="@+id/tv_ok"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" android:layout_height="@dimen/size_50"
android:layout_below="@+id/tv_content" android:layout_below="@+id/tv_content"
android:gravity="center" android:gravity="center"
android:text="@string/sure" android:text="@string/sure"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_32px" /> android:textSize="@dimen/text_size_16" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_0.5" android:layout_height="@dimen/size_1"
android:layout_below="@+id/tv_content" android:layout_below="@+id/tv_content"
android:background="@color/color_666666" /> android:background="@color/color_666666" />
</RelativeLayout> </RelativeLayout>
......
fastDevelop/src/main/res/layout/dialog_download_apk_progress.xml
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="40dp" android:layout_marginLeft="@dimen/size_40"
android:layout_marginRight="40dp" android:layout_marginRight="@dimen/size_40"
android:background="@drawable/bg_statistics_white_round" android:background="@drawable/bg_statistics_white_round"
android:orientation="vertical"> android:orientation="vertical">
...@@ -17,28 +17,28 @@ ...@@ -17,28 +17,28 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="25dp" android:layout_marginTop="@dimen/size_25"
android:text="@string/downloading" android:text="@string/downloading"
android:textColor="@color/txt_black" android:textColor="@color/txt_black"
android:textSize="16sp" /> android:textSize="@dimen/text_size_16" />
<View <View
android:id="@+id/line" android:id="@+id/line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="@dimen/size_1"
android:layout_below="@+id/title" android:layout_below="@+id/title"
android:layout_marginTop="25dp" android:layout_marginTop="@dimen/size_25"
android:background="@color/statistics_radar_color" /> android:background="@color/statistics_radar_color" />
<ProgressBar <ProgressBar
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="250dp" android:layout_width="@dimen/size_250"
android:layout_height="10dp" android:layout_height="@dimen/size_10"
android:layout_below="@+id/line" android:layout_below="@+id/line"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="42dp" android:layout_marginTop="@dimen/size_42"
android:max="100" android:max="100"
android:progressDrawable="@drawable/bg_statistics_progress_drawable_round" /> android:progressDrawable="@drawable/bg_statistics_progress_drawable_round" />
...@@ -46,21 +46,22 @@ ...@@ -46,21 +46,22 @@
android:id="@+id/txt_percent" android:id="@+id/txt_percent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/progress_bar"
android:layout_below="@+id/progress_bar" android:layout_below="@+id/progress_bar"
android:layout_marginBottom="54dp" android:layout_alignLeft="@+id/progress_bar"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/size_11"
android:layout_marginBottom="@dimen/size_54"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
android:textSize="13sp" /> android:textSize="@dimen/text_size_13" />
<TextView <TextView
android:id="@+id/txt_total" android:id="@+id/txt_total"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignRight="@+id/progress_bar"
android:layout_below="@+id/progress_bar" android:layout_below="@+id/progress_bar"
android:layout_marginBottom="54dp" android:layout_alignRight="@+id/progress_bar"
android:layout_marginTop="12dp" android:layout_marginTop="@dimen/size_12"
android:layout_marginBottom="@dimen/size_54"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
android:textSize="13sp" /> android:textSize="@dimen/text_size_13" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
fastDevelop/src/main/res/layout/dialog_myinfo_changeaddress.xml
...@@ -8,46 +8,46 @@ ...@@ -8,46 +8,46 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp"> android:layout_height="@dimen/size_60">
<TextView <TextView
android:id="@+id/tv_share_title" android:id="@+id/tv_share_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/space_30px" android:layout_marginLeft="@dimen/size_15"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="选择地区" android:text="选择地区"
android:textColor="@color/txt_grey" android:textColor="@color/txt_grey"
android:textSize="18sp"/> android:textSize="@dimen/text_size_18" />
<TextView <TextView
android:id="@+id/btn_sure" android:id="@+id/btn_sure"
android:layout_width="80dp" android:layout_width="@dimen/size_80"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center" android:gravity="center"
android:text="@string/sure" android:text="@string/sure"
android:textColor="@color/txt_notice_color_blue" android:textColor="@color/txt_notice_color_blue"
android:textSize="16sp"/> android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="80dp" android:layout_width="@dimen/size_80"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toLeftOf="@+id/btn_sure" android:layout_toLeftOf="@+id/btn_sure"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/txt_grey" android:textColor="@color/txt_grey"
android:textSize="16sp"/> android:textSize="@dimen/text_size_16" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="175dp" android:layout_height="@dimen/size_190"
android:layout_marginLeft="10dp" android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="10dp" android:layout_marginRight="@dimen/size_10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -56,14 +56,14 @@ ...@@ -56,14 +56,14 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1"/> android:layout_weight="1" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
android:id="@+id/wv_address_city" android:id="@+id/wv_address_city"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="1"/> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
......
fastDevelop/src/main/res/layout/dialog_myinfo_changebirth.xml
...@@ -8,33 +8,32 @@ ...@@ -8,33 +8,32 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp"> android:layout_height="@dimen/size_50">
<TextView <TextView
android:id="@+id/btn_sure" android:id="@+id/btn_sure"
android:layout_width="80dp" android:layout_width="@dimen/size_80"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:gravity="center" android:gravity="center"
android:text="@string/sure" android:text="@string/sure"
android:textColor="@color/txt_notice_color_blue" android:textColor="@color/txt_notice_color_blue"
android:textSize="16sp" /> android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
android:layout_width="80dp" android:layout_width="@dimen/size_80"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/txt_grey" android:textColor="@color/txt_grey"
android:textSize="16sp" /> android:textSize="@dimen/text_size_16" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="175dp" android:layout_height="@dimen/size_175"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -48,7 +47,7 @@ ...@@ -48,7 +47,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_20px" android:layout_margin="@dimen/size_10"
android:text="年" /> android:text="年" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -61,7 +60,7 @@ ...@@ -61,7 +60,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_20px" android:layout_margin="@dimen/size_10"
android:text="月" /> android:text="月" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -74,7 +73,7 @@ ...@@ -74,7 +73,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_20px" android:layout_margin="@dimen/size_10"
android:text="日" /> android:text="日" />
</LinearLayout> </LinearLayout>
......
fastDevelop/src/main/res/layout/dialog_select_pictures.xml
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="20dp" android:layout_marginLeft="@dimen/size_20"
android:layout_marginRight="20dp" android:layout_marginRight="@dimen/size_20"
android:background="@drawable/bg_dialog_shape"> android:background="@drawable/bg_dialog_shape">
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/im_dp_15" android:padding="@dimen/size_15"
android:text="请选择图片上传方式" android:text="请选择图片上传方式"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_32px" /> android:textSize="@dimen/text_size_16" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_0.5" android:layout_height="@dimen/size_1"
android:layout_below="@+id/tv_title" android:layout_below="@+id/tv_title"
android:background="@color/color_666666" /> android:background="@color/color_666666" />
...@@ -33,22 +33,22 @@ ...@@ -33,22 +33,22 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_title" android:layout_below="@+id/tv_title"
android:layout_marginLeft="@dimen/im_dp_10" android:layout_marginLeft="@dimen/size_10"
android:padding="@dimen/im_dp_10" android:padding="@dimen/size_10"
android:text="@string/album" android:text="@string/album"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_32px" /> android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/tv_photograph" android:id="@+id/tv_photograph"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_album" android:layout_below="@+id/tv_album"
android:layout_marginLeft="@dimen/im_dp_10" android:layout_marginLeft="@dimen/size_10"
android:padding="@dimen/im_dp_10" android:padding="@dimen/size_10"
android:text="@string/photograph" android:text="@string/photograph"
android:textColor="@color/color_333333" android:textColor="@color/color_333333"
android:textSize="@dimen/txt_size_32px" /> android:textSize="@dimen/text_size_16" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
fastDevelop/src/main/res/layout/dialog_update.xml
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:paddingLeft="20dp" android:paddingLeft="@dimen/size_20"
android:paddingRight="20dp"> android:paddingRight="@dimen/size_20">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<TextView <TextView
android:id="@+id/txt_title" android:id="@+id/txt_title"
style="@style/txt_big" style="@style/txt_big"
android:layout_marginBottom="@dimen/space_40px" android:layout_marginBottom="@dimen/size_20"
android:layout_marginTop="@dimen/space_40px" android:layout_marginTop="@dimen/size_20"
android:text="@string/app_version_update" /> android:text="@string/app_version_update" />
<View style="@style/line_h" /> <View style="@style/line_h" />
...@@ -31,83 +31,83 @@ ...@@ -31,83 +31,83 @@
<TextView <TextView
android:id="@+id/pack_content" android:id="@+id/pack_content"
style="@style/txt_normal" style="@style/txt_normal"
android:padding="@dimen/space_30px" /> android:padding="@dimen/size_15" />
<TextView <TextView
android:id="@+id/pack_size" android:id="@+id/pack_size"
style="@style/txt_normal" style="@style/txt_normal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="left" android:gravity="left"
android:paddingLeft="@dimen/space_30px" /> android:paddingLeft="@dimen/size_15" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="12dp" android:layout_marginBottom="@dimen/size_12"
android:layout_marginLeft="@dimen/space_30px" android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/space_30px" android:layout_marginRight="@dimen/size_15"
android:layout_marginTop="30dp" android:layout_marginTop="@dimen/size_30"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/txt_sure" android:id="@+id/txt_sure"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="@dimen/size_45"
android:background="@drawable/btn_accont_grey_radius" android:background="@drawable/btn_accont_grey_radius"
android:gravity="center" android:gravity="center"
android:text="@string/sure" android:text="@string/sure"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/txt_size_36px" /> android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/txt_browsers" android:id="@+id/txt_browsers"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="@dimen/size_45"
android:layout_marginTop="@dimen/im_dp_10" android:layout_marginTop="@dimen/size_10"
android:background="@drawable/btn_accont_grey_radius" android:background="@drawable/btn_accont_grey_radius"
android:gravity="center" android:gravity="center"
android:text="@string/go_browsers" android:text="@string/go_browsers"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/txt_size_36px" /> android:textSize="@dimen/text_size_16" />
<TextView <TextView
android:id="@+id/txt_cancel" android:id="@+id/txt_cancel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="@dimen/size_45"
android:layout_marginTop="@dimen/im_dp_10" android:layout_marginTop="@dimen/size_10"
android:background="@drawable/bg_white_border_accent_rectangle" android:background="@drawable/bg_white_border_accent_rectangle"
android:gravity="center" android:gravity="center"
android:text="@string/cancel" android:text="@string/cancel"
android:textColor="@color/colorAccent" android:textColor="@color/colorAccent"
android:textSize="@dimen/txt_size_36px" /> android:textSize="@dimen/text_size_16" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="@dimen/size_120"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/space_30px" android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/space_30px" android:layout_marginRight="@dimen/size_15"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar <ProgressBar
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dp" android:layout_height="@dimen/size_10"
android:max="100" android:max="100"
android:progress="50" android:progress="50"
android:progressDrawable="@drawable/bg_progress_rount_border_accent" /> android:progressDrawable="@drawable/bg_progress_rount_border_accent" />
<TextView <TextView
style="@style/txt_normal" style="@style/txt_normal"
android:layout_marginTop="@dimen/space_20px" android:layout_marginTop="@dimen/size_10"
android:text="60%" android:text="60%"
android:textColor="@color/colorAccent" /> android:textColor="@color/colorAccent" />
</LinearLayout> </LinearLayout>
......
fastDevelop/src/main/res/layout/item_birth_year.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="35dip" android:layout_height="@dimen/size_35"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:textColor="#000000"/> android:textColor="#000000"
android:textSize="@dimen/text_size_16"/>
</LinearLayout> </LinearLayout>
fastDevelop/src/main/res/layout/item_list_lazy_loading_load_more.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:padding="@dimen/im_dp_5" android:padding="@dimen/size_5"
android:textSize="@dimen/txt_size_28px" android:textSize="@dimen/text_size_14"
android:textColor="@color/black" android:textColor="@color/black"
android:text="加载中。。。" /> android:text="加载中。。。" />
fastDevelop/src/main/res/layout/route_inputs.xml
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
android:id="@+id/online_user_list_item_textview" android:id="@+id/online_user_list_item_textview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="20dip" android:layout_marginBottom="@dimen/size_20"
android:layout_marginTop="20dip" android:layout_marginTop="@dimen/size_20"
android:padding="@dimen/im_dp_2" android:padding="@dimen/size_2"
android:textColor="#898989" android:textColor="#898989"
android:textSize="15sp" /> android:textSize="@dimen/text_size_16" />
fastDevelop/src/main/res/layout/view_holder_result.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="8dp"> android:padding="@dimen/size_8">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="title" android:text="title"
android:textSize="15sp" /> android:textSize="@dimen/text_size_15" />
<TextView <TextView
android:id="@+id/text_title_sub" android:id="@+id/text_title_sub"
...@@ -27,15 +27,15 @@ ...@@ -27,15 +27,15 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:text="sub_title" android:text="sub_title"
android:textColor="@android:color/darker_gray" android:textColor="@android:color/darker_gray"
android:textSize="13sp" /> android:textSize="@dimen/text_size_13" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/image_check" android:id="@+id/image_check"
android:layout_width="32dp" android:layout_width="@dimen/size_32"
android:layout_height="32dp" android:layout_height="@dimen/size_32"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/size_8"
android:src="@mipmap/icon_affirm_selected" /> android:src="@mipmap/icon_affirm_selected" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
fastDevelop/src/main/res/layout/view_title_bar.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/title_bar_height" android:layout_height="@dimen/size_50"
android:background="@color/white"> android:background="@color/white">
<!--返回--> <!--返回-->
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/llib_ripple_round_bg_quanju" android:background="@drawable/llib_ripple_round_bg_quanju"
android:paddingLeft="10dp" android:paddingLeft="@dimen/size_10"
android:paddingRight="15dp"> android:paddingRight="@dimen/size_15">
<ImageView <ImageView
android:id="@+id/iv_left" android:id="@+id/iv_left"
android:layout_width="16dp" android:layout_width="@dimen/size_16"
android:layout_height="16dp" android:layout_height="@dimen/size_16"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@mipmap/icon_back" /> android:src="@mipmap/icon_back" />
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="2dp" android:layout_marginLeft="@dimen/size_2"
android:layout_toRightOf="@id/iv_left" android:layout_toRightOf="@id/iv_left"
android:text="@string/back" android:text="@string/back"
android:textColor="#222222" android:textColor="#222222"
android:textSize="@dimen/txt_size_28px" /> android:textSize="@dimen/text_size_14" />
</RelativeLayout> </RelativeLayout>
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toRightOf="@id/layout_left" android:layout_toRightOf="@id/layout_left"
android:background="@drawable/llib_ripple_round_bg_quanju" android:background="@drawable/llib_ripple_round_bg_quanju"
android:paddingLeft="5dp" android:paddingLeft="@dimen/size_5"
android:paddingRight="5dp" android:paddingRight="@dimen/size_5"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/close" android:text="@string/close"
android:textColor="#666666" android:textColor="#666666"
android:textSize="14sp" /> android:textSize="@dimen/text_size_14" />
</RelativeLayout> </RelativeLayout>
<!--标题--> <!--标题-->
...@@ -62,12 +62,12 @@ ...@@ -62,12 +62,12 @@
android:background="@drawable/llib_ripple_round_bg_quanju" android:background="@drawable/llib_ripple_round_bg_quanju"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxWidth="@dimen/size_150"
android:maxLines="1" android:maxLines="1"
android:maxWidth="150dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="#222222" android:textColor="#222222"
android:textSize="18sp" /> android:textSize="@dimen/text_size_18" />
<ImageView <ImageView
android:id="@+id/iv_logo" android:id="@+id/iv_logo"
...@@ -90,12 +90,12 @@ ...@@ -90,12 +90,12 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:paddingLeft="15dp" android:paddingLeft="@dimen/size_15"
android:paddingRight="15dp" android:paddingRight="@dimen/size_15"
android:singleLine="true" android:singleLine="true"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="#666666" android:textColor="#666666"
android:textSize="14sp" android:textSize="@dimen/text_size_14"
android:visibility="gone" /> android:visibility="gone" />
<RelativeLayout <RelativeLayout
...@@ -103,14 +103,14 @@ ...@@ -103,14 +103,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/llib_ripple_round_bg_quanju" android:background="@drawable/llib_ripple_round_bg_quanju"
android:paddingLeft="15dp" android:paddingLeft="@dimen/size_15"
android:paddingRight="15dp" android:paddingRight="@dimen/size_15"
android:visibility="gone"> android:visibility="gone">
<View <View
android:id="@+id/v_right" android:id="@+id/v_right"
android:layout_width="20dp" android:layout_width="@dimen/size_20"
android:layout_height="20dp" android:layout_height="@dimen/size_20"
android:layout_centerInParent="true" /> android:layout_centerInParent="true" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<!--底部线条--> <!--底部线条-->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0.1dp" android:layout_height="@dimen/size_1"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="@color/background_line" /> android:background="@color/background_line" />
</RelativeLayout> </RelativeLayout>
fastDevelop/src/main/res/layout/view_wheel_date.xml
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:padding="@dimen/space_20px" android:padding="@dimen/size_10"
android:text="@string/cancel" android:text="@string/cancel"
android:textSize="@dimen/txt_size_34px" /> android:textSize="@dimen/text_size_17" />
<TextView <TextView
android:id="@+id/txt_center" android:id="@+id/txt_center"
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:padding="@dimen/space_20px" android:padding="@dimen/size_10"
android:textSize="@dimen/txt_size_34px" /> android:textSize="@dimen/text_size_17" />
<!--完成--> <!--完成-->
<TextView <TextView
android:id="@+id/txt_complete" android:id="@+id/txt_complete"
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:padding="@dimen/space_20px" android:padding="@dimen/size_10"
android:text="完成" android:text="完成"
android:textSize="@dimen/txt_size_34px" /> android:textSize="@dimen/text_size_17" />
<View <View
android:id="@+id/view_line" android:id="@+id/view_line"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_30px" android:layout_margin="@dimen/size_15"
android:text="年" /> android:text="年" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_30px" android:layout_margin="@dimen/size_15"
android:text="月" /> android:text="月" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_30px" android:layout_margin="@dimen/size_15"
android:text="日" /> android:text="日" />
</LinearLayout> </LinearLayout>
......
fastDevelop/src/main/res/layout/view_wheel_time.xml
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:padding="@dimen/space_20px" android:padding="@dimen/size_10"
android:text="@string/cancel" android:text="@string/cancel"
android:textSize="@dimen/txt_size_34px" /> android:textSize="@dimen/text_size_17" />
<TextView <TextView
android:id="@+id/txt_center" android:id="@+id/txt_center"
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:padding="@dimen/space_20px" android:padding="@dimen/size_10"
android:textSize="@dimen/txt_size_34px" /> android:textSize="@dimen/text_size_17" />
<!--完成--> <!--完成-->
<TextView <TextView
android:id="@+id/txt_complete" android:id="@+id/txt_complete"
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:padding="@dimen/space_20px" android:padding="@dimen/size_10"
android:text="完成" android:text="完成"
android:textSize="@dimen/txt_size_34px" /> android:textSize="@dimen/text_size_17" />
<View <View
android:id="@+id/view_line" android:id="@+id/view_line"
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/view_line" android:layout_below="@id/view_line"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="100dp" android:minHeight="@dimen/size_100"
android:orientation="horizontal"> android:orientation="horizontal">
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_6px" android:layout_margin="@dimen/size_3"
android:text="年" /> android:text="年" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_6px" android:layout_margin="@dimen/size_3"
android:text="月" /> android:text="月" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_6px" android:layout_margin="@dimen/size_3"
android:text="日" /> android:text="日" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_6px" android:layout_margin="@dimen/size_3"
android:text="时" /> android:text="时" />
<com.mayi.fastdevelop.view.wheel.views.CustomWheelView <com.mayi.fastdevelop.view.wheel.views.CustomWheelView
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/space_6px" android:layout_margin="@dimen/size_3"
android:text="分" /> android:text="分" />
</LinearLayout> </LinearLayout>
......
fastDevelop/src/main/res/values/styles.xml
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<!--水平分隔线--> <!--水平分隔线-->
<style name="line_h"> <style name="line_h">
<item name="android:background">@color/background_line</item> <item name="android:background">@color/background_line</item>
<item name="android:layout_height">@dimen/line_height</item> <item name="android:layout_height">@dimen/size_1</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
</style> </style>
...@@ -91,19 +91,19 @@ ...@@ -91,19 +91,19 @@
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textColorHint">@color/txt_color_hint</item> <item name="android:textColorHint">@color/txt_color_hint</item>
<item name="android:lineSpacingExtra">3dp</item> <item name="android:lineSpacingExtra">@dimen/size_3</item>
<item name="android:textColor">@color/txt_black</item> <item name="android:textColor">@color/txt_black</item>
<item name="android:ellipsize">end</item> <item name="android:ellipsize">end</item>
</style> </style>
<!--字体 大--> <!--字体 大-->
<style name="txt_big" parent="txt_default"> <style name="txt_big" parent="txt_default">
<item name="android:textSize">@dimen/txt_size_32px</item> <item name="android:textSize">@dimen/text_size_32</item>
</style> </style>
<!--字体 常用--> <!--字体 常用-->
<style name="txt_normal" parent="txt_default"> <style name="txt_normal" parent="txt_default">
<item name="android:textSize">@dimen/txt_size_28px</item> <item name="android:textSize">@dimen/text_size_28</item>
</style> </style>
<style name="AppThemeNoActionBar" parent="FastdevelopAppTheme"> <style name="AppThemeNoActionBar" parent="FastdevelopAppTheme">
......
map/src/main/res/layout/activity_search_adress.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_40" /> android:layout_height="@dimen/size_50" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="text|textAutoComplete" android:inputType="text|textAutoComplete"
android:maxLength="20" android:maxLength="20"
android:paddingLeft="@dimen/im_dp_10" android:paddingLeft="@dimen/size_10"
android:paddingRight="@dimen/im_dp_10" android:paddingRight="@dimen/size_10"
android:singleLine="true" android:singleLine="true"
android:textColor="#000000" android:textColor="#000000"
android:textColorHint="#C0C0C0" android:textColorHint="#C0C0C0"
......
web/src/main/res/layout/activity_web.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<com.mayi.fastdevelop.view.CustomTitleBar <com.mayi.fastdevelop.view.CustomTitleBar
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/im_dp_50" /> android:layout_height="@dimen/size_50" />
<com.tencent.smtt.sdk.WebView <com.tencent.smtt.sdk.WebView
android:id="@+id/webview" android:id="@+id/webview"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment