Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
android-koreadc-client-aar
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
郑鹏
android-koreadc-client-aar
Commits
69fa5dd9
Commit
69fa5dd9
authored
Mar 19, 2021
by
郑鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加上字体文件
parent
31c53555
Show whitespace changes
Inline
Side-by-side
Showing
259 changed files
with
1290 additions
and
1133 deletions
+1290
-1133
build.gradle
app/build.gradle
+7
-7
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-2
NotoSansKR-Light.otf
app/src/main/assets/fonts/NotoSansKR-Light.otf
+0
-0
NotoSansKR-Medium.otf
app/src/main/assets/fonts/NotoSansKR-Medium.otf
+0
-0
test_font.ttf
app/src/main/assets/fonts/test_font.ttf
+0
-0
ModooApplication.java
app/src/main/java/cn/dankal/basiclib/ModooApplication.java
+29
-0
NewFontTextView.java
.../main/java/cn/dankal/basiclib/widget/NewFontTextView.java
+125
-0
CarFragment.kt
app/src/main/java/cn/dankal/client/ui/car/CarFragment.kt
+1
-1
HomeActivity.kt
app/src/main/java/cn/dankal/client/ui/home/HomeActivity.kt
+12
-11
NearbyMerchantActivity.kt
...n/java/cn/dankal/client/ui/home/NearbyMerchantActivity.kt
+1
-1
DishesDetailsActivity.kt
...cn/dankal/client/ui/home/details/DishesDetailsActivity.kt
+8
-8
DishesDetailsTowActivity.kt
...dankal/client/ui/home/details/DishesDetailsTowActivity.kt
+8
-8
OrderResultActivity.kt
...a/cn/dankal/client/ui/home/details/OrderResultActivity.kt
+1
-1
AfterListActivity.kt
...in/java/cn/dankal/client/ui/personal/AfterListActivity.kt
+1
-1
MyCollectActivity.kt
...in/java/cn/dankal/client/ui/personal/MyCollectActivity.kt
+1
-1
StampActivity.kt
...c/main/java/cn/dankal/client/ui/personal/StampActivity.kt
+1
-1
LeaveMessageActivity.kt
...kal/client/ui/personal/order/mall/LeaveMessageActivity.kt
+3
-3
MallOrderDetailsActivity.kt
...client/ui/personal/order/mall/MallOrderDetailsActivity.kt
+3
-3
ShopDetailActivity.kt
.../main/java/cn/dankal/client/ui/shop/ShopDetailActivity.kt
+6
-6
activity_appeal_result.xml
app/src/main/res/layout-night/activity_appeal_result.xml
+3
-3
activity_dishes_details.xml
app/src/main/res/layout-night/activity_dishes_details.xml
+9
-9
activity_food_all_evaluate.xml
app/src/main/res/layout-night/activity_food_all_evaluate.xml
+6
-6
activity_food_evaluation.xml
app/src/main/res/layout-night/activity_food_evaluation.xml
+4
-4
activity_home.xml
app/src/main/res/layout-night/activity_home.xml
+2
-3
activity_merchant_details.xml
app/src/main/res/layout-night/activity_merchant_details.xml
+10
-10
activity_nearby_merchant.xml
app/src/main/res/layout-night/activity_nearby_merchant.xml
+1
-1
activity_order_details.xml
app/src/main/res/layout-night/activity_order_details.xml
+30
-30
activity_order_result.xml
app/src/main/res/layout-night/activity_order_result.xml
+14
-14
activity_queue.xml
app/src/main/res/layout-night/activity_queue.xml
+1
-1
activity_queue_details.xml
app/src/main/res/layout-night/activity_queue_details.xml
+13
-13
activity_queue_result.xml
app/src/main/res/layout-night/activity_queue_result.xml
+13
-13
activity_result_page.xml
app/src/main/res/layout-night/activity_result_page.xml
+7
-7
activity_scan_result.xml
app/src/main/res/layout-night/activity_scan_result.xml
+3
-3
activity_search.xml
app/src/main/res/layout-night/activity_search.xml
+5
-5
activity_select_pay.xml
app/src/main/res/layout-night/activity_select_pay.xml
+4
-4
adapter_layout_empty_data.xml
app/src/main/res/layout-night/adapter_layout_empty_data.xml
+1
-1
adapter_layout_empty_data_one.xml
...c/main/res/layout-night/adapter_layout_empty_data_one.xml
+1
-1
adapter_layout_empty_food_car.xml
...c/main/res/layout-night/adapter_layout_empty_food_car.xml
+1
-1
adapter_layout_empty_order.xml
app/src/main/res/layout-night/adapter_layout_empty_order.xml
+1
-1
adapter_layout_merchant_empty.xml
...c/main/res/layout-night/adapter_layout_merchant_empty.xml
+1
-1
adapter_layout_personal_empty_data.xml
...n/res/layout-night/adapter_layout_personal_empty_data.xml
+1
-1
adapter_layout_personal_empty_data_tow.xml
...s/layout-night/adapter_layout_personal_empty_data_tow.xml
+1
-1
dialog_bottom_list.xml
app/src/main/res/layout-night/dialog_bottom_list.xml
+4
-4
dialog_common.xml
app/src/main/res/layout-night/dialog_common.xml
+5
-5
dialog_home_filter.xml
app/src/main/res/layout-night/dialog_home_filter.xml
+6
-6
dialog_input_remark.xml
app/src/main/res/layout-night/dialog_input_remark.xml
+2
-2
dialog_item_call.xml
app/src/main/res/layout-night/dialog_item_call.xml
+6
-6
dialog_item_list.xml
app/src/main/res/layout-night/dialog_item_list.xml
+2
-2
dialog_item_list_take_number.xml
...rc/main/res/layout-night/dialog_item_list_take_number.xml
+2
-2
dialog_select_format_tow.xml
app/src/main/res/layout-night/dialog_select_format_tow.xml
+3
-3
fragment_details_info.xml
app/src/main/res/layout-night/fragment_details_info.xml
+3
-3
fragment_details_shop.xml
app/src/main/res/layout-night/fragment_details_shop.xml
+3
-3
fragment_menu_item.xml
app/src/main/res/layout-night/fragment_menu_item.xml
+4
-4
gv_filter_image.xml
app/src/main/res/layout-night/gv_filter_image.xml
+2
-2
item_dialog_format.xml
app/src/main/res/layout-night/item_dialog_format.xml
+3
-3
item_dialog_select.xml
app/src/main/res/layout-night/item_dialog_select.xml
+3
-3
item_evaluate_food.xml
app/src/main/res/layout-night/item_evaluate_food.xml
+4
-4
item_food_list.xml
app/src/main/res/layout-night/item_food_list.xml
+7
-7
item_home_bottom_item.xml
app/src/main/res/layout-night/item_home_bottom_item.xml
+5
-5
item_layout_auxiliary.xml
app/src/main/res/layout-night/item_layout_auxiliary.xml
+1
-1
item_menu_child.xml
app/src/main/res/layout-night/item_menu_child.xml
+2
-2
item_merchant.xml
app/src/main/res/layout-night/item_merchant.xml
+4
-4
item_my_queue.xml
app/src/main/res/layout-night/item_my_queue.xml
+9
-9
item_my_queue_tow.xml
app/src/main/res/layout-night/item_my_queue_tow.xml
+4
-4
item_order_child.xml
app/src/main/res/layout-night/item_order_child.xml
+5
-5
item_queue.xml
app/src/main/res/layout-night/item_queue.xml
+5
-5
item_search_hot.xml
app/src/main/res/layout-night/item_search_hot.xml
+3
-3
item_search_string.xml
app/src/main/res/layout-night/item_search_string.xml
+3
-3
item_shop_bottom_list.xml
app/src/main/res/layout-night/item_shop_bottom_list.xml
+4
-4
item_shop_details.xml
app/src/main/res/layout-night/item_shop_details.xml
+3
-3
item_shop_type_title.xml
app/src/main/res/layout-night/item_shop_type_title.xml
+2
-2
layout_single_text_title.xml
app/src/main/res/layout-night/layout_single_text_title.xml
+1
-1
activity_add_address.xml
app/src/main/res/layout/activity_add_address.xml
+9
-9
activity_address_manager.xml
app/src/main/res/layout/activity_address_manager.xml
+1
-1
activity_after_sale_info.xml
app/src/main/res/layout/activity_after_sale_info.xml
+24
-24
activity_appeal_result.xml
app/src/main/res/layout/activity_appeal_result.xml
+3
-3
activity_apply_after_sale.xml
app/src/main/res/layout/activity_apply_after_sale.xml
+10
-10
activity_apply_after_sale_tow.xml
app/src/main/res/layout/activity_apply_after_sale_tow.xml
+16
-16
activity_big_photo.xml
app/src/main/res/layout/activity_big_photo.xml
+1
-1
activity_capture.xml
app/src/main/res/layout/activity_capture.xml
+4
-4
activity_details_shop.xml
app/src/main/res/layout/activity_details_shop.xml
+10
-10
activity_dishes_details.xml
app/src/main/res/layout/activity_dishes_details.xml
+9
-9
activity_edit_name.xml
app/src/main/res/layout/activity_edit_name.xml
+1
-1
activity_email_update_password.xml
app/src/main/res/layout/activity_email_update_password.xml
+2
-2
activity_evaluation.xml
app/src/main/res/layout/activity_evaluation.xml
+1
-1
activity_express.xml
app/src/main/res/layout/activity_express.xml
+5
-5
activity_feedback.xml
app/src/main/res/layout/activity_feedback.xml
+3
-3
activity_find_email.xml
app/src/main/res/layout/activity_find_email.xml
+3
-3
activity_find_email_tow.xml
app/src/main/res/layout/activity_find_email_tow.xml
+1
-1
activity_food_all_evaluate.xml
app/src/main/res/layout/activity_food_all_evaluate.xml
+6
-6
activity_food_evaluation.xml
app/src/main/res/layout/activity_food_evaluation.xml
+4
-4
activity_forget_password.xml
app/src/main/res/layout/activity_forget_password.xml
+2
-2
activity_forget_password_home.xml
app/src/main/res/layout/activity_forget_password_home.xml
+11
-11
activity_home.xml
app/src/main/res/layout/activity_home.xml
+2
-2
activity_is_bind_phone.xml
app/src/main/res/layout/activity_is_bind_phone.xml
+4
-4
activity_language_select.xml
app/src/main/res/layout/activity_language_select.xml
+4
-4
activity_lock_state.xml
app/src/main/res/layout/activity_lock_state.xml
+1
-1
activity_login_sdk.xml
app/src/main/res/layout/activity_login_sdk.xml
+7
-7
activity_logistics.xml
app/src/main/res/layout/activity_logistics.xml
+3
-3
activity_logout.xml
app/src/main/res/layout/activity_logout.xml
+2
-2
activity_mall_evaluation_result.xml
app/src/main/res/layout/activity_mall_evaluation_result.xml
+6
-6
activity_mall_order_cancel_details.xml
...rc/main/res/layout/activity_mall_order_cancel_details.xml
+20
-20
activity_mall_order_complete_details.xml
.../main/res/layout/activity_mall_order_complete_details.xml
+24
-24
activity_mall_order_details.xml
app/src/main/res/layout/activity_mall_order_details.xml
+24
-24
activity_mall_order_pay_details.xml
app/src/main/res/layout/activity_mall_order_pay_details.xml
+18
-18
activity_mall_pay_result.xml
app/src/main/res/layout/activity_mall_pay_result.xml
+5
-5
activity_mall_search.xml
app/src/main/res/layout/activity_mall_search.xml
+9
-9
activity_merchant_details.xml
app/src/main/res/layout/activity_merchant_details.xml
+10
-10
activity_modify_email.xml
app/src/main/res/layout/activity_modify_email.xml
+3
-3
activity_modify_password.xml
app/src/main/res/layout/activity_modify_password.xml
+3
-3
activity_modify_phone.xml
app/src/main/res/layout/activity_modify_phone.xml
+3
-3
activity_my_collect.xml
app/src/main/res/layout/activity_my_collect.xml
+3
-3
activity_nearby_merchant.xml
app/src/main/res/layout/activity_nearby_merchant.xml
+1
-1
activity_order_details.xml
app/src/main/res/layout/activity_order_details.xml
+30
-30
activity_order_result.xml
app/src/main/res/layout/activity_order_result.xml
+15
-14
activity_personal_info.xml
app/src/main/res/layout/activity_personal_info.xml
+15
-15
activity_picture_play_audio.xml
app/src/main/res/layout/activity_picture_play_audio.xml
+6
-6
activity_protocol_user.xml
app/src/main/res/layout/activity_protocol_user.xml
+1
-1
activity_queue.xml
app/src/main/res/layout/activity_queue.xml
+1
-1
activity_queue_details.xml
app/src/main/res/layout/activity_queue_details.xml
+13
-13
activity_queue_result.xml
app/src/main/res/layout/activity_queue_result.xml
+13
-13
activity_register.xml
app/src/main/res/layout/activity_register.xml
+6
-6
activity_register_email.xml
app/src/main/res/layout/activity_register_email.xml
+4
-4
activity_register_input_info.xml
app/src/main/res/layout/activity_register_input_info.xml
+3
-3
activity_result_page.xml
app/src/main/res/layout/activity_result_page.xml
+7
-7
activity_result_page_tow.xml
app/src/main/res/layout/activity_result_page_tow.xml
+7
-7
activity_scan_result.xml
app/src/main/res/layout/activity_scan_result.xml
+3
-3
activity_search.xml
app/src/main/res/layout/activity_search.xml
+5
-5
activity_select_coupon.xml
app/src/main/res/layout/activity_select_coupon.xml
+1
-1
activity_select_pay.xml
app/src/main/res/layout/activity_select_pay.xml
+4
-4
activity_setting.xml
app/src/main/res/layout/activity_setting.xml
+17
-17
activity_shop_detail.xml
app/src/main/res/layout/activity_shop_detail.xml
+18
-18
activity_stamp.xml
app/src/main/res/layout/activity_stamp.xml
+2
-2
activity_sure_order.xml
app/src/main/res/layout/activity_sure_order.xml
+17
-17
activity_system_message_details.xml
app/src/main/res/layout/activity_system_message_details.xml
+2
-2
activity_table_select.xml
app/src/main/res/layout/activity_table_select.xml
+2
-2
adapter_layout_address_empty_data.xml
...src/main/res/layout/adapter_layout_address_empty_data.xml
+1
-1
adapter_layout_empty_data.xml
app/src/main/res/layout/adapter_layout_empty_data.xml
+1
-1
adapter_layout_empty_data_one.xml
app/src/main/res/layout/adapter_layout_empty_data_one.xml
+1
-1
adapter_layout_empty_food_car.xml
app/src/main/res/layout/adapter_layout_empty_food_car.xml
+1
-1
adapter_layout_empty_order.xml
app/src/main/res/layout/adapter_layout_empty_order.xml
+1
-1
adapter_layout_location_data.xml
app/src/main/res/layout/adapter_layout_location_data.xml
+2
-2
adapter_layout_merchant_empty.xml
app/src/main/res/layout/adapter_layout_merchant_empty.xml
+1
-1
adapter_layout_personal_empty_data.xml
...rc/main/res/layout/adapter_layout_personal_empty_data.xml
+1
-1
adapter_layout_personal_empty_data_tow.xml
...ain/res/layout/adapter_layout_personal_empty_data_tow.xml
+1
-1
adapter_layout_search_empty.xml
app/src/main/res/layout/adapter_layout_search_empty.xml
+1
-1
custom_info_window.xml
app/src/main/res/layout/custom_info_window.xml
+3
-3
custom_tab_layout_text.xml
app/src/main/res/layout/custom_tab_layout_text.xml
+1
-1
dialog_address.xml
app/src/main/res/layout/dialog_address.xml
+3
-3
dialog_bottom_header.xml
app/src/main/res/layout/dialog_bottom_header.xml
+3
-3
dialog_bottom_list.xml
app/src/main/res/layout/dialog_bottom_list.xml
+4
-4
dialog_common.xml
app/src/main/res/layout/dialog_common.xml
+5
-5
dialog_home_filter.xml
app/src/main/res/layout/dialog_home_filter.xml
+6
-6
dialog_input_remark.xml
app/src/main/res/layout/dialog_input_remark.xml
+2
-2
dialog_item_bottom_select.xml
app/src/main/res/layout/dialog_item_bottom_select.xml
+4
-4
dialog_item_call.xml
app/src/main/res/layout/dialog_item_call.xml
+6
-6
dialog_item_contact.xml
app/src/main/res/layout/dialog_item_contact.xml
+2
-2
dialog_item_list.xml
app/src/main/res/layout/dialog_item_list.xml
+2
-2
dialog_item_list_take_number.xml
app/src/main/res/layout/dialog_item_list_take_number.xml
+2
-2
dialog_layout_logistics.xml
app/src/main/res/layout/dialog_layout_logistics.xml
+8
-8
dialog_mall_details.xml
app/src/main/res/layout/dialog_mall_details.xml
+10
-10
dialog_replace_table.xml
app/src/main/res/layout/dialog_replace_table.xml
+2
-2
dialog_select_format_tow.xml
app/src/main/res/layout/dialog_select_format_tow.xml
+3
-3
dialog_time.xml
app/src/main/res/layout/dialog_time.xml
+3
-3
dialog_tips.xml
app/src/main/res/layout/dialog_tips.xml
+3
-3
fragment_car.xml
app/src/main/res/layout/fragment_car.xml
+7
-7
fragment_coupon_tow_type.xml
app/src/main/res/layout/fragment_coupon_tow_type.xml
+1
-1
fragment_coupon_type.xml
app/src/main/res/layout/fragment_coupon_type.xml
+1
-1
fragment_details_info.xml
app/src/main/res/layout/fragment_details_info.xml
+3
-3
fragment_details_shop.xml
app/src/main/res/layout/fragment_details_shop.xml
+3
-3
fragment_home.xml
app/src/main/res/layout/fragment_home.xml
+1
-1
fragment_menu_item.xml
app/src/main/res/layout/fragment_menu_item.xml
+4
-4
fragment_personal.xml
app/src/main/res/layout/fragment_personal.xml
+11
-11
fragment_shop.xml
app/src/main/res/layout/fragment_shop.xml
+2
-2
gv_filter_image.xml
app/src/main/res/layout/gv_filter_image.xml
+2
-2
item_address_manager.xml
app/src/main/res/layout/item_address_manager.xml
+8
-8
item_autocompletetv_simple_dropdown.xml
...c/main/res/layout/item_autocompletetv_simple_dropdown.xml
+1
-1
item_car_child_shop.xml
app/src/main/res/layout/item_car_child_shop.xml
+5
-5
item_car_shop.xml
app/src/main/res/layout/item_car_shop.xml
+2
-2
item_comment_type.xml
app/src/main/res/layout/item_comment_type.xml
+1
-1
item_coupon.xml
app/src/main/res/layout/item_coupon.xml
+3
-3
item_dialog_format.xml
app/src/main/res/layout/item_dialog_format.xml
+3
-3
item_dialog_format_tow.xml
app/src/main/res/layout/item_dialog_format_tow.xml
+3
-3
item_dialog_select.xml
app/src/main/res/layout/item_dialog_select.xml
+3
-3
item_evaluate_food.xml
app/src/main/res/layout/item_evaluate_food.xml
+4
-4
item_evaluation_child.xml
app/src/main/res/layout/item_evaluation_child.xml
+3
-3
item_food_list.xml
app/src/main/res/layout/item_food_list.xml
+7
-7
item_footer_leave_message.xml
app/src/main/res/layout/item_footer_leave_message.xml
+4
-4
item_have_stamp.xml
app/src/main/res/layout/item_have_stamp.xml
+2
-2
item_home_bottom.xml
app/src/main/res/layout/item_home_bottom.xml
+2
-2
item_home_bottom_item.xml
app/src/main/res/layout/item_home_bottom_item.xml
+6
-6
item_layout_after.xml
app/src/main/res/layout/item_layout_after.xml
+8
-8
item_layout_auxiliary.xml
app/src/main/res/layout/item_layout_auxiliary.xml
+1
-1
item_layout_tip_cancel.xml
app/src/main/res/layout/item_layout_tip_cancel.xml
+1
-1
item_leave_message.xml
app/src/main/res/layout/item_leave_message.xml
+4
-4
item_logistics.xml
app/src/main/res/layout/item_logistics.xml
+3
-3
item_mall_details.xml
app/src/main/res/layout/item_mall_details.xml
+3
-3
item_mall_evaluation.xml
app/src/main/res/layout/item_mall_evaluation.xml
+4
-4
item_mall_evaluation_shop.xml
app/src/main/res/layout/item_mall_evaluation_shop.xml
+3
-3
item_mall_order.xml
app/src/main/res/layout/item_mall_order.xml
+9
-9
item_mall_order_details_layout.xml
app/src/main/res/layout/item_mall_order_details_layout.xml
+6
-6
item_mall_order_layout.xml
app/src/main/res/layout/item_mall_order_layout.xml
+6
-6
item_mall_search_result.xml
app/src/main/res/layout/item_mall_search_result.xml
+3
-3
item_menu_child.xml
app/src/main/res/layout/item_menu_child.xml
+2
-2
item_merchant.xml
app/src/main/res/layout/item_merchant.xml
+4
-4
item_message_reply.xml
app/src/main/res/layout/item_message_reply.xml
+2
-2
item_my_collect.xml
app/src/main/res/layout/item_my_collect.xml
+5
-5
item_my_queue.xml
app/src/main/res/layout/item_my_queue.xml
+9
-9
item_my_queue_tow.xml
app/src/main/res/layout/item_my_queue_tow.xml
+4
-4
item_order_child.xml
app/src/main/res/layout/item_order_child.xml
+5
-5
item_question_list.xml
app/src/main/res/layout/item_question_list.xml
+3
-3
item_queue.xml
app/src/main/res/layout/item_queue.xml
+5
-5
item_search_hot.xml
app/src/main/res/layout/item_search_hot.xml
+3
-3
item_search_string.xml
app/src/main/res/layout/item_search_string.xml
+3
-3
item_shop.xml
app/src/main/res/layout/item_shop.xml
+5
-5
item_shop_bottom_list.xml
app/src/main/res/layout/item_shop_bottom_list.xml
+4
-4
item_shop_details.xml
app/src/main/res/layout/item_shop_details.xml
+3
-3
item_shop_head_layout.xml
app/src/main/res/layout/item_shop_head_layout.xml
+3
-3
item_shop_tow.xml
app/src/main/res/layout/item_shop_tow.xml
+5
-5
item_shop_type_title.xml
app/src/main/res/layout/item_shop_type_title.xml
+2
-2
item_sure_order.xml
app/src/main/res/layout/item_sure_order.xml
+4
-4
item_system_message.xml
app/src/main/res/layout/item_system_message.xml
+4
-4
item_unuser_coupon.xml
app/src/main/res/layout/item_unuser_coupon.xml
+2
-2
itme_home_four.xml
app/src/main/res/layout/itme_home_four.xml
+1
-1
itme_home_one.xml
app/src/main/res/layout/itme_home_one.xml
+1
-1
itme_home_three.xml
app/src/main/res/layout/itme_home_three.xml
+1
-1
itme_home_tow.xml
app/src/main/res/layout/itme_home_tow.xml
+1
-1
layout_classic_footer.xml
app/src/main/res/layout/layout_classic_footer.xml
+1
-1
layout_classic_header.xml
app/src/main/res/layout/layout_classic_header.xml
+1
-1
layout_empty.xml
app/src/main/res/layout/layout_empty.xml
+1
-1
layout_error.xml
app/src/main/res/layout/layout_error.xml
+1
-1
layout_gender.xml
app/src/main/res/layout/layout_gender.xml
+2
-2
layout_loading.xml
app/src/main/res/layout/layout_loading.xml
+1
-1
layout_retry.xml
app/src/main/res/layout/layout_retry.xml
+1
-1
layout_single_text_title.xml
app/src/main/res/layout/layout_single_text_title.xml
+1
-1
layout_single_text_title_transparent.xml
.../main/res/layout/layout_single_text_title_transparent.xml
+1
-1
layout_tab_bottom.xml
app/src/main/res/layout/layout_tab_bottom.xml
+1
-1
layout_tab_left.xml
app/src/main/res/layout/layout_tab_left.xml
+1
-1
layout_tab_right.xml
app/src/main/res/layout/layout_tab_right.xml
+1
-1
layout_tab_segment.xml
app/src/main/res/layout/layout_tab_segment.xml
+1
-1
layout_tab_top.xml
app/src/main/res/layout/layout_tab_top.xml
+1
-1
picture_activity_external_preview.xml
...src/main/res/layout/picture_activity_external_preview.xml
+1
-1
picture_album_folder_item.xml
app/src/main/res/layout/picture_album_folder_item.xml
+3
-3
picture_audio_dialog.xml
app/src/main/res/layout/picture_audio_dialog.xml
+6
-6
picture_camera_pop_layout.xml
app/src/main/res/layout/picture_camera_pop_layout.xml
+6
-6
picture_image_grid_item.xml
app/src/main/res/layout/picture_image_grid_item.xml
+4
-4
picture_item_camera.xml
app/src/main/res/layout/picture_item_camera.xml
+1
-1
picture_preview.xml
app/src/main/res/layout/picture_preview.xml
+4
-4
picture_selector.xml
app/src/main/res/layout/picture_selector.xml
+4
-4
picture_title_bar.xml
app/src/main/res/layout/picture_title_bar.xml
+3
-3
picture_wind_base_dialog_xml.xml
app/src/main/res/layout/picture_wind_base_dialog_xml.xml
+5
-5
srl_classics_footer.xml
app/src/main/res/layout/srl_classics_footer.xml
+1
-1
srl_classics_header.xml
app/src/main/res/layout/srl_classics_header.xml
+2
-2
textview.xml
app/src/main/res/layout/textview.xml
+2
-1
ucrop_activity_photobox.xml
app/src/main/res/layout/ucrop_activity_photobox.xml
+1
-1
ucrop_layout_rotate_wheel.xml
app/src/main/res/layout/ucrop_layout_rotate_wheel.xml
+1
-1
ucrop_layout_scale_wheel.xml
app/src/main/res/layout/ucrop_layout_scale_wheel.xml
+1
-1
ucrop_picture_activity_multi_cutting.xml
.../main/res/layout/ucrop_picture_activity_multi_cutting.xml
+1
-1
styles.xml
app/src/main/res/values/styles.xml
+1
-0
No files found.
app/build.gradle
View file @
69fa5dd9
//
apply plugin: 'com.android.application'
apply
plugin:
'com.android.library'
apply
plugin:
'maven'
apply
plugin:
'com.android.application'
/*
apply plugin: 'com.android.library'
apply plugin: 'maven'
*/
apply
plugin:
'kotlin-android'
apply
plugin:
'kotlin-android-extensions'
apply
plugin:
'kotlin-kapt'
...
...
@@ -15,8 +15,8 @@ android {
compileSdkVersion
30
defaultConfig
{
/*
multiDexEnabled true
applicationId "com.mhq.smartorder"
*/
multiDexEnabled
true
applicationId
"com.mhq.smartorder"
minSdkVersion
26
targetSdkVersion
30
...
...
@@ -173,7 +173,7 @@ def getAppVersionCode() {
}
return
stout
.
toString
().
split
(
"\n"
).
size
()
}
ext
{
/*
ext {
GITHUB_REPO_PATH = "../../androidlibrary"
PUBLISH_GROUP_ID = 'com.mhq.smartorder'
PUBLISH_ARTIFACT_ID = 'smartorder'
...
...
@@ -190,7 +190,7 @@ uploadArchives {
pom.version = project.PUBLISH_VERSION // 版本号
}
}
}
}
*/
dependencies
{
...
...
app/src/main/AndroidManifest.xml
View file @
69fa5dd9
...
...
@@ -285,11 +285,11 @@
<activity
android:name=
"cn.dankal.user.login.LanguageSelectActivity"
android:screenOrientation=
"portrait"
>
<!--
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
-->
</intent-filter>
</activity>
<activity
android:name=
"com.mhq.smartorder.wxapi.WXPayEntryActivity"
...
...
app/src/main/assets/fonts/NotoSansKR-Light.otf
0 → 100644
View file @
69fa5dd9
File added
app/src/main/assets/fonts/NotoSansKR-Medium.otf
0 → 100644
View file @
69fa5dd9
File added
app/src/main/assets/fonts/test_font.ttf
0 → 100644
View file @
69fa5dd9
File added
app/src/main/java/cn/dankal/basiclib/ModooApplication.java
View file @
69fa5dd9
...
...
@@ -3,6 +3,7 @@ package cn.dankal.basiclib;
import
android.app.Application
;
import
android.content.Context
;
import
android.content.res.Configuration
;
import
android.graphics.Typeface
;
import
android.support.multidex.MultiDex
;
import
android.support.v7.app.AppCompatDelegate
;
...
...
@@ -15,6 +16,7 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import
org.litepal.LitePal
;
import
java.lang.reflect.Field
;
import
java.util.Locale
;
import
cn.dankal.basiclib.image.Utils
;
...
...
@@ -42,6 +44,8 @@ public class ModooApplication extends Application {
private
static
IWXAPI
api
;
private
Typeface
mFromAsset
;
@Override
public
void
onCreate
()
{
super
.
onCreate
();
...
...
@@ -107,6 +111,31 @@ public class ModooApplication extends Application {
}
else
if
(
"zh"
.
equals
(
language
))
{
SPUtil
.
getInstance
(
ModooApplication
.
getContext
()).
saveLanguage
(
0
);
}
mFromAsset
=
Typeface
.
createFromAsset
(
getAssets
(),
"fonts/test_font.ttf"
);
//setFonts();
}
public
Typeface
getFromAsset
()
{
return
mFromAsset
;
}
private
void
setFonts
()
{
Typeface
typeFaceYaHei
=
Typeface
.
createFromAsset
(
getAssets
(),
"fonts/NotoSansKR-Light.otf"
);
try
{
Field
field
=
Typeface
.
class
.
getDeclaredField
(
"MONOSPACE"
);
field
.
setAccessible
(
true
);
field
.
set
(
null
,
typeFaceYaHei
);
}
catch
(
NoSuchFieldException
e
)
{
e
.
printStackTrace
();
}
catch
(
IllegalAccessException
e
)
{
e
.
printStackTrace
();
}
}
/**
...
...
app/src/main/java/cn/dankal/basiclib/widget/NewFontTextView.java
0 → 100644
View file @
69fa5dd9
package
cn
.
dankal
.
basiclib
.
widget
;
import
android.content.Context
;
import
android.graphics.Canvas
;
import
android.graphics.Paint
;
import
android.graphics.Typeface
;
import
android.text.Layout
;
import
android.text.TextPaint
;
import
android.text.TextUtils
;
import
android.util.AttributeSet
;
import
android.util.TypedValue
;
import
android.view.View
;
import
cn.dankal.basiclib.ModooApplication
;
import
cn.dankal.basiclib.widget.passwordview.Util
;
import
cn.dankal.client.R
;
/**
* Author: roczheng
* Date: 2021/3/18
* Time: 21:43
* Description:
*/
public
class
NewFontTextView
extends
android
.
support
.
v7
.
widget
.
AppCompatTextView
{
private
Context
context
;
private
Float
testSize
;
public
NewFontTextView
(
Context
context
)
{
this
(
context
,
null
);
}
public
NewFontTextView
(
Context
context
,
AttributeSet
attrs
)
{
this
(
context
,
attrs
,
0
);
}
public
NewFontTextView
(
Context
context
,
AttributeSet
attrs
,
int
defStyleAttr
)
{
super
(
context
,
attrs
,
defStyleAttr
);
this
.
context
=
context
;
// getPaint().setTypeface(ModooApplication.getInstance().getFromAsset());
}
public
void
setTypeface
(
Typeface
tf
,
int
style
)
{
if
(
style
==
Typeface
.
BOLD
)
{
super
.
setTypeface
(
ModooApplication
.
getInstance
().
getFromAsset
());
}
else
{
super
.
setTypeface
(
ModooApplication
.
getInstance
().
getFromAsset
());
}
}
@Override
protected
void
onMeasure
(
int
widthMeasureSpec
,
int
heightMeasureSpec
)
{
super
.
onMeasure
(
widthMeasureSpec
,
heightMeasureSpec
);
int
wMode
=
MeasureSpec
.
getMode
(
widthMeasureSpec
);
int
wSize
=
MeasureSpec
.
getSize
(
widthMeasureSpec
);
int
hMode
=
MeasureSpec
.
getMode
(
heightMeasureSpec
);
int
hSize
=
MeasureSpec
.
getSize
(
heightMeasureSpec
);
/* hSize = this.getMeasuredHeight();
TextPaint newPaint = new TextPaint();
String textStr = getText().toString();
float textSize = getResources().getDisplayMetrics().scaledDensity * Util.px2sp(context, getTextSize());
newPaint.setTextSize(textSize);
float textWidth = getLineLength(textStr, getTextSize());
int targetWidith = 0;
int newWidthMeasureSpec = 0;
int newHeightMeasureSpec = 0;
switch (wMode) {
case MeasureSpec.UNSPECIFIED:
wSize = (int) ( textWidth);
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(wSize, wMode);
break;
case MeasureSpec.EXACTLY:
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(wSize, wMode);
break;
case MeasureSpec.AT_MOST:
targetWidith = (int) (textWidth);
if (wSize > targetWidith) {
wSize = targetWidith;
}
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(wSize, wMode);
break;
}*/
/* String textStr = getText().toString();
//float textSize = getResources().getDisplayMetrics().scaledDensity * Util.px2sp(context, getTextSize());
float textWidth = getLineLength(textStr, getTextSize());
int targetWidith = 0;
targetWidith = (int) (textWidth);
int newWidthMeasureSpec = 0;
int newHeightMeasureSpec = 0;
newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(getHeight(), hMode);
newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(getWidth(), wMode);
setMeasuredDimension(newWidthMeasureSpec, newHeightMeasureSpec);*/
}
/* @Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
if (!TextUtils.isEmpty(getText())){
float txtLen = Layout.getDesiredWidth(getText().toString(),0,getText().length(),getPaint());
if(txtLen>getWidth()-10){//当字体长度大于宽度-10的时候,按比例缩放
float scale = getWidth()/txtLen;
setTextSize(TypedValue.COMPLEX_UNIT_PX,getTextSize()*scale);
}else{
setTextSize(TypedValue.COMPLEX_UNIT_PX,getTextSize());
}
}
}*/
public
int
getLineLength
(
String
str
,
float
textSize
)
{
Paint
pFont
=
new
Paint
();
pFont
.
setTextSize
(
textSize
);
pFont
.
setTypeface
(
ModooApplication
.
getInstance
().
getFromAsset
());
return
(
int
)
pFont
.
measureText
(
str
);
}
public
static
int
dip2px
(
Context
context
,
float
dpValue
)
{
final
float
scale
=
context
.
getResources
().
getDisplayMetrics
().
density
;
return
(
int
)
(
dpValue
*
scale
+
0.5f
);
}
}
\ No newline at end of file
app/src/main/java/cn/dankal/client/ui/car/CarFragment.kt
View file @
69fa5dd9
...
...
@@ -166,7 +166,7 @@ class CarFragment : BaseFragment(), View.OnClickListener {
if
(
t
.
data
==
null
||
t
.
data
.
size
==
0
)
{
var
view
=
UIUtile
.
getView
(
R
.
layout
.
adapter_layout_personal_empty_data
,
rv_coupon_list
)
var
textTip
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_tip
)
var
textTip
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_tip
)
textTip
.
text
=
getString
(
R
.
string
.
shopping_cart_is_empty
)
adapter
?.
emptyView
=
view
tv_car_price
.
text
=
UIUtile
.
stringToPrice
(
"0"
)
...
...
app/src/main/java/cn/dankal/client/ui/home/HomeActivity.kt
View file @
69fa5dd9
package
cn.dankal.client.ui.home
//import cn.dankal.client.ui.home.map.GoogleMapsActivity
import
android.Manifest
import
android.content.Context
import
android.content.Intent
import
android.content.pm.PackageManager
import
android.graphics.Typeface
import
android.location.Location
import
android.location.LocationManager
import
android.os.Build
...
...
@@ -20,28 +22,26 @@ import cn.dankal.basiclib.api.HomeServiceFactory
import
cn.dankal.basiclib.api.RestaurantServiceFactory
import
cn.dankal.basiclib.base.activity.BaseActivity
import
cn.dankal.basiclib.base.fragmentactivity.FragmentAdapter
import
cn.dankal.basiclib.protocol.MainProtocol
import
cn.dankal.basiclib.rx.AbstractDialogSubscriber
import
cn.dankal.basiclib.util.SPUtils
import
cn.dankal.basiclib.util.ToastUtils
import
cn.dankal.client.R
import
cn.dankal.client.constants.ConstantsHomeType
//import cn.dankal.client.ui.home.map.GoogleMap
sActivity
import
cn.dankal.client.ui.home.details.MerchantDetail
sActivity
import
cn.dankal.entities.event.LocationChangeEvent
import
cn.dankal.entities.home.QRCodeEntity
import
cn.dankal.entities.home.TopHomeInfoEntity
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.google.gson.Gson
import
com.scwang.smartrefresh.layout.header.ClassicsHeader
import
com.yanzhenjie.permission.Permission
import
com.yzq.zxinglibrary.android.CaptureActivity
import
io.reactivex.rxjava3.disposables.Disposable
import
kotlinx.android.synthetic.main.
fragment
_home.*
import
kotlinx.android.synthetic.main.
activity
_home.*
import
org.greenrobot.eventbus.EventBus
import
org.greenrobot.eventbus.Subscribe
import
org.greenrobot.eventbus.ThreadMode
import
cn.dankal.basiclib.protocol.MainProtocol
import
cn.dankal.client.ui.home.details.MerchantDetailsActivity
import
cn.dankal.client.ui.personal.MyQueueActivity
import
cn.dankal.entities.home.QRCodeEntity
import
com.alibaba.android.arouter.facade.annotation.Route
import
com.google.gson.Gson
@Route
(
path
=
MainProtocol
.
MAIN
)
class
HomeActivity
:
BaseActivity
(),
View
.
OnClickListener
{
...
...
@@ -92,6 +92,7 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
getStateBar
()
}
//획득 상태 표시 줄 높이
private
fun
getStateBar
()
{
var
result
=
0
...
...
@@ -106,13 +107,13 @@ class HomeActivity : BaseActivity(), View.OnClickListener {
private
fun
judgeProvider
(
locationManager
:
LocationManager
):
String
{
var
podiatrist
=
locationManager
?.
getProviders
(
true
)
if
(
podiatrist
.
contains
(
LocationManager
.
NETWORK_PROVIDER
))
{
tv_location_tip
.
text
=
""
//
tv_location_tip.text = ""
return
LocationManager
.
NETWORK_PROVIDER
//네트워크 위치 확인
}
else
if
(
podiatrist
.
contains
(
LocationManager
.
GPS_PROVIDER
))
{
tv_location_tip
.
text
=
""
//
tv_location_tip.text = ""
return
LocationManager
.
GPS_PROVIDER
//GPS 포 지 셔 닝
}
else
{
tv_location_tip
.
text
=
getString
(
R
.
string
.
unopened_positioning
)
//
tv_location_tip.text = getString(R.string.unopened_positioning)
ToastUtils
.
showShort
(
getString
(
R
.
string
.
please_turn_on_positioning
))
SPUtils
.
put
(
ConstantsHomeType
.
LATITUDE
,
""
)
SPUtils
.
put
(
ConstantsHomeType
.
LONGITUDE
,
""
)
...
...
app/src/main/java/cn/dankal/client/ui/home/NearbyMerchantActivity.kt
View file @
69fa5dd9
...
...
@@ -86,7 +86,7 @@ class NearbyMerchantActivity : BaseListActivity<BottomAroundEntity.DataBean>() {
}
else
{
if
(
rvList
!=
null
&&
adapter
!=
null
)
{
var
view
=
UIUtile
.
getView
(
R
.
layout
.
adapter_layout_personal_empty_data
,
rvList
)
var
tvTip
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_tip
)
var
tvTip
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_tip
)
tvTip
.
text
=
getString
(
R
.
string
.
there_is_no_business_nearby
)
adapter
.
emptyView
=
view
}
...
...
app/src/main/java/cn/dankal/client/ui/home/details/DishesDetailsActivity.kt
View file @
69fa5dd9
...
...
@@ -270,17 +270,17 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
private
fun
showBottomDialog
(
entity
:
RestaurantSpecEntity
)
{
val
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
dialog_select_format_tow
,
null
,
false
)
val
flowLayoutOne
=
view
.
findViewById
<
TagFlowLayout
>(
R
.
id
.
fl_tag_one
)
val
mainName
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_format
)
val
price
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_restaurant_price
)
val
tvSpecShow
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_restaurant_spec
)
val
tvShopName
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_title_name
)
val
mainName
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_format
)
val
price
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_restaurant_price
)
val
tvSpecShow
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_restaurant_spec
)
val
tvShopName
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_title_name
)
val
tvShopAdd
=
view
.
findViewById
<
Button
>(
R
.
id
.
btn_restaurant_add
)
val
imageViewClose
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
iv_dialog_close
)
val
recyclerView
=
view
.
findViewById
<
RecyclerView
>(
R
.
id
.
rv_auxiliary
)
val
llCount
=
view
.
findViewById
<
LinearLayout
>(
R
.
id
.
ll_count
)
val
ivReduce
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
tv_item_reduce
)
val
ivAdd
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
tv_item_add
)
val
tvItemCount
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_item_count
)
val
tvItemCount
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_item_count
)
ivAdd
.
setOnClickListener
{
v
->
addAndReduce
(
tvItemCount
,
0
)
...
...
@@ -527,9 +527,9 @@ class DishesDetailsActivity : BaseActivity(), View.OnClickListener {
private
fun
initCar
()
{
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
dialog_bottom_list
,
null
,
false
)
view
?.
let
{
tvSettlement
=
it
.
findViewById
<
TextView
>(
R
.
id
.
tv_bottom_shop_button
)
val
tvCleanCars
=
it
.
findViewById
<
TextView
>(
R
.
id
.
tv_car_clean
)
tvShowShopInfo
=
it
.
findViewById
<
TextView
>(
R
.
id
.
tv_bottom_shop_tip_text
)
tvSettlement
=
it
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_bottom_shop_button
)
val
tvCleanCars
=
it
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_car_clean
)
tvShowShopInfo
=
it
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_bottom_shop_tip_text
)
tvCount
=
it
.
findViewById
(
R
.
id
.
tv_bottom_shop_count
)
val
llBg
=
it
.
findViewById
<
LinearLayoutCompat
>(
R
.
id
.
ll_bg
)
...
...
app/src/main/java/cn/dankal/client/ui/home/details/DishesDetailsTowActivity.kt
View file @
69fa5dd9
...
...
@@ -314,17 +314,17 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
private
fun
showBottomDialog
(
entity
:
RestaurantSpecEntity
)
{
val
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
dialog_select_format_tow
,
null
,
false
)
val
flowLayoutOne
=
view
.
findViewById
<
TagFlowLayout
>(
R
.
id
.
fl_tag_one
)
val
mainName
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_format
)
val
price
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_restaurant_price
)
val
tvSpecShow
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_restaurant_spec
)
val
tvShopName
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_title_name
)
val
mainName
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_format
)
val
price
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_restaurant_price
)
val
tvSpecShow
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_restaurant_spec
)
val
tvShopName
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_title_name
)
val
tvShopAdd
=
view
.
findViewById
<
Button
>(
R
.
id
.
btn_restaurant_add
)
val
imageViewClose
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
iv_dialog_close
)
val
recyclerView
=
view
.
findViewById
<
RecyclerView
>(
R
.
id
.
rv_auxiliary
)
val
llCount
=
view
.
findViewById
<
LinearLayout
>(
R
.
id
.
ll_count
)
val
ivReduce
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
tv_item_reduce
)
val
ivAdd
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
tv_item_add
)
val
tvItemCount
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_item_count
)
val
tvItemCount
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_item_count
)
ivAdd
.
setOnClickListener
{
v
->
addAndReduce
(
tvItemCount
,
0
)
...
...
@@ -600,9 +600,9 @@ class DishesDetailsTowActivity : BaseActivity(), View.OnClickListener, DishesVie
private
fun
initCar
()
{
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
dialog_bottom_list
,
null
,
false
)
view
?.
let
{
tvSettlement
=
it
.
findViewById
<
TextView
>(
R
.
id
.
tv_bottom_shop_button
)
val
tvCleanCars
=
it
.
findViewById
<
TextView
>(
R
.
id
.
tv_car_clean
)
tvShowShopInfo
=
it
.
findViewById
<
TextView
>(
R
.
id
.
tv_bottom_shop_tip_text
)
tvSettlement
=
it
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_bottom_shop_button
)
val
tvCleanCars
=
it
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_car_clean
)
tvShowShopInfo
=
it
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_bottom_shop_tip_text
)
tvCount
=
it
.
findViewById
(
R
.
id
.
tv_bottom_shop_count
)
val
llBg
=
it
.
findViewById
<
LinearLayoutCompat
>(
R
.
id
.
ll_bg
)
...
...
app/src/main/java/cn/dankal/client/ui/home/details/OrderResultActivity.kt
View file @
69fa5dd9
...
...
@@ -275,7 +275,7 @@ class OrderResultActivity : BaseActivity(), View.OnClickListener {
val
btnClose
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
iv_dialog_close
)
val
btnOk
=
view
.
findViewById
<
Button
>(
R
.
id
.
btn_pop_ok
)
val
etRemark
=
view
.
findViewById
<
EditText
>(
R
.
id
.
et_feedback
)
val
tvTextCount
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_size
)
val
tvTextCount
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_size
)
etRemark
.
addTextChangedListener
(
object
:
TextWatcher
{
override
fun
afterTextChanged
(
s
:
Editable
?)
{
...
...
app/src/main/java/cn/dankal/client/ui/personal/AfterListActivity.kt
View file @
69fa5dd9
...
...
@@ -90,7 +90,7 @@ class AfterListActivity : BaseActivity(), OnRefreshLoadMoreListener {
}
else
{
adapter
?.
let
{
var
view
=
UIUtile
.
getView
(
R
.
layout
.
adapter_layout_personal_empty_data
,
rv_list
)
var
tvTip
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_tip
)
var
tvTip
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_tip
)
tvTip
.
text
=
getString
(
R
.
string
.
you_dont_have_an_order_yet
)
it
.
emptyView
=
view
}
...
...
app/src/main/java/cn/dankal/client/ui/personal/MyCollectActivity.kt
View file @
69fa5dd9
...
...
@@ -119,7 +119,7 @@ class MyCollectActivity : BaseActivity(), OnRefreshLoadMoreListener {
ll_bottom
.
visibility
=
View
.
VISIBLE
}
else
{
var
view
=
UIUtile
.
getView
(
R
.
layout
.
adapter_layout_personal_empty_data
,
rv_coupon_list
)
var
textTip
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_tip
)
var
textTip
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_tip
)
textTip
.
text
=
getString
(
R
.
string
.
you_have_not_added_any_items_yet
)
myCollectAdapter
?.
emptyView
=
view
ll_bottom
.
visibility
=
View
.
GONE
...
...
app/src/main/java/cn/dankal/client/ui/personal/StampActivity.kt
View file @
69fa5dd9
...
...
@@ -63,7 +63,7 @@ class StampActivity : BaseListActivity<StampListEntity.DataBean>() {
}
else
{
if
(
rvList
!=
null
&&
adapter
!=
null
)
{
var
view
=
UIUtile
.
getView
(
R
.
layout
.
adapter_layout_personal_empty_data
,
rvList
)
var
tvTip
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_tip
)
var
tvTip
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_tip
)
tvTip
.
text
=
getString
(
R
.
string
.
you_don_have_a_stamp_at_the_moment
)
adapter
.
emptyView
=
view
}
...
...
app/src/main/java/cn/dankal/client/ui/personal/order/mall/LeaveMessageActivity.kt
View file @
69fa5dd9
...
...
@@ -74,10 +74,10 @@ class LeaveMessageActivity : BaseActivity(), OnRefreshLoadMoreListener {
refreshLayout
.
setRefreshFooter
(
ClassicsFooter
(
this
))
val
footerView
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
item_footer_leave_message
,
null
,
false
)
var
tvCommit
=
footerView
.
findViewById
<
TextView
>(
R
.
id
.
tv_commit
)
var
tvCancel
=
footerView
.
findViewById
<
TextView
>(
R
.
id
.
tv_cancel
)
var
tvCommit
=
footerView
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_commit
)
var
tvCancel
=
footerView
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_cancel
)
var
etContent
=
footerView
.
findViewById
<
EditText
>(
R
.
id
.
et_feedback
)
val
tvSize
=
footerView
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_size
)
val
tvSize
=
footerView
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_size
)
tvCancel
.
text
=
getString
(
R
.
string
.
cancel
)
...
...
app/src/main/java/cn/dankal/client/ui/personal/order/mall/MallOrderDetailsActivity.kt
View file @
69fa5dd9
...
...
@@ -291,10 +291,10 @@ class MallOrderDetailsActivity : BaseActivity(), View.OnClickListener, CallDialo
private
fun
showBottomDialog
()
{
val
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
item_footer_leave_message
,
null
,
false
)
val
tvCancel
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_cancel
)
val
tvCommit
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_commit
)
val
tvCancel
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_cancel
)
val
tvCommit
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_commit
)
val
etContent
=
view
.
findViewById
<
EditText
>(
R
.
id
.
et_feedback
)
val
tvCount
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_text_size
)
val
tvCount
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_text_size
)
tvCancel
.
setOnClickListener
{
popupWindow
?.
let
{
...
...
app/src/main/java/cn/dankal/client/ui/shop/ShopDetailActivity.kt
View file @
69fa5dd9
...
...
@@ -311,12 +311,12 @@ class ShopDetailActivity : BaseActivity(), View.OnClickListener {
val
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
dialog_mall_details
,
null
,
false
)
val
flowLayoutOne
=
view
.
findViewById
<
TagFlowLayout
>(
R
.
id
.
fl_tag_one
)
val
imageViewClose
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
iv_dialog_close
)
val
btnPay
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_mall_pay
)
val
btnAddCar
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_mall_add_car
)
val
tvUnitPrice
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_popup_price_unit_price
)
/* val tvOriginalPrice = view.findViewById<TextView>(R.id.tv_popup_price_original_price)*/
val
tvRepertory
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_popup_price_unit_repertory
)
val
tvNumber
=
view
.
findViewById
<
TextView
>(
R
.
id
.
tv_item_shop_number
)
val
btnPay
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_mall_pay
)
val
btnAddCar
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_mall_add_car
)
val
tvUnitPrice
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_popup_price_unit_price
)
/* val tvOriginalPrice = view.findViewById<
cn.dankal.basiclib.widget.NewFont
TextView>(R.id.tv_popup_price_original_price)*/
val
tvRepertory
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_popup_price_unit_repertory
)
val
tvNumber
=
view
.
findViewById
<
cn
.
dankal
.
basiclib
.
widget
.
NewFont
TextView
>(
R
.
id
.
tv_item_shop_number
)
val
clCarReduce
=
view
.
findViewById
<
ConstraintLayout
>(
R
.
id
.
cl_car_reduce
)
val
clCarAdd
=
view
.
findViewById
<
ConstraintLayout
>(
R
.
id
.
cl_car_add
)
var
ivMallPicture
=
view
.
findViewById
<
ImageView
>(
R
.
id
.
iv_mall_picture
)
...
...
app/src/main/res/layout-night/activity_appeal_result.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:layout_marginTop=
"@dimen/dp_80"
android:src=
"@mipmap/ic_complaint_successful"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/successful_order_appeal"
...
...
@@ -24,7 +24,7 @@
android:layout_marginTop=
"@dimen/dp_21"
android:layout_gravity=
"center_horizontal"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/color_a6a6a6"
...
...
@@ -33,7 +33,7 @@
android:layout_gravity=
"center_horizontal"
android:text=
"@string/please_wait_patiently_for_background_processing"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_return"
android:background=
"@drawable/bg_button_return_night"
android:layout_width=
"@dimen/dp_124"
...
...
app/src/main/res/layout-night/activity_dishes_details.xml
View file @
69fa5dd9
...
...
@@ -32,7 +32,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -43,7 +43,7 @@
android:textSize=
"@dimen/sp_17"
tools:text=
"蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_sales"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -68,7 +68,7 @@
android:textColor=
"@color/font_FF3B30"
android:textSize=
"@dimen/sp_22"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -88,7 +88,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -96,7 +96,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:background=
"@color/color_3d3d3d"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -150,7 +150,7 @@
android:textColor=
"@color/color_595959"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -172,7 +172,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
@@ -199,7 +199,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_tip"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_44"
...
...
app/src/main/res/layout-night/activity_food_all_evaluate.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
app:mImageWidth=
"@dimen/dp_20"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_grade"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -35,7 +35,7 @@
android:textSize=
"@dimen/font_18_sp"
tools:text=
"4.7"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
tools:text=
"(230评价)"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_10"
android:background=
"@color/color_232323"
/>
...
...
@@ -54,7 +54,7 @@
android:layout_height=
"@dimen/dp_50"
android:gravity=
"right|center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_new_order"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -63,14 +63,14 @@
android:textColor=
"@color/color_fbbc39"
android:textSize=
"@dimen/font_16_sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_1"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_20"
android:layout_marginBottom=
"@dimen/dp_20"
android:background=
"@color/bg_979797"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_grade_order"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_food_evaluation.xml
View file @
69fa5dd9
...
...
@@ -41,7 +41,7 @@
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/iv_hotel_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -89,7 +89,7 @@
android:maxLength=
"500"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -99,7 +99,7 @@
android:text=
"0/500"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_img_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -122,7 +122,7 @@
</android.support.v4.widget.NestedScrollView>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_btn_commit"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_46"
...
...
app/src/main/res/layout-night/activity_home.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:orientation=
"vertical"
tools:context=
"cn.dankal.client.ui.home.HomeFragment"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -48,13 +48,12 @@
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_marginLeft=
"@dimen/dp_16"
android:src=
"@mipmap/ic_combined_shape"
android:text=
"SMART ORDER"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_25"
/>
...
...
app/src/main/res/layout-night/activity_merchant_details.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_status_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -46,7 +46,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/tv_merchant_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_merchant_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -98,7 +98,7 @@
android:layout_marginTop=
"@dimen/dp_8"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_restaurant_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -106,7 +106,7 @@
android:textSize=
"@dimen/sp_19"
tools:text=
"王妃家(深圳总店)"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_stamp_tag"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -124,7 +124,7 @@
android:layout_marginTop=
"@dimen/dp_7"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/business_bulletin"
...
...
@@ -158,7 +158,7 @@
app:mImageWidth=
"@dimen/dp_14"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_grade"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -169,7 +169,7 @@
android:textSize=
"@dimen/font_18_sp"
tools:text=
"4.7"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_see_evaluation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -180,7 +180,7 @@
android:textColor=
"@color/color_999999"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_restaurant_stamp"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -191,7 +191,7 @@
android:textSize=
"@dimen/sp_12"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_restaurant_coupons"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -217,7 +217,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_55"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_2_dp"
android:layout_alignParentBottom=
"true"
...
...
app/src/main/res/layout-night/activity_nearby_merchant.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_weight=
"1"
...
...
app/src/main/res/layout-night/activity_order_details.xml
View file @
69fa5dd9
...
...
@@ -23,7 +23,7 @@
android:background=
"@mipmap/ic_order_light"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_table"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -51,7 +51,7 @@
android:textSize=
"@dimen/sp_15"
tools:text=
"桌号:0"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_status"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -78,7 +78,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -86,7 +86,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -107,7 +107,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -115,7 +115,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_deduction_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -134,7 +134,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -142,7 +142,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_actual_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -153,7 +153,7 @@
tools:text=
"¥112.88"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -162,7 +162,7 @@
android:layout_marginBottom=
"@dimen/dp_15"
android:background=
"@color/color_29ebebeb"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -179,14 +179,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/order_number"
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -206,14 +206,14 @@
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/creation_time"
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -232,14 +232,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/payment_method"
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_way"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -250,7 +250,7 @@
tools:text=
"余额支付"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -261,7 +261,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_remark"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -293,7 +293,7 @@
android:paddingRight=
"@dimen/dp_18"
android:paddingBottom=
"@dimen/dp_15"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/refund_information"
...
...
@@ -306,14 +306,14 @@
android:layout_marginTop=
"@dimen/dp_10"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/complaint_time"
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_apply_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -330,14 +330,14 @@
android:layout_marginTop=
"@dimen/dp_10"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/causes_of_complaint"
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_reason"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -355,14 +355,14 @@
android:layout_marginTop=
"@dimen/dp_15"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/refund_amount_tow"
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_money"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -387,7 +387,7 @@
android:background=
"@color/color_232323"
android:gravity=
"center_vertical|right"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_again"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -398,7 +398,7 @@
android:textColor=
"@color/btn_bg"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_evaluation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -409,7 +409,7 @@
android:textColor=
"@color/color_fbbc39"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_appeal"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -420,7 +420,7 @@
android:textColor=
"@color/color_171717"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_cancel_apply"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
app/src/main/res/layout-night/activity_order_result.xml
View file @
69fa5dd9
...
...
@@ -29,7 +29,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -37,7 +37,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_number"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_replace_table"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -64,7 +64,7 @@
android:textSize=
"@dimen/sp_12"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -84,7 +84,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -93,7 +93,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -113,7 +113,7 @@
android:paddingRight=
"@dimen/dp_20"
android:paddingBottom=
"@dimen/dp_14"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -123,7 +123,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -137,7 +137,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_23"
...
...
@@ -154,7 +154,7 @@
android:paddingRight=
"@dimen/dp_20"
android:paddingBottom=
"@dimen/dp_14"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -165,7 +165,7 @@
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_remark"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -179,7 +179,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_23"
...
...
@@ -194,7 +194,7 @@
android:paddingTop=
"@dimen/dp_20"
android:paddingBottom=
"@dimen/dp_26"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -202,7 +202,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_11"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_end_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_queue.xml
View file @
69fa5dd9
...
...
@@ -75,7 +75,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_tips"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_queue_details.xml
View file @
69fa5dd9
...
...
@@ -32,7 +32,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_home_queuing"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_you_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -58,7 +58,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"39sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -75,7 +75,7 @@
tools:text=
"中桌(2-4人)"
android:textColor=
"@color/font_gray_four"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -94,7 +94,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"21dp"
android:layout_height=
"wrap_content"
...
...
@@ -107,7 +107,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -119,7 +119,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/number_of_waiting_tables_ahead"
...
...
@@ -131,7 +131,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"1dp"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_10"
...
...
@@ -143,7 +143,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -156,7 +156,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -168,7 +168,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count_time"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/expected_waiting_time"
...
...
@@ -181,7 +181,7 @@
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_show_tip"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_queue_result.xml
View file @
69fa5dd9
...
...
@@ -34,7 +34,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_home_line_up_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -50,7 +50,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_you_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -69,7 +69,7 @@
android:textColor=
"@color/white"
android:textSize=
"39sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_shop"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -77,7 +77,7 @@
android:text=
"中桌(2-4人)"
android:textColor=
"@color/font_gray_four"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -96,7 +96,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -109,7 +109,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -121,7 +121,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/number_of_waiting_tables_ahead"
...
...
@@ -133,7 +133,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"1dp"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_10"
...
...
@@ -145,7 +145,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -158,7 +158,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -170,7 +170,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count_time"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/expected_waiting_time"
...
...
@@ -183,7 +183,7 @@
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_order"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_result_page.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
android:layout_marginTop=
"@dimen/dp_24"
android:src=
"@mipmap/ic_successful"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_19"
...
...
@@ -36,7 +36,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_get_stamp_tip"
android:layout_width=
"@dimen/dp_235"
android:layout_height=
"wrap_content"
...
...
@@ -46,7 +46,7 @@
android:textSize=
"@dimen/sp_15"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_6"
...
...
@@ -65,7 +65,7 @@
android:background=
"@color/color_232323"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -74,7 +74,7 @@
android:text=
"@string/currently_ordered"
android:textColor=
"@color/color_a6a6a6"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -96,7 +96,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -104,7 +104,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_scan_result.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:layout_marginTop=
"@dimen/dp_108"
android:src=
"@mipmap/ic_home_scan_fail"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_23"
...
...
@@ -24,7 +24,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/sp_15"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/colorC1"
android:text=
"@string/two_dimensional_accessed"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_button_result"
android:layout_width=
"@dimen/dp_124"
android:layout_height=
"@dimen/dp_34"
...
...
app/src/main/res/layout-night/activity_search.xml
View file @
69fa5dd9
...
...
@@ -29,7 +29,7 @@
android:hint=
"@string/please_enter_the_name_merchant"
android:paddingLeft=
"@dimen/dp_10"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_search"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -41,7 +41,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"@color/color_3d3d3d"
/>
...
...
@@ -60,7 +60,7 @@
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/dp_15"
...
...
@@ -81,7 +81,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -91,7 +91,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_clean_history"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/activity_select_pay.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_alipay"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -33,7 +33,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -55,7 +55,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_alipay_copy"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -71,7 +71,7 @@
android:src=
"@mipmap/ic_home_wechat"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
app/src/main/res/layout-night/adapter_layout_empty_data.xml
View file @
69fa5dd9
...
...
@@ -10,7 +10,7 @@
android:layout_height=
"100dp"
android:src=
"@mipmap/pic_my_home_no_order"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout-night/adapter_layout_empty_data_one.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_75"
android:src=
"@mipmap/ic_order_confirmation_light"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_10"
...
...
app/src/main/res/layout-night/adapter_layout_empty_food_car.xml
View file @
69fa5dd9
...
...
@@ -10,7 +10,7 @@
android:layout_height=
"@dimen/dp_100"
android:src=
"@mipmap/ic_order_confirmation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout-night/adapter_layout_empty_order.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"130dp"
android:src=
"@mipmap/ic_order_confirmation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout-night/adapter_layout_merchant_empty.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/ic_order_confirmation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/adapter_layout_personal_empty_data.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/pic_my_home_stamp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/adapter_layout_personal_empty_data_tow.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/pic_profiling_monochromatic"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/dialog_bottom_list.xml
View file @
69fa5dd9
...
...
@@ -23,7 +23,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_car_clean"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -84,7 +84,7 @@
android:textColor=
"@color/font_A4A4A4"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -106,7 +106,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
app/src/main/res/layout-night/dialog_common.xml
View file @
69fa5dd9
...
...
@@ -21,7 +21,7 @@
android:orientation=
"vertical"
android:visibility=
"visible"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -30,7 +30,7 @@
android:visibility=
"visible"
tools:text=
"标题"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_des"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_subtitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -72,7 +72,7 @@
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/bt_negative"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -90,7 +90,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/color_3d3d3d"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/bt_positive"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/dialog_home_filter.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:background=
"@color/color_232323"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -79,7 +79,7 @@
</RelativeLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pack_up"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -94,7 +94,7 @@
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_title_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -112,7 +112,7 @@
android:layout_marginBottom=
"@dimen/dp_13"
app:max_select=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_title_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -136,7 +136,7 @@
android:layout_marginTop=
"@dimen/dp_40"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_add_car"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/dp_50"
...
...
@@ -147,7 +147,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_17"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_pay"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/dp_50"
...
...
app/src/main/res/layout-night/dialog_input_remark.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_50"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/Input_notes"
...
...
@@ -62,7 +62,7 @@
android:maxLength=
"100"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/dialog_item_call.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_39"
...
...
@@ -23,7 +23,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_phone"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_19"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"@color/color_3d3d3d"
/>
...
...
@@ -42,7 +42,7 @@
android:layout_height=
"@dimen/dp_50"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
@@ -52,12 +52,12 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dimen_1_dp"
android:layout_height=
"match_parent"
android:background=
"@color/color_3d3d3d"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_call"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout-night/dialog_item_list.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:background=
"@drawable/bg_shop_item_night"
android:paddingBottom=
"@dimen/dp_22"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_dialog_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf=
"@id/tv_dialog_title"
app:layout_constraintBottom_toBottomOf=
"@id/tv_dialog_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_line"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
...
...
app/src/main/res/layout-night/dialog_item_list_take_number.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:background=
"@drawable/bg_shop_item_night"
android:paddingBottom=
"@dimen/dp_22"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_dialog_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -28,7 +28,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/tv_dialog_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_line"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
...
...
app/src/main/res/layout-night/dialog_select_format_tow.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_marginRight=
"@dimen/dp_27"
android:background=
"@drawable/bg_pw_select_night"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_format"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -124,7 +124,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:src=
"@mipmap/ic_home_mall_order_reduce"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/fragment_details_info.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
android:visibility=
"gone"
android:src=
"@mipmap/ic_home_details_location_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_merchant_address"
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_1"
android:layout_height=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_4"
...
...
@@ -56,7 +56,7 @@
android:src=
"@mipmap/ic_home_details_tel"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
app/src/main/res/layout-night/fragment_details_shop.xml
View file @
69fa5dd9
...
...
@@ -69,7 +69,7 @@
android:textColor=
"@color/color_595959"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -92,7 +92,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
@@ -118,7 +118,7 @@
android:textSize=
"@dimen/sp_20"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_tip"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_44"
...
...
app/src/main/res/layout-night/fragment_menu_item.xml
View file @
69fa5dd9
...
...
@@ -26,7 +26,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_recommend"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_3"
...
...
@@ -36,7 +36,7 @@
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_more"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_placeholder"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_3"
...
...
@@ -77,7 +77,7 @@
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_filter"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout-night/gv_filter_image.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
app:layout_constraintRight_toRightOf=
"parent"
android:src=
"@mipmap/ic_evaluation_increase"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -55,7 +55,7 @@
android:src=
"@mipmap/ic_mall_order_comment_close"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_duration"
android:layout_width=
"80dp"
android:layout_height=
"30dp"
...
...
app/src/main/res/layout-night/item_dialog_format.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/space_16_dp"
...
...
@@ -12,4 +12,4 @@
android:text=
"加载中"
android:textColor=
"@drawable/label_text_selector_night"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout-night/item_dialog_select.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"@dimen/dp_80"
android:layout_height=
"@dimen/dp_36"
android:layout_marginRight=
"@dimen/space_12_dp"
...
...
@@ -10,4 +10,4 @@
android:textColor=
"@drawable/label_text_selector_night"
android:textSize=
"@dimen/sp_14"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout-night/item_evaluate_food.xml
View file @
69fa5dd9
...
...
@@ -20,7 +20,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
app:mMargin=
"@dimen/dp_3"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -50,7 +50,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -64,7 +64,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_margin=
"@dimen/dp_15"
...
...
app/src/main/res/layout-night/item_food_list.xml
View file @
69fa5dd9
...
...
@@ -34,7 +34,7 @@
android:layout_marginTop=
"@dimen/dp_17"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -54,7 +54,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -64,7 +64,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_9"
...
...
@@ -79,7 +79,7 @@
android:layout_marginBottom=
"@dimen/dp_15"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -88,7 +88,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/dp_13"
...
...
@@ -96,7 +96,7 @@
android:textColor=
"@color/color_a6a6a6"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_home_bottom_item.xml
View file @
69fa5dd9
...
...
@@ -19,7 +19,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_bottom_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -47,7 +47,7 @@
app:mIsClick=
"false"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_bottom_distance"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -76,7 +76,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_home_line_new"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right|center_vertical"
...
...
@@ -86,7 +86,7 @@
</FrameLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -95,7 +95,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_bottom_queue"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_layout_auxiliary.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_spicy"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_menu_child.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:src=
"@mipmap/pic_home_banner_2"
/>
</android.support.v7.widget.CardView>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_menu_text"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -36,7 +36,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_menu_distance"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_merchant.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_sale"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -47,7 +47,7 @@
android:textColor=
"@color/color_595959"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_distance"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -58,7 +58,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_my_queue.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:background=
"@color/color_232323"
android:layout_marginRight=
"@dimen/dp_10"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -25,7 +25,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number_tow"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_number"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_number_tow"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_waiting"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -72,7 +72,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_waiting_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -83,7 +83,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_waiting"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_minute"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -95,7 +95,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_minute_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -105,7 +105,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@id/tv_queue_minute"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_minute_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_my_queue_tow.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:paddingBottom=
"@dimen/dp_16"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -26,7 +26,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number_tow"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_number"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_order_child.xml
View file @
69fa5dd9
...
...
@@ -31,7 +31,7 @@
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:gravity=
"right"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -79,7 +79,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
app/src/main/res/layout-night/item_queue.xml
View file @
69fa5dd9
...
...
@@ -20,12 +20,12 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_3"
android:layout_height=
"@dimen/dp_13"
android:background=
"@color/color_fbbc39"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tables_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -35,7 +35,7 @@
android:textSize=
"@dimen/sp_16"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_number_min_max"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -54,7 +54,7 @@
android:text=
"约30分钟"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_front"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_search_hot.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/space_10_dp"
...
...
@@ -12,4 +12,4 @@
android:textColor=
"@color/color_d3d3d3"
android:text=
"加载中"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout-night/item_search_string.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/tv_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -10,4 +10,4 @@
android:textColor=
"@color/color_d3d3d3"
android:textSize=
"@dimen/sp_14"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout-night/item_shop_bottom_list.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -23,7 +23,7 @@
android:textSize=
"@dimen/font_18_sp"
android:text=
"水果蛋糕1个"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:src=
"@mipmap/ic_home_mall_order_reduce_night"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -66,7 +66,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_show_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_shop_details.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -34,7 +34,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_sales"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -58,7 +58,7 @@
android:textColor=
"@color/font_orange"
android:textSize=
"@dimen/sp_20"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_format"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/item_shop_type_title.xml
View file @
69fa5dd9
...
...
@@ -6,13 +6,13 @@
android:background=
"@color/color_ff2f2f2f"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_title_tag"
android:layout_width=
"@dimen/dp_4"
android:layout_height=
"match_parent"
android:background=
"@color/color_fffbbc39"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_menu_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout-night/layout_single_text_title.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
android:src=
"@mipmap/ic_back_black"
tools:ignore=
"ContentDescription"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"49dp"
...
...
app/src/main/res/layout/activity_add_address.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:layout_marginBottom=
"@dimen/dp_12"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_80"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -38,7 +38,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -52,7 +52,7 @@
android:layout_marginBottom=
"@dimen/dp_12"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_80"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -75,7 +75,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -91,7 +91,7 @@
android:paddingTop=
"@dimen/dp_12"
android:paddingBottom=
"@dimen/dp_12"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_80"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -117,14 +117,14 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_marginRight=
"@dimen/dp_2"
android:background=
"@color/line_one"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -155,7 +155,7 @@
android:layout_marginTop=
"@dimen/dp_25"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -172,7 +172,7 @@
android:src=
"@mipmap/ic_mall_details_coupon_close"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
app/src/main/res/layout/activity_address_manager.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_height=
"@dimen/dp_0"
android:layout_weight=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_add"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_48"
...
...
app/src/main/res/layout/activity_after_sale_info.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:orientation=
"vertical"
android:visibility=
"gone"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_25"
...
...
@@ -35,7 +35,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_remaining_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
android:textSize=
"@dimen/sp_12"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_after_success"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:textSize=
"@dimen/sp_16"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_after_close"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -82,7 +82,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -94,7 +94,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_text_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -103,7 +103,7 @@
android:textColor=
"@color/color99"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_text_tow"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -121,7 +121,7 @@
android:layout_marginBottom=
"@dimen/dp_13"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_btn_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -135,7 +135,7 @@
android:textSize=
"@dimen/sp_12"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_btn_update"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -151,7 +151,7 @@
android:textSize=
"@dimen/sp_12"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_btn_service"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -181,7 +181,7 @@
android:orientation=
"horizontal"
android:visibility=
"gone"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -190,7 +190,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_refund_money"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -209,7 +209,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -236,7 +236,7 @@
android:orientation=
"horizontal"
android:visibility=
"gone"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -247,7 +247,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -291,7 +291,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -300,7 +300,7 @@
android:textSize=
"@dimen/sp_13"
tools:text=
"新西兰有机新鲜苹果"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -311,7 +311,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -327,7 +327,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_specs"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -337,7 +337,7 @@
android:textSize=
"@dimen/sp_12"
tools:text=
"2个/500g"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -359,7 +359,7 @@
android:paddingLeft=
"@dimen/dp_15"
android:paddingBottom=
"@dimen/dp_10"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_reason_return"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -368,7 +368,7 @@
android:textSize=
"12sp"
tools:text=
"退款原因:重复下单/误下单"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_money_return"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -377,7 +377,7 @@
android:textSize=
"12sp"
tools:text=
"退款原因:重复下单/误下单"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_time_return"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -386,7 +386,7 @@
android:textSize=
"12sp"
tools:text=
"退款原因:重复下单/误下单"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_id_return"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_appeal_result.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:layout_marginTop=
"@dimen/dp_80"
android:src=
"@mipmap/ic_successful"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/successful_order_appeal"
...
...
@@ -23,7 +23,7 @@
android:layout_marginTop=
"@dimen/dp_21"
android:layout_gravity=
"center_horizontal"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/colorC1"
...
...
@@ -32,7 +32,7 @@
android:layout_gravity=
"center_horizontal"
android:text=
"@string/please_wait_patiently_for_background_processing"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_return"
android:background=
"@drawable/bg_button_return"
android:layout_width=
"@dimen/dp_124"
...
...
app/src/main/res/layout/activity_apply_after_sale.xml
View file @
69fa5dd9
...
...
@@ -8,7 +8,7 @@
android:orientation=
"vertical"
tools:context=
"cn.dankal.client.ui.personal.order.mall.ApplyAfterSaleActivity"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -51,7 +51,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:textSize=
"@dimen/sp_13"
tools:text=
"新西兰有机新鲜苹果"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -71,7 +71,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -87,7 +87,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_specs"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -97,7 +97,7 @@
android:textSize=
"@dimen/sp_12"
tools:text=
"2个/500g"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -125,7 +125,7 @@
android:paddingBottom=
"@dimen/dp_10"
android:paddingLeft=
"@dimen/dp_19"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -137,7 +137,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_tow"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -168,7 +168,7 @@
android:paddingBottom=
"@dimen/dp_10"
android:paddingLeft=
"@dimen/dp_19"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_one"
android:layout_width=
"wrap_content"
android:layout_height=
"17dp"
...
...
@@ -180,7 +180,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tow"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_apply_after_sale_tow.xml
View file @
69fa5dd9
...
...
@@ -7,7 +7,7 @@
android:background=
"@color/bg_f0f2f5"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -58,7 +58,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -69,7 +69,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -85,7 +85,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_specs"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -95,7 +95,7 @@
android:textColor=
"@color/colorCF"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -115,7 +115,7 @@
android:background=
"@color/white"
android:paddingLeft=
"@dimen/dp_19"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -128,7 +128,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_reason"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -153,7 +153,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_tip_one"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag_tow"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -161,14 +161,14 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"₩"
android:textColor=
"@color/btn_bg"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_refund_money"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -188,14 +188,14 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/most"
android:textColor=
"@color/color99"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_refund_more_money"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -212,7 +212,7 @@
android:orientation=
"horizontal"
android:paddingLeft=
"@dimen/dp_19"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/reimbursement_note"
...
...
@@ -244,7 +244,7 @@
android:orientation=
"horizontal"
android:paddingTop=
"@dimen/dp_12"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_19"
...
...
@@ -252,7 +252,7 @@
android:text=
"@string/upload_vouchers"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_img_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_big_photo.xml
View file @
69fa5dd9
...
...
@@ -18,7 +18,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/colorFF"
...
...
app/src/main/res/layout/activity_capture.xml
View file @
69fa5dd9
...
...
@@ -31,7 +31,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
...
...
@@ -40,7 +40,7 @@
android:textColor=
"#ffffff"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
...
...
@@ -74,7 +74,7 @@
android:layout_height=
"36dp"
app:srcCompat=
"@drawable/ic_close"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/flashLightTv"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -100,7 +100,7 @@
android:tint=
"#ffffffff"
app:srcCompat=
"@drawable/ic_photo"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"5dp"
...
...
app/src/main/res/layout/activity_details_shop.xml
View file @
69fa5dd9
...
...
@@ -29,7 +29,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -40,7 +40,7 @@
android:textSize=
"@dimen/sp_17"
tools:text=
"蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_sales"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -56,7 +56,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -66,7 +66,7 @@
android:textColor=
"@color/font_FF3B30"
android:textSize=
"@dimen/sp_22"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -86,7 +86,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -94,7 +94,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:background=
"#E5E5E5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -132,7 +132,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_tip_text"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
@@ -144,7 +144,7 @@
android:textColor=
"@color/font_A4A4A4"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -166,7 +166,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
@@ -193,7 +193,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_tip"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_44"
...
...
app/src/main/res/layout/activity_dishes_details.xml
View file @
69fa5dd9
...
...
@@ -31,7 +31,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
android:textSize=
"@dimen/sp_17"
tools:text=
"蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_sales"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -58,7 +58,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:textColor=
"@color/font_FF3B30"
android:textSize=
"@dimen/sp_22"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -87,7 +87,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -95,7 +95,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:background=
"#E5E5E5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -148,7 +148,7 @@
android:textColor=
"@color/font_A4A4A4"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -170,7 +170,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
@@ -197,7 +197,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_tip"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_44"
...
...
app/src/main/res/layout/activity_edit_name.xml
View file @
69fa5dd9
...
...
@@ -20,7 +20,7 @@
android:textColor=
"@color/color99"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
app/src/main/res/layout/activity_email_update_password.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
app:layout_constraintRight_toRightOf=
"@+id/et_old_password"
app:layout_constraintTop_toBottomOf=
"@+id/et_old_password"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -56,7 +56,7 @@
app:layout_constraintRight_toLeftOf=
"@id/btn_code"
app:layout_constraintTop_toBottomOf=
"@+id/et_passwd"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_password_sure"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_evaluation.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_commit"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_46"
...
...
app/src/main/res/layout/activity_express.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_code"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:background=
"@color/bg_f0f2f5"
/>
...
...
@@ -53,7 +53,7 @@
android:layout_weight=
"1"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
...
...
@@ -63,7 +63,7 @@
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_function"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_feedback.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:maxLength=
"200"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -33,14 +33,14 @@
android:text=
"0/200"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_16"
android:layout_marginRight=
"@dimen/dp_16"
android:background=
"@color/colorE5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_img_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_find_email.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -31,7 +31,7 @@
android:gravity=
"center_vertical"
app:layout_constraintTop_toBottomOf=
"@id/tv_phone_num"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pop_select"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -64,7 +64,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/ll_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_find_email_tow.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_food_all_evaluate.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
app:mImageWidth=
"@dimen/dp_20"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_grade"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -34,7 +34,7 @@
android:textSize=
"@dimen/font_18_sp"
tools:text=
"4.7"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -43,7 +43,7 @@
tools:text=
"(230评价)"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_10"
android:background=
"@color/bg_fff5f5f5"
/>
...
...
@@ -53,7 +53,7 @@
android:layout_height=
"@dimen/dp_50"
android:gravity=
"right|center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_new_order"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -62,14 +62,14 @@
android:textColor=
"@color/color00"
android:textSize=
"@dimen/font_16_sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_1"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_20"
android:layout_marginBottom=
"@dimen/dp_20"
android:background=
"@color/bg_979797"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_grade_order"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_food_evaluation.xml
View file @
69fa5dd9
...
...
@@ -41,7 +41,7 @@
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/iv_hotel_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -88,7 +88,7 @@
android:maxLength=
"500"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -97,7 +97,7 @@
android:text=
"0/500"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_img_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -120,7 +120,7 @@
</android.support.v4.widget.NestedScrollView>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_btn_commit"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_46"
...
...
app/src/main/res/layout/activity_forget_password.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
app:layout_constraintRight_toRightOf=
"@+id/et_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/et_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_forget_password_home.xml
View file @
69fa5dd9
...
...
@@ -20,7 +20,7 @@
android:gravity=
"center"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -31,7 +31,7 @@
android:textColor=
"@color/font_orange"
android:textSize=
"@dimen/font_16_sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_tag"
android:layout_width=
"40dp"
android:layout_height=
"2dp"
...
...
@@ -39,7 +39,7 @@
android:background=
"@color/font_orange"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dimen_1_dp"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/dp_16"
...
...
@@ -55,7 +55,7 @@
android:gravity=
"center"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -66,7 +66,7 @@
android:textColor=
"@color/font_one"
android:textSize=
"@dimen/font_16_sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email_tag"
android:layout_width=
"40dp"
android:layout_height=
"2dp"
...
...
@@ -89,7 +89,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -114,7 +114,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_phone_num"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pop_select"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -147,7 +147,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/ll_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -227,7 +227,7 @@
android:background=
"@color/colorFF"
android:visibility=
"gone"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -268,7 +268,7 @@
app:layout_constraintRight_toRightOf=
"@+id/et_email_num"
app:layout_constraintTop_toBottomOf=
"@+id/et_email_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email_password"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -322,7 +322,7 @@
app:layout_constraintRight_toLeftOf=
"@id/btn_email_code"
app:layout_constraintTop_toBottomOf=
"@+id/et_email_password"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_home.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:orientation=
"vertical"
tools:context=
"cn.dankal.client.ui.home.HomeFragment"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -45,7 +45,7 @@
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_is_bind_phone.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -30,7 +30,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_phone_num"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pop_select"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -62,7 +62,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/ll_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -150,7 +150,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_user_protocol"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_language_select.xml
View file @
69fa5dd9
...
...
@@ -8,7 +8,7 @@
android:visibility=
"gone"
tools:context=
".login.LanguageSelectActivity"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_50"
android:gravity=
"center"
...
...
@@ -16,12 +16,12 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/sp_22"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:background=
"@color/bg_E9E9E9"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
...
...
@@ -31,7 +31,7 @@
android:textSize=
"@dimen/font_16_sp"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
...
...
app/src/main/res/layout/activity_lock_state.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:layout_marginTop=
"@dimen/dp_79"
android:src=
"@mipmap/img"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"#ff313131"
...
...
app/src/main/res/layout/activity_login_sdk.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -47,7 +47,7 @@
app:layout_constraintRight_toRightOf=
"@+id/et_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/et_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -107,7 +107,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/divider_passwd"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_forget"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -118,7 +118,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/bt_login"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_find_email"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -130,7 +130,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/bt_login"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_register_account"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -142,7 +142,7 @@
app:layout_constraintTop_toBottomOf=
"@id/bt_login"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_quick_login"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -174,7 +174,7 @@
android:layout_marginLeft=
"@dimen/dp_8"
android:src=
"@mipmap/ic_wechat"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
...
...
app/src/main/res/layout/activity_logistics.xml
View file @
69fa5dd9
...
...
@@ -20,7 +20,7 @@
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"0dp"
android:layout_weight=
"1"
...
...
@@ -30,12 +30,12 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:background=
"@color/bg_f0f2f5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_refund_reason"
android:layout_width=
"wrap_content"
android:layout_height=
"0dp"
...
...
app/src/main/res/layout/activity_logout.xml
View file @
69fa5dd9
...
...
@@ -18,7 +18,7 @@
android:background=
"@drawable/bg_logout_layout"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_logout"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -56,7 +56,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_user_protocol"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_mall_evaluation_result.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_success"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -40,7 +40,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/iv_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_result_see"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -54,7 +54,7 @@
app:layout_constraintRight_toLeftOf=
"@id/tv_success_line"
app:layout_constraintTop_toBottomOf=
"@id/tv_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_success_line"
android:layout_width=
"@dimen/dp_2"
android:layout_height=
"@dimen/dp_15"
...
...
@@ -64,7 +64,7 @@
app:layout_constraintRight_toLeftOf=
"@id/tv_result_home"
app:layout_constraintTop_toBottomOf=
"@id/tv_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_result_home"
android:layout_width=
"wrap_content"
android:layout_height=
"20dp"
...
...
@@ -92,7 +92,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/pic_recommend_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/recommendation_for_you"
...
...
@@ -106,7 +106,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
...
...
app/src/main/res/layout/activity_mall_order_cancel_details.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -61,7 +61,7 @@
android:layout_marginLeft=
"@dimen/dp_30"
android:src=
"@mipmap/ic_mall_order_address_ocation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -69,7 +69,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_phone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -81,7 +81,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -99,7 +99,7 @@
android:src=
"@mipmap/pic_home_queuing_line"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -127,7 +127,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -135,7 +135,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -155,7 +155,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -163,7 +163,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_offer_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -183,7 +183,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -192,7 +192,7 @@
android:textSize=
"@dimen/sp_16"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_end_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -220,14 +220,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/order_number"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -246,14 +246,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/creation_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_create_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -275,14 +275,14 @@
android:layout_marginBottom=
"@dimen/dp_35"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/causes_for_cancellation"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_cancel_cause"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -304,14 +304,14 @@
android:layout_marginBottom=
"@dimen/dp_35"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/payment_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_pay_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -324,7 +324,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_70"
/>
...
...
app/src/main/res/layout/activity_mall_order_complete_details.xml
View file @
69fa5dd9
...
...
@@ -30,7 +30,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:layout_marginLeft=
"@dimen/dp_30"
android:src=
"@mipmap/ic_mall_order_logistics"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -92,7 +92,7 @@
android:layout_marginLeft=
"@dimen/dp_30"
android:src=
"@mipmap/ic_mall_order_address_ocation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -100,7 +100,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_phone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -112,7 +112,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -130,7 +130,7 @@
android:src=
"@mipmap/pic_home_queuing_line"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -158,7 +158,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -166,7 +166,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -186,7 +186,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -194,7 +194,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_offer_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -214,7 +214,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -223,7 +223,7 @@
android:textSize=
"@dimen/sp_16"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_end_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -251,14 +251,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/order_number"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -277,14 +277,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/creation_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_create_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -303,14 +303,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/payment_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_pay_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -329,14 +329,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/delivery_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_ship_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -356,14 +356,14 @@
android:layout_marginBottom=
"@dimen/dp_35"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/dealing_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_clinch_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -384,7 +384,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical|right"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_evaluation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -395,7 +395,7 @@
android:textColor=
"@color/white"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_see_evaluation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
app/src/main/res/layout/activity_mall_order_details.xml
View file @
69fa5dd9
...
...
@@ -30,7 +30,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:layout_marginLeft=
"@dimen/dp_30"
android:src=
"@mipmap/ic_mall_order_logistics"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -93,7 +93,7 @@
android:layout_marginLeft=
"@dimen/dp_30"
android:src=
"@mipmap/ic_mall_order_address_ocation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -101,7 +101,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_phone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -113,7 +113,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -131,7 +131,7 @@
android:src=
"@mipmap/pic_home_queuing_line"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -159,7 +159,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -167,7 +167,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -186,7 +186,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -194,7 +194,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_offer_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -213,7 +213,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -222,7 +222,7 @@
android:textSize=
"@dimen/sp_16"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_end_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -249,14 +249,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/order_number"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -275,14 +275,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/creation_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_create_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -302,14 +302,14 @@
android:layout_marginBottom=
"@dimen/dp_17"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/payment_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_pay_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -330,14 +330,14 @@
android:visibility=
"gone"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/delivery_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_delivery_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -358,7 +358,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical|right"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_leave_message"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -370,7 +370,7 @@
android:textColor=
"@color/btn_bg"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sure_receive"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -381,7 +381,7 @@
android:textColor=
"@color/btn_bg"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_contact"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -391,7 +391,7 @@
android:text=
"@string/contact_customer_service"
android:textColor=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_representation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
app/src/main/res/layout/activity_mall_order_pay_details.xml
View file @
69fa5dd9
...
...
@@ -30,7 +30,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -47,7 +47,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count_down"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -76,7 +76,7 @@
android:layout_marginLeft=
"@dimen/dp_30"
android:src=
"@mipmap/ic_mall_order_address_ocation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -84,7 +84,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_phone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -96,7 +96,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_receipt_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -114,7 +114,7 @@
android:src=
"@mipmap/pic_home_queuing_line"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -142,7 +142,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -150,7 +150,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -170,7 +170,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -178,7 +178,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_offer_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -198,7 +198,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -207,7 +207,7 @@
android:textSize=
"@dimen/sp_16"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_end_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -235,14 +235,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/order_number"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -261,14 +261,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/creation_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_create_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -289,7 +289,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical|right"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel_order"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -299,7 +299,7 @@
android:text=
"@string/cancellation_of_order"
android:textColor=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_pay"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
app/src/main/res/layout/activity_mall_pay_result.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_success"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -40,7 +40,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/iv_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_result_see"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -54,7 +54,7 @@
app:layout_constraintRight_toLeftOf=
"@id/tv_success_line"
app:layout_constraintTop_toBottomOf=
"@id/tv_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_success_line"
android:layout_width=
"@dimen/dp_2"
android:layout_height=
"@dimen/dp_15"
...
...
@@ -64,7 +64,7 @@
app:layout_constraintRight_toLeftOf=
"@id/tv_result_home"
app:layout_constraintTop_toBottomOf=
"@id/tv_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_result_home"
android:layout_width=
"wrap_content"
android:layout_height=
"20dp"
...
...
@@ -91,7 +91,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/pic_recommend_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/recommendation_for_you"
...
...
app/src/main/res/layout/activity_mall_search.xml
View file @
69fa5dd9
...
...
@@ -26,7 +26,7 @@
android:hint=
"@string/please_enter_the_name_merchant"
android:paddingLeft=
"@dimen/dp_10"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_search"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -57,7 +57,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/sp_25"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -78,12 +78,12 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"#E5E5E5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/bg_f0f2f5"
...
...
@@ -108,7 +108,7 @@
android:background=
"@color/bg_f0f2f5"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -150,7 +150,7 @@
android:orientation=
"horizontal"
android:visibility=
"gone"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comprehensive"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
@@ -161,7 +161,7 @@
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sales"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
@@ -177,7 +177,7 @@
android:layout_height=
"match_parent"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_merchant_details.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_status_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -46,7 +46,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/tv_merchant_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_merchant_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -97,7 +97,7 @@
android:layout_marginTop=
"@dimen/dp_8"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_restaurant_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -105,7 +105,7 @@
android:textSize=
"@dimen/sp_19"
tools:text=
"王妃家(深圳总店)"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_stamp_tag"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -123,7 +123,7 @@
android:layout_marginTop=
"@dimen/dp_7"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/business_bulletin"
...
...
@@ -157,7 +157,7 @@
app:mImageWidth=
"@dimen/dp_14"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_grade"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -168,7 +168,7 @@
android:textSize=
"@dimen/font_18_sp"
tools:text=
"4.7"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_see_evaluation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -179,7 +179,7 @@
android:textColor=
"@color/color_999999"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_restaurant_stamp"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -190,7 +190,7 @@
android:textColor=
"@color/font_three"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_restaurant_coupons"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -216,7 +216,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_55"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_2_dp"
android:layout_alignParentBottom=
"true"
...
...
app/src/main/res/layout/activity_modify_email.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColorHint=
"@color/colorCF"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email_register"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -63,7 +63,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_email"
app:layout_constraintTop_toBottomOf=
"@+id/ll_email"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"18dp"
...
...
app/src/main/res/layout/activity_modify_password.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -47,7 +47,7 @@
app:layout_constraintRight_toRightOf=
"@+id/et_old_password"
app:layout_constraintTop_toBottomOf=
"@+id/et_old_password"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -88,7 +88,7 @@
app:layout_constraintRight_toLeftOf=
"@id/btn_code"
app:layout_constraintTop_toBottomOf=
"@+id/et_passwd"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_password_sure"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_modify_phone.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -31,7 +31,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_phone_num"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pop_select"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -64,7 +64,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/ll_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_my_collect.xml
View file @
69fa5dd9
...
...
@@ -36,14 +36,14 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:button=
"@drawable/select_button_shop"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"@string/all_election"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_delete"
android:layout_width=
"@dimen/dp_117"
android:layout_height=
"match_parent"
...
...
@@ -53,7 +53,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_collect"
android:layout_width=
"@dimen/dp_117"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/activity_nearby_merchant.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
app/src/main/res/layout/activity_order_details.xml
View file @
69fa5dd9
...
...
@@ -23,7 +23,7 @@
android:background=
"@mipmap/ic_order_background"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_table"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -51,7 +51,7 @@
android:textSize=
"@dimen/sp_15"
tools:text=
"桌号:0"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_status"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -78,7 +78,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -86,7 +86,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -107,7 +107,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -115,7 +115,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_deduction_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -134,7 +134,7 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -142,7 +142,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_actual_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -153,7 +153,7 @@
tools:text=
"¥112.88"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -162,7 +162,7 @@
android:layout_marginBottom=
"@dimen/dp_15"
android:background=
"@color/line_one"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -179,14 +179,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/order_number"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_code"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -206,14 +206,14 @@
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/creation_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -232,14 +232,14 @@
android:layout_marginRight=
"@dimen/dp_20"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:text=
"@string/payment_method"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_way"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -250,7 +250,7 @@
tools:text=
"余额支付"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/dp_20"
...
...
@@ -261,7 +261,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_details_restaurant_order_remark"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -292,7 +292,7 @@
android:paddingRight=
"@dimen/dp_18"
android:paddingBottom=
"@dimen/dp_15"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/refund_information"
...
...
@@ -305,14 +305,14 @@
android:layout_marginTop=
"@dimen/dp_10"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/complaint_time"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_apply_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -329,14 +329,14 @@
android:layout_marginTop=
"@dimen/dp_10"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/causes_of_complaint"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_reason"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -354,14 +354,14 @@
android:layout_marginTop=
"@dimen/dp_15"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/refund_amount_tow"
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_money"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -386,7 +386,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical|right"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_again"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -397,7 +397,7 @@
android:textColor=
"@color/btn_bg"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_evaluation"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -408,7 +408,7 @@
android:textColor=
"@color/btn_bg"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_appeal"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -419,7 +419,7 @@
android:textColor=
"@color/white"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_cancel_apply"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
app/src/main/res/layout/activity_order_result.xml
View file @
69fa5dd9
...
...
@@ -29,7 +29,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -37,7 +37,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_number"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
android:textColor=
"@color/font_gray_four"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_replace_table"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -64,7 +64,7 @@
android:textSize=
"@dimen/sp_12"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -84,7 +84,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -93,7 +93,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -113,7 +113,7 @@
android:visibility=
"gone"
android:paddingBottom=
"@dimen/dp_14"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -123,7 +123,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -137,7 +137,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_23"
...
...
@@ -151,10 +151,11 @@
android:orientation=
"horizontal"
android:paddingLeft=
"@dimen/dp_20"
android:paddingTop=
"@dimen/dp_14"
android:visibility=
"gone"
android:paddingRight=
"@dimen/dp_20"
android:paddingBottom=
"@dimen/dp_14"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -165,7 +166,7 @@
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_remark"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -179,7 +180,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_23"
...
...
@@ -194,7 +195,7 @@
android:paddingTop=
"@dimen/dp_20"
android:paddingBottom=
"@dimen/dp_26"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -202,7 +203,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_11"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_end_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_personal_info.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_16"
...
...
@@ -39,7 +39,7 @@
android:src=
"@mipmap/ic_my_home_information_open_2"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -53,7 +53,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_17"
...
...
@@ -63,7 +63,7 @@
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_personal_email"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -81,7 +81,7 @@
android:src=
"@mipmap/ic_my_home_information_open_2"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -95,7 +95,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_17"
...
...
@@ -105,7 +105,7 @@
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_personal_username"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -123,7 +123,7 @@
android:src=
"@mipmap/ic_my_home_information_open_2"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -137,7 +137,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_17"
...
...
@@ -147,7 +147,7 @@
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_personal_phone"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -165,7 +165,7 @@
android:src=
"@mipmap/ic_my_home_information_open_2"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -179,7 +179,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_17"
...
...
@@ -189,7 +189,7 @@
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:gravity=
"right"
...
...
@@ -206,14 +206,14 @@
android:src=
"@mipmap/ic_my_home_information_open_2"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_15"
android:layout_marginRight=
"@dimen/dp_15"
android:background=
"@color/bg_E3E3E4"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
...
...
app/src/main/res/layout/activity_picture_play_audio.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
android:paddingBottom=
"15dp"
android:paddingTop=
"15dp"
>
<!--显示歌曲状态-->
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_musicStatus"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -33,7 +33,7 @@
android:gravity=
"center_horizontal|center_vertical"
>
<!--显示当前进度-->
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_musicTime"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:thumbOffset=
"0dp"
/>
<!--显示总进度-->
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_musicTotal"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -79,7 +79,7 @@
android:gravity=
"center_horizontal"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_PlayPause"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -91,7 +91,7 @@
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_Stop"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -103,7 +103,7 @@
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_Quit"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_protocol_user.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
tools:context=
".protocol.ProtocolUserActivity"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:text=
""
/>
...
...
app/src/main/res/layout/activity_queue.xml
View file @
69fa5dd9
...
...
@@ -74,7 +74,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_tips"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_queue_details.xml
View file @
69fa5dd9
...
...
@@ -32,7 +32,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_home_queuing"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_you_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:textColor=
"@color/font_gray_four"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -68,7 +68,7 @@
android:textSize=
"39sp"
tools:text=
"B03"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -76,7 +76,7 @@
android:textColor=
"@color/font_gray_four"
tools:text=
"中桌(2-4人)"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -95,7 +95,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"21dp"
android:layout_height=
"wrap_content"
...
...
@@ -108,7 +108,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -120,7 +120,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/number_of_waiting_tables_ahead"
...
...
@@ -132,7 +132,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"1dp"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_10"
...
...
@@ -144,7 +144,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -157,7 +157,7 @@
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
">0"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -169,7 +169,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count_time"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/expected_waiting_time"
...
...
@@ -182,7 +182,7 @@
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_show_tip"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_queue_result.xml
View file @
69fa5dd9
...
...
@@ -35,7 +35,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_home_line_up_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -52,7 +52,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_you_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -62,7 +62,7 @@
android:textColor=
"@color/font_gray_four"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -71,7 +71,7 @@
android:textColor=
"#313131"
android:textSize=
"39sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_shop"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -79,7 +79,7 @@
android:text=
"中桌(2-4人)"
android:textColor=
"@color/font_gray_four"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -98,7 +98,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -111,7 +111,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag_one"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -123,7 +123,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/number_of_waiting_tables_ahead"
...
...
@@ -135,7 +135,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"1dp"
android:layout_height=
"match_parent"
android:layout_marginTop=
"@dimen/dp_10"
...
...
@@ -147,7 +147,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -160,7 +160,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -172,7 +172,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_count_time"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/expected_waiting_time"
...
...
@@ -185,7 +185,7 @@
</android.support.constraint.ConstraintLayout>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_order"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_register.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -30,7 +30,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_phone_num"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pop_select"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -62,7 +62,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/ll_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -150,7 +150,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_user_protocol"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -161,7 +161,7 @@
app:layout_constraintTop_toBottomOf=
"@id/bt_login"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_account_login"
android:layout_width=
"wrap_content"
android:layout_height=
"19dp"
...
...
@@ -174,7 +174,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/ll_protocol"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_forget_password"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_register_email.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColorHint=
"@color/colorCF"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email_register"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -63,7 +63,7 @@
app:layout_constraintRight_toRightOf=
"@+id/ll_email"
app:layout_constraintTop_toBottomOf=
"@+id/ll_email"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"18dp"
...
...
@@ -157,7 +157,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_email_protocol"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_register_input_info.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_phone_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
app:layout_constraintRight_toRightOf=
"@+id/et_phone_num"
app:layout_constraintTop_toBottomOf=
"@+id/et_phone_num"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/passwd"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -87,7 +87,7 @@
app:layout_constraintRight_toLeftOf=
"@id/btn_code"
app:layout_constraintTop_toBottomOf=
"@+id/et_passwd"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_password_sure"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_result_page.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
android:layout_marginTop=
"@dimen/dp_24"
android:src=
"@mipmap/ic_successful"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_19"
...
...
@@ -36,7 +36,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_get_stamp_tip"
android:layout_width=
"@dimen/dp_235"
android:layout_height=
"wrap_content"
...
...
@@ -46,7 +46,7 @@
android:visibility=
"gone"
android:text=
"获得邮票数:0枚,集齐一定数量即可 抵扣商品哦!"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_6"
...
...
@@ -65,7 +65,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -73,7 +73,7 @@
android:layout_marginBottom=
"@dimen/dp_21"
android:text=
"@string/currently_ordered"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -95,7 +95,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -103,7 +103,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_result_page_tow.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:layout_marginTop=
"@dimen/dp_24"
android:src=
"@mipmap/ic_successful"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_19"
...
...
@@ -35,7 +35,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_get_stamp_tip"
android:layout_width=
"@dimen/dp_235"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
android:visibility=
"gone"
android:text=
"获得邮票数:0枚,集齐一定数量即可 抵扣商品哦!"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_6"
...
...
@@ -64,7 +64,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -73,7 +73,7 @@
android:textStyle=
"bold"
android:text=
"@string/currently_ordered"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
@@ -95,7 +95,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
...
...
@@ -103,7 +103,7 @@
android:textColor=
"@color/font_A0A0A0"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_scan_result.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:layout_marginTop=
"@dimen/dp_108"
android:src=
"@mipmap/ic_home_scan_fail"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_23"
...
...
@@ -23,7 +23,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textSize=
"@dimen/sp_15"
...
...
@@ -31,7 +31,7 @@
android:textColor=
"@color/colorC1"
android:text=
"@string/two_dimensional_accessed"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_button_result"
android:layout_width=
"@dimen/dp_124"
android:layout_height=
"@dimen/dp_34"
...
...
app/src/main/res/layout/activity_search.xml
View file @
69fa5dd9
...
...
@@ -26,7 +26,7 @@
android:hint=
"@string/please_enter_the_name_merchant"
android:paddingLeft=
"@dimen/dp_10"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_search"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -38,7 +38,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"#E5E5E5"
/>
...
...
@@ -57,7 +57,7 @@
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/dp_15"
...
...
@@ -78,7 +78,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -87,7 +87,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_clean_history"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_select_coupon.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_un_user_coupon"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_50"
...
...
app/src/main/res/layout/activity_select_pay.xml
View file @
69fa5dd9
...
...
@@ -21,7 +21,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_alipay"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -32,7 +32,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -51,7 +51,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_alipay_copy"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -67,7 +67,7 @@
android:src=
"@mipmap/ic_home_wechat"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
app/src/main/res/layout/activity_setting.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -31,7 +31,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -45,7 +45,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -62,7 +62,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -76,7 +76,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -93,7 +93,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -107,7 +107,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -116,7 +116,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cache"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -134,7 +134,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -148,7 +148,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -165,7 +165,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -179,7 +179,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -196,7 +196,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -210,7 +210,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -227,7 +227,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -241,7 +241,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -258,7 +258,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
app/src/main/res/layout/activity_shop_detail.xml
View file @
69fa5dd9
...
...
@@ -31,7 +31,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
android:textSize=
"@dimen/sp_17"
tools:text=
"蔓越莓1盒125g12个装 单果重约150g~180g 新鲜水果xxx"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,13 +60,13 @@
android:layout_marginBottom=
"@dimen/dp_11"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"₩"
android:textColor=
"@color/font_FF3B30"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_unit_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -75,7 +75,7 @@
android:textColor=
"@color/font_FF3B30"
android:textSize=
"@dimen/sp_22"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -93,7 +93,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_goods_specs_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -102,7 +102,7 @@
android:textColor=
"@color/color66"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_goods_specs_content"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -132,12 +132,12 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_4"
android:layout_height=
"@dimen/dp_17"
android:background=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -155,7 +155,7 @@
android:src=
"@mipmap/ic_mall_details_open"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -178,12 +178,12 @@
android:background=
"@color/white"
android:gravity=
"center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_4"
android:layout_height=
"@dimen/dp_17"
android:background=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -214,12 +214,12 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_4"
android:layout_height=
"@dimen/dp_17"
android:background=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_12"
...
...
@@ -252,7 +252,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_button_collect"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -268,7 +268,7 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_button_shopping_cart"
android:layout_height=
"wrap_content"
android:layout_width=
"match_parent"
...
...
@@ -279,7 +279,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_count"
android:layout_width=
"@dimen/dp_12"
android:layout_height=
"@dimen/dp_12"
...
...
@@ -303,7 +303,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_17"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_detail_pay"
android:layout_width=
"@dimen/dp_115"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/activity_stamp.xml
View file @
69fa5dd9
...
...
@@ -16,14 +16,14 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/current_total_stamps"
android:textColor=
"@color/color14"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_stamp_total_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_sure_order.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:drawableLeft=
"@mipmap/ic_mall_address_add_to"
...
...
@@ -52,7 +52,7 @@
android:layout_marginTop=
"@dimen/dp_13"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -61,7 +61,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_phone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -75,7 +75,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_details"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -107,7 +107,7 @@
android:layout_marginLeft=
"@dimen/dp_14"
android:src=
"@mipmap/ic_mall_shop_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -118,7 +118,7 @@
android:textSize=
"@dimen/sp_13"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:background=
"@color/bg_E9E9E9"
/>
...
...
@@ -136,7 +136,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_21"
...
...
@@ -145,7 +145,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -164,7 +164,7 @@
android:layout_height=
"wrap_content"
android:background=
"@color/white"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -179,7 +179,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_21"
...
...
@@ -188,7 +188,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_goods_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -209,7 +209,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_21"
...
...
@@ -218,7 +218,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pay_away"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -248,7 +248,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_goods_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -257,7 +257,7 @@
android:textColor=
"@color/bg_4C4C4C"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -265,7 +265,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_goods_total_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -275,7 +275,7 @@
android:textColor=
"@color/btn_bg"
android:textSize=
"@dimen/sp_17"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pay"
android:layout_width=
"@dimen/dp_117"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/activity_system_message_details.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:paddingLeft=
"@dimen/dp_20"
android:paddingRight=
"@dimen/dp_20"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_message_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -23,7 +23,7 @@
android:layout_marginBottom=
"@dimen/dp_14"
android:layout_marginTop=
"@dimen/dp_24"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_message_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/activity_table_select.xml
View file @
69fa5dd9
...
...
@@ -18,7 +18,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_table"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
android:minWidth=
"@dimen/dp_120"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/adapter_layout_address_empty_data.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/pic_mall_address_no"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_25"
...
...
app/src/main/res/layout/adapter_layout_empty_data.xml
View file @
69fa5dd9
...
...
@@ -10,7 +10,7 @@
android:layout_height=
"100dp"
android:src=
"@mipmap/pic_my_home_no_order"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout/adapter_layout_empty_data_one.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_75"
android:src=
"@mipmap/ic_order_confirmation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_10"
...
...
app/src/main/res/layout/adapter_layout_empty_food_car.xml
View file @
69fa5dd9
...
...
@@ -10,7 +10,7 @@
android:layout_height=
"@dimen/dp_100"
android:src=
"@mipmap/ic_order_confirmation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout/adapter_layout_empty_order.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"130dp"
android:src=
"@mipmap/ic_order_confirmation_food"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout/adapter_layout_location_data.xml
View file @
69fa5dd9
...
...
@@ -10,7 +10,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/pic_home_unlocated"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_13"
...
...
@@ -18,7 +18,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_open_location"
android:layout_width=
"@dimen/dp_124"
android:layout_height=
"@dimen/dp_34"
...
...
app/src/main/res/layout/adapter_layout_merchant_empty.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/ic_order_confirmation"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/adapter_layout_personal_empty_data.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/pic_my_home_stamp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/adapter_layout_personal_empty_data_tow.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_marginTop=
"@dimen/dp_126"
android:src=
"@mipmap/pic_profiling_monochromatic"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_tip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/adapter_layout_search_empty.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/pic_mall_home_commodity_search_empty"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"#EECFCF"
...
...
app/src/main/res/layout/custom_info_window.xml
View file @
69fa5dd9
...
...
@@ -28,7 +28,7 @@
android:layout_marginTop=
"@dimen/dp_11"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/dp_19"
...
...
@@ -60,7 +60,7 @@
app:mImageWidth=
"@dimen/dp_15"
app:mMargin=
"@dimen/dp_5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/custom_tab_layout_text.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@android:id/text1"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/dialog_address.xml
View file @
69fa5dd9
...
...
@@ -9,7 +9,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"55dp"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -20,7 +20,7 @@
android:textColor=
"#4A4A4A"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_weight=
"1"
...
...
@@ -29,7 +29,7 @@
android:textColor=
"@color/color14"
android:textSize=
"18sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_finish"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/dialog_bottom_header.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"55dp"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -22,7 +22,7 @@
android:textColor=
"#4A4A4A"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/color14"
android:textSize=
"18sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_finish"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/dialog_bottom_list.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -31,7 +31,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_car_clean"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -83,7 +83,7 @@
android:textColor=
"@color/font_A4A4A4"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -105,7 +105,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
app/src/main/res/layout/dialog_common.xml
View file @
69fa5dd9
...
...
@@ -21,7 +21,7 @@
android:orientation=
"vertical"
android:visibility=
"visible"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -30,7 +30,7 @@
android:visibility=
"visible"
tools:text=
"标题"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_des"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_subtitle"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -72,7 +72,7 @@
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/bt_negative"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -90,7 +90,7 @@
android:layout_height=
"match_parent"
android:background=
"#FFE5E5E5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/bt_positive"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/dialog_home_filter.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:background=
"@color/white"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -79,7 +79,7 @@
</RelativeLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_pack_up"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -94,7 +94,7 @@
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_title_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -112,7 +112,7 @@
android:layout_marginBottom=
"@dimen/dp_13"
app:max_select=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_title_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -136,7 +136,7 @@
android:layout_marginTop=
"@dimen/dp_40"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_add_car"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/dp_50"
...
...
@@ -147,7 +147,7 @@
android:textColor=
"@color/bg_7B7B7F"
android:textSize=
"@dimen/sp_17"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_pay"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/dp_50"
...
...
app/src/main/res/layout/dialog_input_remark.xml
View file @
69fa5dd9
...
...
@@ -18,7 +18,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_50"
android:background=
"@drawable/bg_dialog_layout"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/Input_notes"
...
...
@@ -61,7 +61,7 @@
android:maxLength=
"100"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/dialog_item_bottom_select.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_gravity=
"bottom"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -22,13 +22,13 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginBottom=
"@dimen/dp_20"
android:background=
"@color/colorE5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_korean"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_chinese"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/dialog_item_call.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_39"
...
...
@@ -23,7 +23,7 @@
android:textColor=
"@color/font_B8B4B4"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_phone"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_19"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"@color/colorE5"
/>
...
...
@@ -42,7 +42,7 @@
android:layout_height=
"@dimen/dp_50"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
@@ -52,12 +52,12 @@
android:textColor=
"@color/black"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dimen_1_dp"
android:layout_height=
"match_parent"
android:background=
"@color/colorE5"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_call"
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/dialog_item_contact.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/dp_12"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/Plechoose_customer_service"
...
...
@@ -36,7 +36,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginTop=
"@dimen/dp_13"
...
...
app/src/main/res/layout/dialog_item_list.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:background=
"@drawable/bg_shop_item"
android:paddingBottom=
"@dimen/dp_22"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_dialog_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf=
"@id/tv_dialog_title"
app:layout_constraintBottom_toBottomOf=
"@id/tv_dialog_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_line"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
...
...
app/src/main/res/layout/dialog_item_list_take_number.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:background=
"@drawable/bg_shop_item"
android:paddingBottom=
"@dimen/dp_22"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_dialog_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -28,7 +28,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/tv_dialog_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_line"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
...
...
app/src/main/res/layout/dialog_layout_logistics.xml
View file @
69fa5dd9
...
...
@@ -32,7 +32,7 @@
app:layout_constraintTop_toTopOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_30"
...
...
@@ -41,7 +41,7 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/dp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_company"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -51,7 +51,7 @@
android:textColor=
"@color/color4A"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_30"
...
...
@@ -59,7 +59,7 @@
android:layout_marginRight=
"@dimen/dp_30"
android:background=
"#CFCFCF"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_30"
...
...
@@ -68,7 +68,7 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/dp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_id"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -79,7 +79,7 @@
android:textColor=
"@color/color4A"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_30"
...
...
@@ -87,7 +87,7 @@
android:layout_marginRight=
"@dimen/dp_30"
android:background=
"#CFCFCF"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_30"
...
...
@@ -96,7 +96,7 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/dp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_query"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/dialog_mall_details.xml
View file @
69fa5dd9
...
...
@@ -45,14 +45,14 @@
app:layout_constraintLeft_toRightOf=
"@id/iv_mall_picture"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"₩"
android:textColor=
"@color/font_FF3B30"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_popup_price_unit_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:textColor=
"@color/font_FF3B30"
android:textSize=
"@dimen/sp_22"
/>
<!-- <TextView
<!-- <
cn.dankal.basiclib.widget.NewFont
TextView
android:id="@+id/tv_popup_price_original_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
...
...
@@ -69,7 +69,7 @@
android:textSize="@dimen/sp_14" />-->
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_popup_price_unit_repertory"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -81,7 +81,7 @@
app:layout_constraintLeft_toRightOf=
"@id/iv_mall_picture"
app:layout_constraintTop_toBottomOf=
"@id/ll_mall_price"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_line"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
...
...
@@ -93,7 +93,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/iv_mall_picture"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_title_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -121,7 +121,7 @@
android:gravity=
"center_vertical"
app:layout_constraintTop_toBottomOf=
"@id/fl_tag_one"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -155,7 +155,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_number"
android:layout_width=
"@dimen/dp_45"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -186,7 +186,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_add_car"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/dp_50"
...
...
@@ -201,7 +201,7 @@
app:layout_constraintRight_toLeftOf=
"@id/tv_mall_pay"
app:layout_constraintTop_toBottomOf=
"@id/ll_mall_layout"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_mall_pay"
android:layout_width=
"0dp"
android:layout_height=
"@dimen/dp_50"
...
...
app/src/main/res/layout/dialog_replace_table.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_table"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -35,7 +35,7 @@
android:background=
"@drawable/bg_layout_table"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/dialog_select_format_tow.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_marginRight=
"@dimen/dp_27"
android:background=
"@drawable/bg_pw_select"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_format"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -124,7 +124,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:src=
"@mipmap/ic_home_mall_order_reduce"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/dialog_time.xml
View file @
69fa5dd9
...
...
@@ -8,7 +8,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"55dp"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -19,7 +19,7 @@
android:textColor=
"#4A4A4A"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"match_parent"
android:layout_weight=
"1"
...
...
@@ -28,7 +28,7 @@
android:textColor=
"@color/color14"
android:textSize=
"18sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_finish"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/dialog_tips.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -23,7 +23,7 @@
android:textSize=
"18sp"
tools:text=
"银行卡添加失败\n请填写正确信息"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_send"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
...
...
app/src/main/res/layout/fragment_car.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/shopping_cart"
...
...
@@ -20,7 +20,7 @@
android:textSize=
"@dimen/sp_18"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"@color/bg_fff5f5f5"
/>
...
...
@@ -31,7 +31,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_car_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -41,7 +41,7 @@
android:layout_marginLeft=
"@dimen/dp_10"
tools:text=
"共计0件商品"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_car_delete"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -55,7 +55,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"@color/bg_fff5f5f5"
/>
...
...
@@ -80,7 +80,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_23"
...
...
@@ -88,7 +88,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_car_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/fragment_coupon_tow_type.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_50"
android:background=
"@color/white"
...
...
app/src/main/res/layout/fragment_coupon_type.xml
View file @
69fa5dd9
...
...
@@ -23,7 +23,7 @@
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_un_user"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_50"
...
...
app/src/main/res/layout/fragment_details_info.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:visibility=
"gone"
android:src=
"@mipmap/ic_home_details_location_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_merchant_address"
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
android:textColor=
"@color/color14"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_1"
android:layout_height=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_4"
...
...
@@ -55,7 +55,7 @@
android:src=
"@mipmap/ic_home_details_tel"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
app/src/main/res/layout/fragment_details_shop.xml
View file @
69fa5dd9
...
...
@@ -68,7 +68,7 @@
android:textColor=
"@color/font_A4A4A4"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_button"
android:layout_width=
"@dimen/dp_134"
android:layout_height=
"@dimen/dp_55"
...
...
@@ -91,7 +91,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_bottom_shop_count"
android:layout_width=
"@dimen/dp_20"
android:layout_height=
"@dimen/dp_20"
...
...
@@ -117,7 +117,7 @@
android:textSize=
"@dimen/sp_20"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_tip"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_44"
...
...
app/src/main/res/layout/fragment_home.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:orientation=
"vertical"
tools:context=
"cn.dankal.client.ui.home.HomeFragment"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
app/src/main/res/layout/fragment_menu_item.xml
View file @
69fa5dd9
...
...
@@ -26,7 +26,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_recommend"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_3"
...
...
@@ -36,7 +36,7 @@
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_more"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_placeholder"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_3"
...
...
@@ -77,7 +77,7 @@
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_filter"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/fragment_personal.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_personal_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
app:layout_constraintLeft_toRightOf=
"@id/iv_personal_head"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_personal_info"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -78,7 +78,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_my_home_stamp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_16"
...
...
@@ -86,7 +86,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_stamp_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -119,7 +119,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_my_home_order"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
@@ -151,7 +151,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_personal_aftersale"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
@@ -182,7 +182,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_my_home_food_products"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
@@ -213,7 +213,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_personal_coupon"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
@@ -245,7 +245,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_my_home_line_up"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
@@ -276,7 +276,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_my_news_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
@@ -308,7 +308,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_my_collection_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_weight=
"1"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/fragment_shop.xml
View file @
69fa5dd9
...
...
@@ -7,7 +7,7 @@
android:orientation=
"vertical"
tools:context=
"cn.dankal.client.ui.shop.ShopFragment"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state_bar"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -29,7 +29,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<!-- <TextView
<!-- <
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="modoo order"
...
...
app/src/main/res/layout/gv_filter_image.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
app:layout_constraintRight_toRightOf=
"parent"
android:src=
"@mipmap/ic_evaluation_increase_s"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -55,7 +55,7 @@
android:src=
"@mipmap/ic_mall_order_comment_close"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_duration"
android:layout_width=
"80dp"
android:layout_height=
"30dp"
...
...
app/src/main/res/layout/item_address_manager.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:layout_marginTop=
"@dimen/dp_13"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_default"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
android:textColor=
"@color/btn_bg"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -46,7 +46,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_phone"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_address_info"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -73,7 +73,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_14"
...
...
@@ -91,7 +91,7 @@
android:background=
"@color/white"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_right_default"
android:layout_width=
"@dimen/dp_87"
android:layout_height=
"match_parent"
...
...
@@ -101,7 +101,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_right_edit"
android:layout_width=
"68dp"
android:layout_height=
"match_parent"
...
...
@@ -111,7 +111,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_right_delete"
android:layout_width=
"@dimen/dp_68"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/item_autocompletetv_simple_dropdown.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
android:id=
"@+id/text1"
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/text1"
style=
"?android:attr/dropDownItemStyle"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/item_car_child_shop.xml
View file @
69fa5dd9
...
...
@@ -42,7 +42,7 @@
android:layout_marginBottom=
"@dimen/dp_12"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_name"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -50,7 +50,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -65,7 +65,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_car_shop_perice"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -95,7 +95,7 @@
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_number"
android:layout_width=
"@dimen/dp_45"
android:layout_height=
"@dimen/dp_25"
...
...
@@ -135,7 +135,7 @@
android:background=
"@color/white"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_right_delete"
android:layout_width=
"@dimen/dp_70"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/item_car_shop.xml
View file @
69fa5dd9
...
...
@@ -16,7 +16,7 @@
android:gravity=
"center"
android:text=
"拼夕夕旗舰店"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:background=
"@color/bg_fff5f5f5"
/>
...
...
@@ -36,7 +36,7 @@
</RelativeLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_10"
android:background=
"@color/bg_fff5f5f5"
/>
...
...
app/src/main/res/layout/item_comment_type.xml
View file @
69fa5dd9
...
...
@@ -9,7 +9,7 @@
android:layout_marginTop=
"@dimen/dp_9"
android:background=
"@color/bg_FAD0D0"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_type_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_coupon.xml
View file @
69fa5dd9
...
...
@@ -8,7 +8,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:background=
"@mipmap/pic_home_order_coupon_1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_title"
android:layout_width=
"@dimen/dp_180"
android:layout_height=
"wrap_content"
...
...
@@ -20,7 +20,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -58,7 +58,7 @@
app:autoSizeTextType=
"uniform"
/>
</android.support.constraint.ConstraintLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_user"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_dialog_format.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/space_16_dp"
...
...
@@ -12,4 +12,4 @@
android:text=
"加载中"
android:textColor=
"@drawable/label_text_selector"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout/item_dialog_format_tow.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/space_16_dp"
...
...
@@ -12,4 +12,4 @@
android:text=
"加载中"
android:textColor=
"@drawable/label_text_selector_mall"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout/item_dialog_select.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"@dimen/dp_80"
android:layout_height=
"@dimen/dp_36"
android:layout_marginRight=
"@dimen/space_12_dp"
...
...
@@ -10,4 +10,4 @@
android:textColor=
"@drawable/label_text_selector"
android:textSize=
"@dimen/sp_14"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout/item_evaluate_food.xml
View file @
69fa5dd9
...
...
@@ -21,7 +21,7 @@
android:layout_weight=
"1"
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -41,7 +41,7 @@
app:mMargin=
"@dimen/dp_3"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -52,7 +52,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -66,7 +66,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_margin=
"@dimen/dp_15"
...
...
app/src/main/res/layout/item_evaluation_child.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"@id/iv_evaluation_img"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/score"
...
...
@@ -68,7 +68,7 @@
android:maxLength=
"500"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -77,7 +77,7 @@
android:text=
"0/500"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tag_paint"
android:layout_width=
"wrap_content"
android:layout_height=
"17dp"
...
...
app/src/main/res/layout/item_food_list.xml
View file @
69fa5dd9
...
...
@@ -34,7 +34,7 @@
android:layout_marginTop=
"@dimen/dp_17"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -54,7 +54,7 @@
android:textSize=
"@dimen/sp_14"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -64,7 +64,7 @@
android:textColor=
"@color/color4A"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_9"
...
...
@@ -79,7 +79,7 @@
android:layout_marginBottom=
"@dimen/dp_15"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -88,7 +88,7 @@
android:textColor=
"@color/font_A4A4A4"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"@dimen/dp_13"
...
...
@@ -96,7 +96,7 @@
android:textColor=
"@color/color4A"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_order_food_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_footer_leave_message.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
android:gravity=
"bottom"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:background=
"@color/bg_fff6f7f8"
/>
...
...
@@ -20,7 +20,7 @@
android:paddingRight=
"@dimen/dp_16"
android:paddingBottom=
"@dimen/dp_12"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
...
...
@@ -29,7 +29,7 @@
android:textColor=
"@color/colorC1"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_commit"
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:maxLength=
"200"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_text_size"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_have_stamp.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
android:background=
"@color/white"
android:gravity=
"center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_stamp_store_name"
android:layout_width=
"0dp"
android:layout_weight=
"2"
...
...
@@ -27,7 +27,7 @@
android:layout_marginLeft=
"@dimen/dp_8"
android:text=
"汉拿山烤肉餐厅店"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_stamp_count"
android:layout_width=
"@dimen/dp_0"
android:layout_weight=
"1"
...
...
app/src/main/res/layout/item_home_bottom.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
android:layout_marginLeft=
"@dimen/dp_15"
android:src=
"@mipmap/ic_home_nearby"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_3"
...
...
@@ -27,7 +27,7 @@
android:textSize=
"@dimen/sp_18"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_filter"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/item_home_bottom_item.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_bottom_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
app:mIsClick=
"false"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_bottom_distance"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -57,7 +57,7 @@
android:textSize=
"@dimen/sp_11"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginTop=
"@dimen/dp_6"
...
...
@@ -82,7 +82,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_home_line_up"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right|center_vertical"
...
...
@@ -92,7 +92,7 @@
</FrameLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_queue"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -101,7 +101,7 @@
android:textColor=
"@color/font_gray"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_home_bottom_queue"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_layout_after.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -25,7 +25,7 @@
android:textColor=
"@color/font_646464"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_state"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -34,7 +34,7 @@
android:textSize=
"@dimen/sp_13"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_15"
...
...
@@ -67,7 +67,7 @@
android:layout_weight=
"1"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_name"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
...
...
@@ -78,7 +78,7 @@
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -96,7 +96,7 @@
android:layout_marginBottom=
"@dimen/dp_12"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_unit_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -105,7 +105,7 @@
android:textSize=
"@dimen/sp_14"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_original_price"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -115,7 +115,7 @@
android:textColor=
"@color/colorCF"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_number"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/item_layout_auxiliary.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_spicy"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_layout_tip_cancel.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:layout_height=
"wrap_content"
android:src=
"@mipmap/ic_mall_order_after_withdraw_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/white"
...
...
app/src/main/res/layout/item_leave_message.xml
View file @
69fa5dd9
...
...
@@ -29,7 +29,7 @@
android:layout_marginTop=
"@dimen/dp_10"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
android:textColor=
"@color/color66"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
android:textSize=
"@dimen/sp_12"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -72,7 +72,7 @@
android:layout_marginBottom=
"@dimen/dp_20"
android:overScrollMode=
"never"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_8"
android:background=
"@color/bg_fff6f7f8"
/>
...
...
app/src/main/res/layout/item_logistics.xml
View file @
69fa5dd9
...
...
@@ -11,7 +11,7 @@
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/dp_18"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_line"
android:layout_width=
"@dimen/dimen_1_dp"
android:layout_height=
"match_parent"
...
...
@@ -32,7 +32,7 @@
android:layout_marginBottom=
"@dimen/dp_37"
android:layout_marginLeft=
"@dimen/dp_10"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_logistics_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_logistics_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_mall_details.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -31,7 +31,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_description"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
android:textColor=
"@color/font_gray_tow"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_price"
android:layout_width=
"wrap_content"
android:layout_height=
"0dp"
...
...
app/src/main/res/layout/item_mall_evaluation.xml
View file @
69fa5dd9
...
...
@@ -19,7 +19,7 @@
android:layout_height=
"@dimen/dp_30"
android:src=
"@mipmap/pic_mall_details_head_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
app:mImageWidth=
"@dimen/dp_13"
app:mMargin=
"@dimen/dp_3"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -51,7 +51,7 @@
android:textSize=
"@dimen/sp_12"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_description"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:textColor=
"@color/color99"
android:textSize=
"@dimen/sp_11"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_mall_evaluation_shop.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
android:orientation=
"vertical"
android:gravity=
"center_vertical"
android:layout_height=
"match_parent"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -45,7 +45,7 @@
app:mMargin=
"@dimen/dp_3"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -56,7 +56,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_comment_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_mall_order.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -27,7 +27,7 @@
android:textColor=
"@color/font_646464"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_status"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -42,7 +42,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_margin=
"@dimen/dp_10"
...
...
@@ -54,7 +54,7 @@
android:layout_marginBottom=
"@dimen/dp_14"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -63,7 +63,7 @@
android:textColor=
"@color/color66"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -72,7 +72,7 @@
android:textColor=
"@color/btn_bg"
android:textSize=
"@dimen/sp_17"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_order_cancel"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -83,7 +83,7 @@
android:visibility=
"gone"
android:textColor=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_order_pay"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -95,7 +95,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_order_sure"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
@@ -107,7 +107,7 @@
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_store_evaluate"
android:layout_width=
"@dimen/dp_76"
android:layout_height=
"@dimen/dp_30"
...
...
app/src/main/res/layout/item_mall_order_details_layout.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -37,7 +37,7 @@
android:textSize=
"@dimen/sp_13"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_unit_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -65,7 +65,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_specs"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -75,7 +75,7 @@
android:textColor=
"@color/colorCF"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_number"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -85,7 +85,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_apply_after_sale"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_mall_order_layout.xml
View file @
69fa5dd9
...
...
@@ -23,7 +23,7 @@
android:layout_marginBottom=
"@dimen/dp_12"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_name"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -33,7 +33,7 @@
android:textStyle=
"bold"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,14 +48,14 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"₩"
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_11"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_unit_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -64,7 +64,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_original_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -74,7 +74,7 @@
android:textColor=
"@color/colorCF"
android:textSize=
"@dimen/sp_12"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_item_number"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_mall_search_result.xml
View file @
69fa5dd9
...
...
@@ -25,7 +25,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -36,7 +36,7 @@
android:textSize=
"@dimen/sp_15"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_sale"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColor=
"@color/font_gray_three"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_city"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_menu_child.xml
View file @
69fa5dd9
...
...
@@ -23,7 +23,7 @@
</android.support.v7.widget.CardView>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_menu_text"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -36,7 +36,7 @@
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_menu_distance"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_merchant.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_sale"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -47,7 +47,7 @@
android:textColor=
"@color/font_gray_three"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_distance"
android:layout_width=
"0dp"
android:layout_weight=
"1"
...
...
@@ -58,7 +58,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_recommend_address"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_message_reply.xml
View file @
69fa5dd9
...
...
@@ -3,14 +3,14 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_reply_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/merchant_reply"
android:textColor=
"@color/bg_4184F7"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_reply_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_my_collect.xml
View file @
69fa5dd9
...
...
@@ -35,7 +35,7 @@
</FrameLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -44,7 +44,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -60,7 +60,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -70,7 +70,7 @@
android:textColor=
"@color/font_orange"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_price_original"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -80,7 +80,7 @@
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_collect_sales"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_my_queue.xml
View file @
69fa5dd9
...
...
@@ -15,7 +15,7 @@
android:layout_marginBottom=
"@dimen/dp_1"
android:layout_marginRight=
"@dimen/dp_10"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -27,7 +27,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number_tow"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -50,7 +50,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_number"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -62,7 +62,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_number_tow"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_waiting"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -74,7 +74,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_waiting_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -85,7 +85,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_waiting"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_minute"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -97,7 +97,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_minute_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -107,7 +107,7 @@
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@id/tv_queue_minute"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_minute_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_my_queue_tow.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:elevation=
"@dimen/dp_1"
android:layout_marginBottom=
"@dimen/dp_1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -26,7 +26,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_number_tow"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
app:layout_constraintLeft_toRightOf=
"@id/tv_queue_number"
app:layout_constraintTop_toBottomOf=
"@id/tv_queue_title"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_table_specs"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_order_child.xml
View file @
69fa5dd9
...
...
@@ -31,7 +31,7 @@
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:gravity=
"right"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -67,7 +67,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -79,7 +79,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dimen_1_dp"
android:layout_marginLeft=
"@dimen/dp_18"
...
...
app/src/main/res/layout/item_question_list.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_17"
...
...
@@ -20,7 +20,7 @@
android:textColor=
"@color/color33"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_queue_title"
android:layout_width=
"@dimen/dp_0"
android:layout_height=
"wrap_content"
...
...
@@ -38,7 +38,7 @@
android:src=
"@mipmap/ic_my_home_problem_open_3"
/>
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_1"
android:layout_marginLeft=
"@dimen/dp_16"
...
...
app/src/main/res/layout/item_queue.xml
View file @
69fa5dd9
...
...
@@ -19,12 +19,12 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"@dimen/dp_3"
android:layout_height=
"@dimen/dp_13"
android:background=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tables_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -34,7 +34,7 @@
android:textSize=
"@dimen/sp_16"
android:textStyle=
"bold"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_number_min_max"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -43,7 +43,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_time"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -52,7 +52,7 @@
android:text=
"约30分钟"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_front"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_search_hot.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/space_10_dp"
...
...
@@ -12,4 +12,4 @@
android:textColor=
"@color/font_tow"
android:text=
"加载中"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout/item_search_string.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/tv_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -10,4 +10,4 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_14"
>
</TextView>
\ No newline at end of file
</cn.dankal.basiclib.widget.NewFontTextView>
\ No newline at end of file
app/src/main/res/layout/item_shop.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
android:layout_marginBottom=
"@dimen/dp_17"
android:src=
"@mipmap/pic_mall_home_classify_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/iv_item_shop_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -32,7 +32,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_description"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_current_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:textColor=
"@color/font_orange"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -76,7 +76,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_current_sales"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_shop_bottom_list.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_name"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -23,7 +23,7 @@
android:textSize=
"@dimen/font_18_sp"
android:text=
"水果蛋糕1个"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -49,7 +49,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:src=
"@mipmap/ic_home_mall_order_reduce"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_count"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -66,7 +66,7 @@
</android.support.v7.widget.LinearLayoutCompat>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_show_spec"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_shop_details.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:layout_marginRight=
"@dimen/dp_15"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -34,7 +34,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_15"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_shop_content_sales"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -58,7 +58,7 @@
android:textColor=
"@color/font_orange"
android:textSize=
"@dimen/sp_20"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_select_format"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_shop_head_layout.xml
View file @
69fa5dd9
...
...
@@ -26,7 +26,7 @@
android:layout_marginLeft=
"@dimen/dp_13"
android:layout_weight=
"1"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/dp_16"
...
...
@@ -35,7 +35,7 @@
android:textColor=
"@color/bg_FAD0D0"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/merchandise_recommendation"
...
...
@@ -46,7 +46,7 @@
</RelativeLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_more"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_shop_tow.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:layout_marginBottom=
"@dimen/dp_17"
android:src=
"@mipmap/pic_mall_home_classify_1"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/iv_item_shop_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -34,7 +34,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_14"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_shop_description"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -51,7 +51,7 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_current_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -61,7 +61,7 @@
android:textColor=
"@color/font_orange"
android:textSize=
"@dimen/sp_18"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_original_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -78,7 +78,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_current_sales"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_shop_type_title.xml
View file @
69fa5dd9
...
...
@@ -6,13 +6,13 @@
android:background=
"@color/white"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_item_title_tag"
android:layout_width=
"@dimen/dp_4"
android:layout_height=
"match_parent"
android:background=
"@color/color_fbbc39"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_menu_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_sure_order.xml
View file @
69fa5dd9
...
...
@@ -24,7 +24,7 @@
android:layout_marginBottom=
"@dimen/dp_12"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sure_order_name"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -33,7 +33,7 @@
android:textColor=
"@color/font_tow"
android:textSize=
"@dimen/sp_13"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sure_order_goods_desc"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,14 +48,14 @@
android:gravity=
"bottom"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sure_order_goods_price"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:textColor=
"@color/btn_bg"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sure_order_goods_count"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_system_message.xml
View file @
69fa5dd9
...
...
@@ -17,13 +17,13 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tip_point"
android:layout_width=
"@dimen/dp_7"
android:layout_height=
"@dimen/dp_7"
android:background=
"@drawable/shop_red_point"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_message_title"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -33,7 +33,7 @@
android:textColor=
"@color/font_313131"
android:textSize=
"@dimen/sp_16"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_message_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -41,7 +41,7 @@
android:text=
"11-26"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_message_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/item_unuser_coupon.xml
View file @
69fa5dd9
...
...
@@ -8,7 +8,7 @@
android:layout_marginRight=
"@dimen/dp_10"
android:background=
"@mipmap/pic_home_order_coupon_2"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_title"
android:layout_width=
"@dimen/dp_180"
android:layout_height=
"wrap_content"
...
...
@@ -20,7 +20,7 @@
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_coupon_time"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/itme_home_four.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_marginBottom=
"@dimen/dp_3"
android:src=
"@drawable/ic_person_select"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@drawable/select_text_home"
...
...
app/src/main/res/layout/itme_home_one.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:layout_marginBottom=
"@dimen/dp_3"
android:src=
"@drawable/ic_home_select"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tab_text"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/itme_home_three.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_marginBottom=
"@dimen/dp_3"
android:src=
"@drawable/ic_car_select"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@drawable/select_text_home"
...
...
app/src/main/res/layout/itme_home_tow.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_marginBottom=
"@dimen/dp_3"
android:src=
"@drawable/ic_shop_select"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@drawable/select_text_home"
...
...
app/src/main/res/layout/layout_classic_footer.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:layout_toLeftOf=
"@+id/tvLoadMore"
android:background=
"@mipmap/qq_refresh_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tvLoadMore"
android:layout_width=
"150dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/layout_classic_header.xml
View file @
69fa5dd9
...
...
@@ -27,7 +27,7 @@
android:layout_toLeftOf=
"@+id/tvLoadMore"
android:background=
"@mipmap/qq_refresh_success"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tvRefresh"
android:layout_width=
"150dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/layout_empty.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_height=
"114dp"
android:src=
"@mipmap/pic_2_holder"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
...
...
app/src/main/res/layout/layout_error.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_height=
"114dp"
android:src=
"@mipmap/pic_404_holder"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
...
...
app/src/main/res/layout/layout_gender.xml
View file @
69fa5dd9
...
...
@@ -5,7 +5,7 @@ android:layout_width="match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/colorFF"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_boy"
android:layout_width=
"match_parent"
android:layout_height=
"75dp"
...
...
@@ -16,7 +16,7 @@ android:background="@color/colorFF">
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_girl"
android:layout_width=
"match_parent"
android:layout_height=
"75dp"
...
...
app/src/main/res/layout/layout_loading.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_height=
"114dp"
android:src=
"@mipmap/pic_1_holder"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
...
...
app/src/main/res/layout/layout_retry.xml
View file @
69fa5dd9
...
...
@@ -12,7 +12,7 @@
android:layout_height=
"114dp"
android:src=
"@mipmap/pic_404_holder"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
...
...
app/src/main/res/layout/layout_single_text_title.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
android:src=
"@mipmap/ic_back_black"
tools:ignore=
"ContentDescription"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"49dp"
...
...
app/src/main/res/layout/layout_single_text_title_transparent.xml
View file @
69fa5dd9
...
...
@@ -18,7 +18,7 @@
android:src=
"@mipmap/ic_back_white"
tools:ignore=
"ContentDescription"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_height=
"49dp"
...
...
app/src/main/res/layout/layout_tab_bottom.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:gravity=
"center"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tab_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/layout_tab_left.xml
View file @
69fa5dd9
...
...
@@ -19,7 +19,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tab_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/layout_tab_right.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tab_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/layout_tab_segment.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:gravity=
"center"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tab_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/layout_tab_top.xml
View file @
69fa5dd9
...
...
@@ -19,7 +19,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_tab_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/picture_activity_external_preview.xml
View file @
69fa5dd9
...
...
@@ -21,7 +21,7 @@
android:src=
"?attr/picture.preview.leftBack.icon"
android:visibility=
"visible"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/picture_album_folder_item.xml
View file @
69fa5dd9
...
...
@@ -17,7 +17,7 @@
android:layout_width=
"50dp"
android:layout_height=
"50dp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_sign"
android:layout_width=
"12dp"
android:layout_height=
"12dp"
...
...
@@ -28,7 +28,7 @@
</RelativeLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_folder_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -39,7 +39,7 @@
android:textColor=
"@color/color_4d"
android:textSize=
"16sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/image_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/picture_audio_dialog.xml
View file @
69fa5dd9
...
...
@@ -16,7 +16,7 @@
android:paddingBottom=
"15dp"
android:paddingTop=
"15dp"
>
<!--显示歌曲状态-->
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_musicStatus"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -32,7 +32,7 @@
android:gravity=
"center_horizontal|center_vertical"
>
<!--显示当前进度-->
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_musicTime"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -59,7 +59,7 @@
android:thumbOffset=
"0dp"
/>
<!--显示总进度-->
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_musicTotal"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -78,7 +78,7 @@
android:gravity=
"center_horizontal"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_PlayPause"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -90,7 +90,7 @@
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_Stop"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -102,7 +102,7 @@
android:textColor=
"@color/white"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_Quit"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/picture_camera_pop_layout.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:background=
"@color/color_fa"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_tv_photo"
android:layout_width=
"match_parent"
android:layout_height=
"45dp"
...
...
@@ -23,12 +23,12 @@
android:textColor=
"@color/color_53"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/line_color"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_tv_video"
android:layout_width=
"match_parent"
android:layout_height=
"45dp"
...
...
@@ -38,18 +38,18 @@
android:textColor=
"@color/color_53"
android:textSize=
"14sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/line_color"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:layout_marginTop=
"6dp"
android:background=
"@color/line_color"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_tv_cancel"
android:layout_width=
"match_parent"
android:layout_height=
"45dp"
...
...
app/src/main/res/layout/picture_image_grid_item.xml
View file @
69fa5dd9
...
...
@@ -19,7 +19,7 @@
android:orientation=
"vertical"
android:padding=
"8dp"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/check"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -29,7 +29,7 @@
android:textSize=
"12sp"
/>
</LinearLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_isGif"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -41,7 +41,7 @@
android:textSize=
"11sp"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_long_chart"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -53,7 +53,7 @@
android:textSize=
"11sp"
android:visibility=
"gone"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_duration"
android:layout_width=
"match_parent"
android:layout_height=
"30dp"
...
...
app/src/main/res/layout/picture_item_camera.xml
View file @
69fa5dd9
...
...
@@ -13,7 +13,7 @@
android:layout_centerHorizontal=
"true"
android:src=
"@drawable/ic_camera"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title_camera"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/picture_preview.xml
View file @
69fa5dd9
...
...
@@ -20,7 +20,7 @@
android:padding=
"15dp"
android:src=
"?attr/picture.preview.leftBack.icon"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -41,7 +41,7 @@
android:paddingLeft=
"16dp"
android:paddingRight=
"16dp"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/check"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -75,7 +75,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_img_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -87,7 +87,7 @@
android:textSize=
"12sp"
android:visibility=
"invisible"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_ok"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/picture_selector.xml
View file @
69fa5dd9
...
...
@@ -22,7 +22,7 @@
android:background=
"?attr/picture.bottom.bg"
android:gravity=
"center_vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_id_preview"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -44,7 +44,7 @@
android:gravity=
"center_vertical"
android:orientation=
"horizontal"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_tv_img_num"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -56,7 +56,7 @@
android:textSize=
"12sp"
android:visibility=
"invisible"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_tv_ok"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -79,7 +79,7 @@
android:layout_marginLeft=
"2dp"
android:layout_marginRight=
"2dp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_empty"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/picture_title_bar.xml
View file @
69fa5dd9
...
...
@@ -20,7 +20,7 @@
android:padding=
"15dp"
android:src=
"?attr/picture.leftBack.icon"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -35,7 +35,7 @@
android:textColor=
"?picture.title.textColor"
android:textSize=
"17sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/picture_right"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
...
...
@@ -48,7 +48,7 @@
android:textSize=
"14sp"
/>
</RelativeLayout>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:background=
"@color/line_color"
/>
...
...
app/src/main/res/layout/picture_wind_base_dialog_xml.xml
View file @
69fa5dd9
...
...
@@ -9,7 +9,7 @@
android:background=
"@drawable/dialog_shadow"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_title"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
...
...
@@ -19,7 +19,7 @@
android:textColor=
"#ff572e"
android:textSize=
"16sp"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"0.5dp"
android:layout_marginLeft=
"15dp"
...
...
@@ -33,7 +33,7 @@
android:gravity=
"center_vertical"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/tv_content"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
...
...
@@ -53,7 +53,7 @@
android:gravity=
"bottom"
android:orientation=
"vertical"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"match_parent"
android:layout_height=
"1dip"
android:background=
"@color/line_color"
/>
...
...
@@ -72,7 +72,7 @@
android:text=
"@string/picture_cancel"
android:textColor=
"#529BeA"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:layout_width=
"1dip"
android:layout_height=
"match_parent"
android:background=
"@color/line_color"
/>
...
...
app/src/main/res/layout/srl_classics_footer.xml
View file @
69fa5dd9
...
...
@@ -33,7 +33,7 @@
tools:tint=
"#666"
tools:src=
"@android:drawable/stat_notify_sync"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/srl_classics_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/srl_classics_header.xml
View file @
69fa5dd9
...
...
@@ -40,7 +40,7 @@
android:orientation=
"vertical"
android:gravity=
"center_horizontal"
android:layout_centerInParent=
"true"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/srl_classics_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -48,7 +48,7 @@
android:textColor=
"#666666"
android:textSize=
"15sp"
android:text=
"@string/srl_header_pulling"
/>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/srl_classics_update"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/textview.xml
View file @
69fa5dd9
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
cn.dankal.basiclib.widget.NewFont
TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
style=
"@style/GridPasswordView.TextView"
/>
\ No newline at end of file
app/src/main/res/layout/ucrop_activity_photobox.xml
View file @
69fa5dd9
...
...
@@ -10,7 +10,7 @@
android:background=
"@color/ucrop_color_toolbar"
android:minHeight=
"?attr/actionBarSize"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/toolbar_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/ucrop_layout_rotate_wheel.xml
View file @
69fa5dd9
...
...
@@ -7,7 +7,7 @@
tools:showIn=
"@layout/ucrop_activity_photobox"
tools:visibility=
"visible"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/text_view_rotate"
style=
"@style/ucrop_TextViewWidgetText"
android:text=
"100°"
/>
...
...
app/src/main/res/layout/ucrop_layout_scale_wheel.xml
View file @
69fa5dd9
...
...
@@ -6,7 +6,7 @@
tools:showIn=
"@layout/ucrop_activity_photobox"
tools:visibility=
"gone"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/text_view_scale"
style=
"@style/ucrop_TextViewWidgetText"
android:text=
"100%"
/>
...
...
app/src/main/res/layout/ucrop_picture_activity_multi_cutting.xml
View file @
69fa5dd9
...
...
@@ -14,7 +14,7 @@
android:background=
"@color/ucrop_color_toolbar"
android:minHeight=
"?attr/actionBarSize"
>
<TextView
<
cn.dankal.basiclib.widget.NewFont
TextView
android:id=
"@+id/toolbar_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/values/styles.xml
View file @
69fa5dd9
...
...
@@ -306,6 +306,7 @@
<item
name=
"android:textAllCaps"
>
false
</item>
<item
name=
"windowNoTitle"
>
true
</item>
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"android:typeface"
>
monospace
</item>
<item
name=
"android:windowBackground"
>
@color/colorFF
</item>
</style>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment