From cdbb543d01ebfc19f865b469ad54fbfc007d39ff Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Fri, 11 Oct 2024 15:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E5=88=86=E8=BE=A8=E7=8E=87?= =?UTF-8?q?=E7=9A=84=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../survey/ui/approval/ApprovalActivity.kt | 4 +- .../controlnet/ControlNetFirstListActivity.kt | 2 +- .../SpecialControlNetworkListActivity.kt | 2 +- .../survey/ui/lofting/LoftingListActivity.kt | 2 +- .../survey/ui/login/ForgetPwdActivity.kt | 3 +- .../ui/login/ForgetPwdInputCodeActivity.kt | 3 +- .../pointmeasure/PointMeasureListFragment.kt | 2 +- .../widget/decoration/HorDividerDecoration.kt | 3 +- .../TransparentDividerDecoration.kt | 2 +- .../color/text_color_selector_blue_black.xml | 2 +- app/src/main/res/drawable/arrow_right.xml | 4 +- app/src/main/res/drawable/bg_badge.xml | 6 +- app/src/main/res/drawable/bg_btn_enable.xml | 2 +- .../main/res/drawable/bg_btn_enable_not.xml | 2 +- app/src/main/res/drawable/bg_btn_login.xml | 3 +- .../main/res/drawable/bg_input_code_gray.xml | 6 +- .../res/drawable/bg_input_code_selected.xml | 4 +- .../main/res/drawable/bg_item_input_code.xml | 4 +- .../drawable/bg_point_measure_selector.xml | 8 +-- app/src/main/res/drawable/bg_search.xml | 2 +- .../main/res/drawable/bg_section_r_8_top.xml | 4 +- app/src/main/res/drawable/change_pwd.xml | 10 --- app/src/main/res/drawable/ic_project_list.xml | 4 +- app/src/main/res/drawable/icon_change_pwd.xml | 15 ++++ app/src/main/res/drawable/icon_mine_about.xml | 10 +++ .../main/res/drawable/icon_switch_project.xml | 15 ++++ .../main/res/drawable/icon_toolbar_back.xml | 4 +- .../main/res/drawable/icon_toolbar_exit.xml | 4 +- app/src/main/res/drawable/login_error.xml | 4 +- app/src/main/res/drawable/switch_project.xml | 10 --- app/src/main/res/layout/activity_approval.xml | 22 ++++-- .../res/layout/activity_control_net_list.xml | 26 +++---- .../res/layout/activity_control_point.xml | 6 +- .../main/res/layout/activity_forget_pwd.xml | 31 ++++---- .../layout/activity_forget_pwd_input_code.xml | 11 +-- .../main/res/layout/activity_lofting_list.xml | 1 - app/src/main/res/layout/activity_login.xml | 45 ++++++------ .../res/layout/activity_login_input_code.xml | 21 +++--- app/src/main/res/layout/activity_main.xml | 8 +-- .../main/res/layout/activity_project_list.xml | 1 - .../main/res/layout/activity_set_new_pwd.xml | 8 +-- .../activity_special_control_network_list.xml | 26 +++---- app/src/main/res/layout/fragment_home.xml | 41 ++++++----- .../main/res/layout/fragment_instrument.xml | 30 ++++---- app/src/main/res/layout/fragment_me.xml | 23 +++--- .../layout/fragment_point_measure_list.xml | 1 - .../res/layout/item_approval_approved.xml | 36 +++++----- .../main/res/layout/item_approval_owner.xml | 27 +++---- .../res/layout/item_control_net_first.xml | 66 ++++++++++-------- app/src/main/res/layout/item_lofting_list.xml | 62 ++++++++-------- .../res/layout/item_point_measure_list.xml | 66 ++++++++++-------- app/src/main/res/layout/item_project_list.xml | 16 ++--- .../layout/item_special_control_network.xml | 24 +++---- app/src/main/res/layout/layout_no_data.xml | 2 +- .../main/res/layout/verifation_code_item.xml | 17 ++--- app/src/main/res/layout/view_password.xml | 6 +- app/src/main/res/layout/widget_search.xml | 22 +++--- .../main/res/layout/widget_section_item.xml | 12 ++-- .../main/res/mipmap-hdpi/icon_launcher.webp | Bin 1882 -> 1910 bytes .../main/res/mipmap-mdpi/icon_launcher.webp | Bin 1344 -> 1280 bytes .../main/res/mipmap-xhdpi/icon_launcher.webp | Bin 2332 -> 2544 bytes .../main/res/mipmap-xxhdpi/icon_launcher.webp | Bin 3414 -> 4080 bytes .../res/mipmap-xxxhdpi/icon_launcher.webp | Bin 4356 -> 5696 bytes app/src/main/res/values/color.xml | 3 +- app/src/main/res/values/styles.xml | 4 +- colorful/src/main/res/values/colors.xml | 4 +- 66 files changed, 445 insertions(+), 369 deletions(-) delete mode 100644 app/src/main/res/drawable/change_pwd.xml create mode 100644 app/src/main/res/drawable/icon_change_pwd.xml create mode 100644 app/src/main/res/drawable/icon_mine_about.xml create mode 100644 app/src/main/res/drawable/icon_switch_project.xml delete mode 100644 app/src/main/res/drawable/switch_project.xml diff --git a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt index 6d67127..9eb6f9c 100644 --- a/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt +++ b/app/src/main/java/com/project/survey/ui/approval/ApprovalActivity.kt @@ -50,7 +50,7 @@ class ApprovalActivity : BaseBindingActivity(), OnRefre override fun initView() { type = intent.getStringExtra(TYPE) ?: "" immersionToolbar( - mBinding.ilToolBar.toolbar, + mBinding.toolbar, when (type) { PI_PREAPPROV -> "待处理" PI_APPROVED -> "已处理" @@ -70,7 +70,7 @@ class ApprovalActivity : BaseBindingActivity(), OnRefre // beginTransaction.commit() mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this) - mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) +// mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) mBinding.recyclerView.adapter = adapter adapter.isStateViewEnable = true } diff --git a/app/src/main/java/com/project/survey/ui/controlnet/ControlNetFirstListActivity.kt b/app/src/main/java/com/project/survey/ui/controlnet/ControlNetFirstListActivity.kt index b4f926f..d73b281 100644 --- a/app/src/main/java/com/project/survey/ui/controlnet/ControlNetFirstListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/controlnet/ControlNetFirstListActivity.kt @@ -42,7 +42,7 @@ class ControlNetFirstListActivity : BaseBindingActivity() { override fun initView() { immersionToolbar(mBinding.toolbar, R.string.lofting) - mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) +// mBinding.recyclerView.addItemDecoration(TransparentDividerDecoration(this)) mBinding.recyclerView.setAdapter(adapter) adapter.isStateViewEnable = true } diff --git a/app/src/main/java/com/project/survey/ui/login/ForgetPwdActivity.kt b/app/src/main/java/com/project/survey/ui/login/ForgetPwdActivity.kt index b91862c..1d5d95a 100644 --- a/app/src/main/java/com/project/survey/ui/login/ForgetPwdActivity.kt +++ b/app/src/main/java/com/project/survey/ui/login/ForgetPwdActivity.kt @@ -1,10 +1,9 @@ package com.project.survey.ui.login -import android.content.Intent import androidx.core.widget.addTextChangedListener -import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivityForgetPwdBinding import com.project.survey.extend.setOnClickNoRepeatListener +import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.util.ActivityNavUtil /** diff --git a/app/src/main/java/com/project/survey/ui/login/ForgetPwdInputCodeActivity.kt b/app/src/main/java/com/project/survey/ui/login/ForgetPwdInputCodeActivity.kt index 6332398..4f651b8 100644 --- a/app/src/main/java/com/project/survey/ui/login/ForgetPwdInputCodeActivity.kt +++ b/app/src/main/java/com/project/survey/ui/login/ForgetPwdInputCodeActivity.kt @@ -1,10 +1,9 @@ package com.project.survey.ui.login -import android.content.Intent import androidx.lifecycle.lifecycleScope -import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivityForgetPwdInputCodeBinding import com.project.survey.extend.showSoftInput +import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.util.ActivityNavUtil import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListFragment.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListFragment.kt index e44d5c1..1016748 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListFragment.kt +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListFragment.kt @@ -34,7 +34,7 @@ class PointMeasureListFragment : BaseBindingFragment - + \ No newline at end of file diff --git a/app/src/main/res/drawable/arrow_right.xml b/app/src/main/res/drawable/arrow_right.xml index 1108b51..050642d 100644 --- a/app/src/main/res/drawable/arrow_right.xml +++ b/app/src/main/res/drawable/arrow_right.xml @@ -1,6 +1,6 @@ + android:width="@dimen/sw_14dp" + android:height="@dimen/sw_14dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_btn_enable.xml b/app/src/main/res/drawable/bg_btn_enable.xml index 69157e5..669627b 100644 --- a/app/src/main/res/drawable/bg_btn_enable.xml +++ b/app/src/main/res/drawable/bg_btn_enable.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_btn_enable_not.xml b/app/src/main/res/drawable/bg_btn_enable_not.xml index 651d8f7..f65f033 100644 --- a/app/src/main/res/drawable/bg_btn_enable_not.xml +++ b/app/src/main/res/drawable/bg_btn_enable_not.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_btn_login.xml b/app/src/main/res/drawable/bg_btn_login.xml index c4bea67..765d28f 100644 --- a/app/src/main/res/drawable/bg_btn_login.xml +++ b/app/src/main/res/drawable/bg_btn_login.xml @@ -5,5 +5,6 @@ android:angle="0" android:endColor="#396BD0" android:startColor="#3F79F0" /> - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_input_code_gray.xml b/app/src/main/res/drawable/bg_input_code_gray.xml index 519a2cd..e695771 100644 --- a/app/src/main/res/drawable/bg_input_code_gray.xml +++ b/app/src/main/res/drawable/bg_input_code_gray.xml @@ -7,9 +7,9 @@ + android:width="@dimen/sw_1dp" + android:color="@color/text_color_df" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_input_code_selected.xml b/app/src/main/res/drawable/bg_input_code_selected.xml index 285d279..0e8d7cd 100644 --- a/app/src/main/res/drawable/bg_input_code_selected.xml +++ b/app/src/main/res/drawable/bg_input_code_selected.xml @@ -7,9 +7,9 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_item_input_code.xml b/app/src/main/res/drawable/bg_item_input_code.xml index 5ab89be..e70d6f5 100644 --- a/app/src/main/res/drawable/bg_item_input_code.xml +++ b/app/src/main/res/drawable/bg_item_input_code.xml @@ -1,8 +1,8 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_point_measure_selector.xml b/app/src/main/res/drawable/bg_point_measure_selector.xml index 5b05510..8e1e9e9 100644 --- a/app/src/main/res/drawable/bg_point_measure_selector.xml +++ b/app/src/main/res/drawable/bg_point_measure_selector.xml @@ -3,16 +3,16 @@ - - + + - - + + diff --git a/app/src/main/res/drawable/bg_search.xml b/app/src/main/res/drawable/bg_search.xml index 4c24d36..6d40a03 100644 --- a/app/src/main/res/drawable/bg_search.xml +++ b/app/src/main/res/drawable/bg_search.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_section_r_8_top.xml b/app/src/main/res/drawable/bg_section_r_8_top.xml index f723d96..5b836be 100644 --- a/app/src/main/res/drawable/bg_section_r_8_top.xml +++ b/app/src/main/res/drawable/bg_section_r_8_top.xml @@ -3,8 +3,8 @@ android:shape="rectangle"> + android:topLeftRadius="@dimen/sw_8dp" + android:topRightRadius="@dimen/sw_8dp" /> diff --git a/app/src/main/res/drawable/change_pwd.xml b/app/src/main/res/drawable/change_pwd.xml deleted file mode 100644 index 451b75d..0000000 --- a/app/src/main/res/drawable/change_pwd.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_project_list.xml b/app/src/main/res/drawable/ic_project_list.xml index 15b5e6b..eb6b3ff 100644 --- a/app/src/main/res/drawable/ic_project_list.xml +++ b/app/src/main/res/drawable/ic_project_list.xml @@ -1,6 +1,6 @@ + + + diff --git a/app/src/main/res/drawable/icon_mine_about.xml b/app/src/main/res/drawable/icon_mine_about.xml new file mode 100644 index 0000000..48868fa --- /dev/null +++ b/app/src/main/res/drawable/icon_mine_about.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/icon_switch_project.xml b/app/src/main/res/drawable/icon_switch_project.xml new file mode 100644 index 0000000..698db2c --- /dev/null +++ b/app/src/main/res/drawable/icon_switch_project.xml @@ -0,0 +1,15 @@ + + + + diff --git a/app/src/main/res/drawable/icon_toolbar_back.xml b/app/src/main/res/drawable/icon_toolbar_back.xml index 8042e0e..ddfdcbd 100644 --- a/app/src/main/res/drawable/icon_toolbar_back.xml +++ b/app/src/main/res/drawable/icon_toolbar_back.xml @@ -1,6 +1,6 @@ - - diff --git a/app/src/main/res/layout/activity_approval.xml b/app/src/main/res/layout/activity_approval.xml index 39b38af..1f65a56 100644 --- a/app/src/main/res/layout/activity_approval.xml +++ b/app/src/main/res/layout/activity_approval.xml @@ -6,11 +6,25 @@ android:layout_height="match_parent" android:orientation="vertical"> - + + + + - + diff --git a/app/src/main/res/layout/activity_control_net_list.xml b/app/src/main/res/layout/activity_control_net_list.xml index 8ae44b3..8f45911 100644 --- a/app/src/main/res/layout/activity_control_net_list.xml +++ b/app/src/main/res/layout/activity_control_net_list.xml @@ -1,6 +1,7 @@ @@ -32,10 +33,10 @@ + android:textColor="@color/text_color_20" + android:textSize="@dimen/sw_11sp" /> + app:layout_constraintStart_toStartOf="parent" /> @@ -79,8 +80,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/sw_12dp" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="2" + tools:listitem="@layout/item_control_net_first" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_control_point.xml b/app/src/main/res/layout/activity_control_point.xml index b1b1503..9ba026e 100644 --- a/app/src/main/res/layout/activity_control_point.xml +++ b/app/src/main/res/layout/activity_control_point.xml @@ -1,6 +1,7 @@ @@ -34,8 +35,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/sw_12dp" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="2" + tools:listitem="@layout/item_control_net_first" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_forget_pwd.xml b/app/src/main/res/layout/activity_forget_pwd.xml index b51acbf..e9a38e1 100644 --- a/app/src/main/res/layout/activity_forget_pwd.xml +++ b/app/src/main/res/layout/activity_forget_pwd.xml @@ -1,36 +1,36 @@ - + + app:titleCentered="true" + app:titleTextAppearance="@style/ToolbarTextAppearance" /> @@ -49,16 +49,16 @@ android:id="@+id/etAccount" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/sw_22dp" + android:layout_marginHorizontal="@dimen/sw_23dp" android:text="" - android:textColor="@color/text_color_1" + android:textColor="@color/text_color_20" android:textSize="@dimen/sw_14sp" /> @@ -71,7 +71,8 @@ android:paddingHorizontal="@dimen/sw_20dp" android:paddingVertical="@dimen/sw_6dp" android:text="@string/send_the_verification_code" - android:textColor="@color/text_color_enable_sc" /> + android:textColor="@color/text_color_enable_sc" + android:textSize="@dimen/sw_12sp" /> diff --git a/app/src/main/res/layout/activity_forget_pwd_input_code.xml b/app/src/main/res/layout/activity_forget_pwd_input_code.xml index 1590c1f..011fe21 100644 --- a/app/src/main/res/layout/activity_forget_pwd_input_code.xml +++ b/app/src/main/res/layout/activity_forget_pwd_input_code.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_lofting_list.xml b/app/src/main/res/layout/activity_lofting_list.xml index a99f2cf..f2ccda7 100644 --- a/app/src/main/res/layout/activity_lofting_list.xml +++ b/app/src/main/res/layout/activity_lofting_list.xml @@ -31,7 +31,6 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="12dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:itemCount="2" tools:listitem="@layout/item_lofting_list" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 5799abb..9249d3f 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -5,22 +5,22 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingHorizontal="@dimen/margin_side"> + android:paddingHorizontal="@dimen/sw_23dp"> + android:textSize="@dimen/sw_11sp" /> + android:textSize="@dimen/sw_14sp" /> + android:textSize="@dimen/sw_11sp" /> + android:textSize="@dimen/sw_16sp" /> + android:textSize="@dimen/sw_14sp" /> @@ -100,15 +101,16 @@ android:id="@+id/llShowInnerLogin" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:layout_marginTop="@dimen/sw_12dp" android:gravity="center" - android:visibility="gone"> + android:visibility="gone" + tools:visibility="visible"> @@ -116,13 +118,14 @@ diff --git a/app/src/main/res/layout/activity_login_input_code.xml b/app/src/main/res/layout/activity_login_input_code.xml index 996d6fd..0a9b2c6 100644 --- a/app/src/main/res/layout/activity_login_input_code.xml +++ b/app/src/main/res/layout/activity_login_input_code.xml @@ -5,9 +5,9 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + + + @@ -44,9 +44,10 @@ android:id="@+id/etInputCode" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="24dp" + android:layout_marginHorizontal="@dimen/sw_23dp" + android:layout_marginTop="@dimen/sw_24dp" app:code_number="6" + app:code_text_color="@color/text_color_20" app:line_color_default="@color/text_color_df" app:line_color_focus="@color/text_color_396bd0" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4caab76..f4e325c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,14 +15,14 @@ diff --git a/app/src/main/res/layout/activity_project_list.xml b/app/src/main/res/layout/activity_project_list.xml index 98b9613..8814f90 100644 --- a/app/src/main/res/layout/activity_project_list.xml +++ b/app/src/main/res/layout/activity_project_list.xml @@ -12,7 +12,6 @@ android:layout_width="match_parent" android:layout_height="?actionBarSize" android:background="@color/transparent" - app:navigationIcon="@drawable/icon_toolbar_back" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:titleCentered="true" diff --git a/app/src/main/res/layout/activity_set_new_pwd.xml b/app/src/main/res/layout/activity_set_new_pwd.xml index 080f4c1..e7d1dd1 100644 --- a/app/src/main/res/layout/activity_set_new_pwd.xml +++ b/app/src/main/res/layout/activity_set_new_pwd.xml @@ -1,11 +1,11 @@ - + @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/sw_60dp" android:background="@drawable/bg_btn_login" - android:text="@string/confirm" + android:text="确认" android:textColor="@color/white" android:textSize="@dimen/sw_16sp" /> diff --git a/app/src/main/res/layout/activity_special_control_network_list.xml b/app/src/main/res/layout/activity_special_control_network_list.xml index 8ae44b3..219f147 100644 --- a/app/src/main/res/layout/activity_special_control_network_list.xml +++ b/app/src/main/res/layout/activity_special_control_network_list.xml @@ -1,6 +1,7 @@ @@ -32,10 +33,10 @@ + android:textColor="@color/text_color_20" + android:textSize="@dimen/sw_11sp" /> + app:layout_constraintStart_toStartOf="parent" /> @@ -79,8 +80,9 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/sw_12dp" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:itemCount="3" + tools:listitem="@layout/item_special_control_network" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 8b3fd71..a164706 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -8,7 +8,7 @@ @@ -16,10 +16,10 @@ android:id="@+id/tvProject" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_20dp" android:textColor="@color/text_color_fff" - android:textSize="20sp" + android:textSize="@dimen/sw_20sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -29,10 +29,12 @@ android:id="@+id/layoutFirst" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_16dp" android:background="@drawable/bg_section_r_8_top" - android:padding="@dimen/padding_side" + android:paddingHorizontal="@dimen/sw_22dp" + android:paddingTop="@dimen/sw_18dp" + android:paddingBottom="@dimen/sw_6dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvProject"> @@ -42,7 +44,7 @@ android:layout_height="wrap_content" android:text="@string/beidou_application" android:textColor="@color/text_color_main" - android:textSize="@dimen/text_size_section_title" + android:textSize="@dimen/sw_14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -51,6 +53,7 @@ android:id="@+id/itemPointMeasure" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/sw_6dp" app:layout_constraintEnd_toStartOf="@id/itemLofting" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="parent" @@ -84,10 +87,12 @@ android:id="@+id/layoutSecond" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_16dp" android:background="@drawable/bg_section_r_8" - android:padding="@dimen/padding_side" + android:paddingHorizontal="@dimen/sw_22dp" + android:paddingTop="@dimen/sw_18dp" + android:paddingBottom="@dimen/sw_6dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/layoutFirst"> @@ -97,7 +102,7 @@ android:layout_height="wrap_content" android:text="@string/process_approval" android:textColor="@color/text_color_main" - android:textSize="@dimen/text_size_section_title" + android:textSize="@dimen/sw_14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -106,6 +111,7 @@ android:id="@+id/itemToBeProcessed" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/sw_6dp" app:layout_constraintEnd_toStartOf="@id/itemProcessed" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="parent" @@ -141,10 +147,12 @@ android:id="@+id/llThird" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_16dp" android:background="@drawable/bg_section_r_8" - android:padding="@dimen/padding_side" + android:paddingHorizontal="@dimen/sw_22dp" + android:paddingTop="@dimen/sw_18dp" + android:paddingBottom="@dimen/sw_6dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/layoutSecond"> @@ -154,7 +162,7 @@ android:layout_height="wrap_content" android:text="@string/engineering_control_network" android:textColor="@color/text_color_main" - android:textSize="@dimen/text_size_section_title" + android:textSize="@dimen/sw_14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -163,6 +171,7 @@ android:id="@+id/itemControlNetFirst" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/sw_6dp" app:layout_constraintEnd_toStartOf="@id/itemControlNetSpecial" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_instrument.xml b/app/src/main/res/layout/fragment_instrument.xml index 50821eb..83b02a1 100644 --- a/app/src/main/res/layout/fragment_instrument.xml +++ b/app/src/main/res/layout/fragment_instrument.xml @@ -8,7 +8,7 @@ @@ -16,10 +16,10 @@ android:id="@+id/tvProject" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_20dp" android:textColor="@color/text_color_fff" - android:textSize="20sp" + android:textSize="@dimen/sw_20sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -29,10 +29,12 @@ android:id="@+id/layoutFirst" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_16dp" android:background="@drawable/bg_section_r_8_top" - android:padding="@dimen/padding_side" + android:paddingHorizontal="@dimen/sw_22dp" + android:paddingTop="@dimen/sw_18dp" + android:paddingBottom="@dimen/sw_6dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvProject"> @@ -42,7 +44,7 @@ android:layout_height="wrap_content" android:text="@string/instrument_online" android:textColor="@color/text_color_main" - android:textSize="@dimen/text_size_section_title" + android:textSize="@dimen/sw_14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -51,6 +53,7 @@ android:id="@+id/itemConnectTotalStation" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/sw_6dp" app:layout_constraintEnd_toStartOf="@id/itemConnectRTK" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="parent" @@ -85,10 +88,12 @@ android:id="@+id/layoutSecond" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="@dimen/margin_side" - android:layout_marginTop="@dimen/margin_side" + android:layout_marginHorizontal="@dimen/sw_20dp" + android:layout_marginTop="@dimen/sw_16dp" android:background="@drawable/bg_section_r_8" - android:padding="@dimen/padding_side" + android:paddingHorizontal="@dimen/sw_22dp" + android:paddingTop="@dimen/sw_18dp" + android:paddingBottom="@dimen/sw_6dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/layoutFirst"> @@ -98,7 +103,7 @@ android:layout_height="wrap_content" android:text="@string/job_settings" android:textColor="@color/text_color_main" - android:textSize="@dimen/text_size_section_title" + android:textSize="@dimen/sw_14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -107,6 +112,7 @@ android:id="@+id/itemTotalStationSetupStation" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/sw_6dp" app:layout_constraintEnd_toStartOf="@id/itemMobileStationMode" app:layout_constraintHorizontal_weight="1" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 79feb87..1759438 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/white" - android:textSize="22sp" + android:textSize="@dimen/sw_22sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -31,7 +31,7 @@ android:id="@+id/tvProject" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/sw_6dp" + android:layout_marginTop="@dimen/sw_10dp" android:textColor="@color/white" android:textSize="@dimen/sw_15sp" app:layout_constraintStart_toStartOf="parent" @@ -58,9 +58,9 @@ android:layout_weight="1" android:drawablePadding="@dimen/sw_16dp" android:text="@string/switch_project" - android:textColor="@color/text_color_1" + android:textColor="@color/text_color_20" android:textSize="@dimen/sw_15sp" - app:drawableLeftCompat="@drawable/switch_project" /> + app:drawableLeftCompat="@drawable/icon_switch_project" /> + app:drawableStartCompat="@drawable/icon_change_pwd" /> + app:drawableStartCompat="@drawable/icon_mine_about" /> + android:textSize="@dimen/sw_15sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_point_measure_list.xml b/app/src/main/res/layout/fragment_point_measure_list.xml index 5b1b665..31cd2a6 100644 --- a/app/src/main/res/layout/fragment_point_measure_list.xml +++ b/app/src/main/res/layout/fragment_point_measure_list.xml @@ -9,7 +9,6 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="12dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" tools:itemCount="2" tools:listitem="@layout/item_point_measure_list" /> diff --git a/app/src/main/res/layout/item_approval_approved.xml b/app/src/main/res/layout/item_approval_approved.xml index f238697..83c97b6 100644 --- a/app/src/main/res/layout/item_approval_approved.xml +++ b/app/src/main/res/layout/item_approval_approved.xml @@ -4,17 +4,19 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" + android:layout_marginHorizontal="@dimen/sw_12dp" + android:layout_marginVertical="@dimen/sw_5dp" android:background="@drawable/bg_white_round_4" - android:padding="12dp" - tools:layout_editor_absoluteX="12dp"> + android:paddingHorizontal="@dimen/sw_14dp" + android:paddingTop="@dimen/sw_10dp" + android:paddingBottom="@dimen/sw_12dp"> @@ -34,12 +36,12 @@ android:id="@+id/tvStatus" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="5dp" + android:layout_marginTop="@dimen/sw_5dp" android:background="@drawable/bg_approval_blue_stroke" - android:paddingHorizontal="4dp" - android:paddingVertical="1dp" + android:paddingHorizontal="@dimen/sw_4dp" + android:paddingVertical="@dimen/sw_1dp" android:textColor="@color/text_color_396bd0" - android:textSize="10sp" + android:textSize="@dimen/sw_10sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvNo" tools:text="监理审核" /> @@ -48,10 +50,10 @@ android:id="@+id/tvReceiverKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:layout_marginTop="@dimen/sw_12dp" android:text="接 收 人：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvStatus" /> @@ -59,8 +61,8 @@ android:id="@+id/tvReceiver" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textColor="@color/text_color_20" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvReceiverKey" app:layout_constraintStart_toEndOf="@id/tvReceiverKey" tools:text="Tom" /> @@ -69,10 +71,10 @@ android:id="@+id/tvStartTimeKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/sw_4dp" android:text="办理时间：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvReceiverKey" /> @@ -80,8 +82,8 @@ android:id="@+id/tvTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textColor="@color/text_color_20" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvStartTimeKey" app:layout_constraintStart_toEndOf="@id/tvStartTimeKey" tools:text="2022-06-10 09:27:49" /> diff --git a/app/src/main/res/layout/item_approval_owner.xml b/app/src/main/res/layout/item_approval_owner.xml index 268f437..9c2eac6 100644 --- a/app/src/main/res/layout/item_approval_owner.xml +++ b/app/src/main/res/layout/item_approval_owner.xml @@ -4,16 +4,19 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" + android:layout_marginHorizontal="@dimen/sw_12dp" + android:layout_marginVertical="@dimen/sw_5dp" android:background="@drawable/bg_white_round_4" - android:padding="12dp"> + android:paddingHorizontal="@dimen/sw_14dp" + android:paddingTop="@dimen/sw_10dp" + android:paddingBottom="@dimen/sw_12dp"> @@ -33,10 +36,10 @@ android:id="@+id/tvStartTimeKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:layout_marginTop="@dimen/sw_12dp" android:text="发起时间：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvNo" /> @@ -44,8 +47,8 @@ android:id="@+id/tvStartTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textColor="@color/text_color_20" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvStartTimeKey" app:layout_constraintStart_toEndOf="@id/tvStartTimeKey" tools:text="2022-06-10 09:27:49" /> @@ -54,10 +57,10 @@ android:id="@+id/tvEndTimeKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/sw_4dp" android:text="结束时间：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvStartTimeKey" /> @@ -65,8 +68,8 @@ android:id="@+id/tvEndTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textColor="@color/text_color_20" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvEndTimeKey" app:layout_constraintStart_toEndOf="@id/tvEndTimeKey" tools:text="2022-06-10 09:27:49" /> diff --git a/app/src/main/res/layout/item_control_net_first.xml b/app/src/main/res/layout/item_control_net_first.xml index 1593a0c..598dce5 100644 --- a/app/src/main/res/layout/item_control_net_first.xml +++ b/app/src/main/res/layout/item_control_net_first.xml @@ -1,28 +1,29 @@ + android:paddingHorizontal="@dimen/sw_14dp" + android:paddingBottom="@dimen/sw_5dp"> + android:textStyle="bold" + tools:text="点名称" /> + android:layout_height="@dimen/sw_0_5dp" /> + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" + tools:text="362122.22" /> @@ -61,7 +62,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:text="Y(m)" - android:textColor="@color/text_color_1" + android:textColor="@color/text_color_20" android:textSize="@dimen/sw_12sp" /> + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" + tools:text="362122.22" /> @@ -87,7 +88,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:text="Z(m)" - android:textColor="@color/text_color_1" + android:textColor="@color/text_color_20" android:textSize="@dimen/sw_12sp" /> + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" + tools:text="362122.22" /> @@ -113,7 +114,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:text="施测时间" - android:textColor="@color/text_color_1" + android:textColor="@color/text_color_20" android:textSize="@dimen/sw_12sp" /> + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" + tools:text="2022-06-10 09:27:49" /> @@ -139,18 +140,21 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:text="备注" - android:textColor="@color/text_color_1" + android:textColor="@color/text_color_20" android:textSize="@dimen/sw_12sp" /> + android:maxLines="2" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" + tools:text="都会大喊大叫好多好多好多好多好多好多好多好多好多好多的很好好多好多好多好多" /> diff --git a/app/src/main/res/layout/item_lofting_list.xml b/app/src/main/res/layout/item_lofting_list.xml index c77d5ce..76c8e8a 100644 --- a/app/src/main/res/layout/item_lofting_list.xml +++ b/app/src/main/res/layout/item_lofting_list.xml @@ -4,15 +4,19 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/sw_12dp" + android:layout_marginVertical="@dimen/sw_6dp" android:background="@drawable/bg_white_round_4" - android:padding="12dp"> + android:paddingHorizontal="14dp" + android:paddingTop="@dimen/sw_10dp" + android:paddingBottom="@dimen/sw_12dp"> @@ -33,8 +37,8 @@ android:id="@+id/tvWorkDesc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvWorkDescKey" app:layout_constraintStart_toEndOf="@id/tvWorkDescKey" tools:text="内容" /> @@ -43,10 +47,10 @@ android:id="@+id/tvCreateTimeKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/sw_4dp" android:text="创 建 时 间 ：" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvWorkDescKey" /> @@ -54,8 +58,8 @@ android:id="@+id/tvCreateTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvCreateTimeKey" app:layout_constraintStart_toEndOf="@id/tvCreateTimeKey" tools:text="2022-05-17 10:58:48" /> @@ -64,10 +68,10 @@ android:id="@+id/tvProjectNameKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/sw_4dp" android:text="分项工程名称：" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvCreateTimeKey" /> @@ -75,8 +79,8 @@ android:id="@+id/tvProjectName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvProjectNameKey" app:layout_constraintStart_toEndOf="@id/tvProjectNameKey" tools:text="单位-分部-分项 3个名称合并显示" /> @@ -85,10 +89,10 @@ android:id="@+id/tvSurveyorKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:text="测　 量　 员：" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:layout_marginTop="@dimen/sw_4dp" + android:text="测　量　员　：" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvProjectNameKey" /> @@ -96,8 +100,8 @@ android:id="@+id/tvSurveyor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textColor="@color/text_color_404145" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvSurveyorKey" app:layout_constraintStart_toEndOf="@id/tvSurveyorKey" tools:text="丁汉臻" /> @@ -105,8 +109,8 @@ @@ -114,13 +118,13 @@ android:id="@+id/tvLofting" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="10dp" + android:layout_marginTop="@dimen/sw_10dp" android:background="@drawable/bg_point_measure_selector" - android:paddingHorizontal="28dp" - android:paddingVertical="6dp" + android:paddingHorizontal="@dimen/sw_28dp" + android:paddingVertical="@dimen/sw_6dp" android:text="@string/lofting" android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/viewLine" /> diff --git a/app/src/main/res/layout/item_point_measure_list.xml b/app/src/main/res/layout/item_point_measure_list.xml index b0710f1..ca333e8 100644 --- a/app/src/main/res/layout/item_point_measure_list.xml +++ b/app/src/main/res/layout/item_point_measure_list.xml @@ -4,15 +4,19 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/sw_12dp" + android:layout_marginVertical="@dimen/sw_6dp" android:background="@drawable/bg_white_round_4" - android:padding="12dp"> + android:paddingHorizontal="@dimen/sw_14dp" + android:paddingTop="@dimen/sw_10dp" + android:paddingBottom="@dimen/sw_12dp"> @@ -32,12 +36,12 @@ android:id="@+id/tvType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="5dp" + android:layout_marginTop="@dimen/sw_5dp" android:background="@drawable/bg_approval_blue_stroke" - android:paddingHorizontal="4dp" - android:paddingVertical="1dp" + android:paddingHorizontal="@dimen/sw_4dp" + android:paddingVertical="@dimen/sw_1dp" android:textColor="@color/colorPrimary" - android:textSize="10sp" + android:textSize="@dimen/sw_10sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvNO" tools:text="测量类型" /> @@ -46,10 +50,10 @@ android:id="@+id/tvProjectNameKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:layout_marginTop="@dimen/sw_12dp" android:text="分项工程名称：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvType" /> @@ -58,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvProjectNameKey" app:layout_constraintStart_toEndOf="@id/tvProjectNameKey" tools:text="单位-分部-分项3个名称合并显示" /> @@ -67,10 +71,10 @@ android:id="@+id/tvMeasureContentKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="@dimen/sw_4dp" android:text="测 量 内 容 ：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvProjectNameKey" /> @@ -79,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvMeasureContentKey" app:layout_constraintStart_toEndOf="@id/tvMeasureContentKey" tools:text="内容名称" /> @@ -88,10 +92,10 @@ android:id="@+id/tvApplyUserKey" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:text="申　 请　 人：" + android:layout_marginTop="@dimen/sw_4dp" + android:text="申　请　人　：" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvMeasureContentKey" /> @@ -100,7 +104,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvApplyUserKey" app:layout_constraintStart_toEndOf="@id/tvApplyUserKey" tools:text="丁汉臻" /> @@ -108,8 +112,8 @@ @@ -117,13 +121,13 @@ android:id="@+id/tvGenerateForm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" + android:layout_marginEnd="@dimen/sw_8dp" android:background="@drawable/bg_point_measure_selector" - android:paddingHorizontal="16dp" - android:paddingVertical="6dp" + android:paddingHorizontal="@dimen/sw_16dp" + android:paddingVertical="@dimen/sw_6dp" android:text="生成报验单" android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure" app:layout_constraintEnd_toStartOf="@id/tvStopMeasure" /> @@ -131,13 +135,13 @@ android:id="@+id/tvStopMeasure" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" + android:layout_marginEnd="@dimen/sw_8dp" android:background="@drawable/bg_point_measure_selector" - android:paddingHorizontal="16dp" - android:paddingVertical="6dp" + android:paddingHorizontal="@dimen/sw_16dp" + android:paddingVertical="@dimen/sw_6dp" android:text="结束测量" android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure" app:layout_constraintEnd_toStartOf="@id/tvEnterMeasure" /> @@ -145,13 +149,13 @@ android:id="@+id/tvEnterMeasure" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="10dp" + android:layout_marginTop="@dimen/sw_10dp" android:background="@drawable/bg_point_measure_selector" - android:paddingHorizontal="16dp" - android:paddingVertical="6dp" + android:paddingHorizontal="@dimen/sw_16dp" + android:paddingVertical="@dimen/sw_6dp" android:text="进入测量" android:textColor="@color/text_color_20" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/viewLine" /> diff --git a/app/src/main/res/layout/item_project_list.xml b/app/src/main/res/layout/item_project_list.xml index d2a3df4..36c7b46 100644 --- a/app/src/main/res/layout/item_project_list.xml +++ b/app/src/main/res/layout/item_project_list.xml @@ -4,8 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingHorizontal="16dp" - android:paddingVertical="18dp"> + android:padding="@dimen/sw_16dp"> @@ -45,7 +43,7 @@ - + diff --git a/app/src/main/res/layout/item_special_control_network.xml b/app/src/main/res/layout/item_special_control_network.xml index ff4129e..a2bbe43 100644 --- a/app/src/main/res/layout/item_special_control_network.xml +++ b/app/src/main/res/layout/item_special_control_network.xml @@ -4,16 +4,18 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/sw_12dp" + android:layout_marginVertical="@dimen/sw_6dp" android:background="@drawable/bg_white_round_4" - android:orientation="vertical" - android:padding="12dp"> + android:paddingHorizontal="@dimen/sw_14dp" + android:paddingVertical="@dimen/sw_10dp"> @@ -34,11 +36,10 @@ android:id="@+id/tvLevel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/sw_12dp" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" + app:layout_constraintBaseline_toBaselineOf="@id/tvLevelKey" app:layout_constraintStart_toEndOf="@id/tvLevelKey" - app:layout_constraintTop_toBottomOf="@id/tvName" tools:text="内容" /> @@ -56,11 +57,10 @@ android:id="@+id/tvTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/sw_4dp" android:textColor="@color/text_color_404145" - android:textSize="12sp" + android:textSize="@dimen/sw_12sp" + app:layout_constraintBaseline_toBaselineOf="@id/tvTimeKey" app:layout_constraintStart_toEndOf="@id/tvTimeKey" - app:layout_constraintTop_toBottomOf="@id/tvLevelKey" tools:text="2022-05-17 10:58:48" /> diff --git a/app/src/main/res/layout/layout_no_data.xml b/app/src/main/res/layout/layout_no_data.xml index c2afc58..db4b177 100644 --- a/app/src/main/res/layout/layout_no_data.xml +++ b/app/src/main/res/layout/layout_no_data.xml @@ -9,7 +9,7 @@ android:layout_height="wrap_content" android:text="暂无数据" android:textColor="@color/text_color_20" - android:textSize="@dimen/text_size_body2" + android:textSize="@dimen/sw_14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/verifation_code_item.xml b/app/src/main/res/layout/verifation_code_item.xml index c85bc66..6bfdda2 100644 --- a/app/src/main/res/layout/verifation_code_item.xml +++ b/app/src/main/res/layout/verifation_code_item.xml @@ -1,18 +1,19 @@ + android:layout_weight="1" + android:padding="@dimen/sw_3dp" + tools:layout_width="match_parent"> + android:textSize="@dimen/sw_20sp" + tools:text="1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/view_password.xml b/app/src/main/res/layout/view_password.xml index 5e238ec..3d06abe 100644 --- a/app/src/main/res/layout/view_password.xml +++ b/app/src/main/res/layout/view_password.xml @@ -18,12 +18,12 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/sw_12dp"> + android:padding="@dimen/sw_4dp"> diff --git a/app/src/main/res/layout/widget_search.xml b/app/src/main/res/layout/widget_search.xml index 76b9e61..b1f0674 100644 --- a/app/src/main/res/layout/widget_search.xml +++ b/app/src/main/res/layout/widget_search.xml @@ -6,17 +6,17 @@ + android:paddingHorizontal="@dimen/sw_16dp"> + android:textColor="@color/text_color_20" + android:textColorHint="@color/text_color_5b5a5e" + android:textSize="@dimen/sw_11sp" /> diff --git a/app/src/main/res/layout/widget_section_item.xml b/app/src/main/res/layout/widget_section_item.xml index 57a021e..77a7604 100644 --- a/app/src/main/res/layout/widget_section_item.xml +++ b/app/src/main/res/layout/widget_section_item.xml @@ -4,12 +4,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="12dp"> + android:paddingVertical="@dimen/sw_12dp"> 6`Y<2t#=}l!$}-dDAOw?w-j`8Te=dxQTMaO&mT=*WWG)xs915^uYY!l z*L@pX3O!3!P&gns1ONcA6Mq1m0V+rUNdP{PKAK4-qavXznyLV>5(#Pm(-+|UKbhU5 z`|jz9l7$Z2E_)wA-{3tz`i{K-I#=i1HKwA6KJl~Sbdk~o&R&3u?gX4}TNGwA;sWc~ zf=Ub;{L+NQQ?`}A)DKErkI~^*3)PWCTdG0xFi~XrCFYam`Q}=1kbji{ihBLh`95_a z+p^*=pOt%g`FXZmHrJ=QsNOIZ9v;R^yaRv${`~X=42NTHEYbWYf=_E!R%kM;6{$wq z!PP<1Ny6S~8GUpyvj^Z{>Mg+vn$bDufmGCtLBbKU3@(alcXb3TDj%pZbNWIfhij2S+?xth>K|7TLhws_^K!1Oam%ryRh>3$pL+*H_B(pODU}R9lbsLsM7C8M(|?i=jZfi}rnA$Z2S0zI z?$tlxObN7zDOFykrvCh~x!3uxAU0_z@{hU-YDO6o&z`LhajG$}U}a_#Y)lcYiT4g> zx*xHuLC5_eC&(}~LCS8@5%u@2viz_8p#+yov8E=NyH^?R8UYs-u!114+rAcU^}_Yq zU430#Nj);+lz+`r1I(U+N!sdMmH>hdYyghHd7$uHvR6YuCdY^W>{XrWGKU>qRI5Eh zQ_DMjkO^=A;F0H!ZQ{Et^RRu|ZGE1{3R>qjESGqQeIc$Fh}#hVPT(y1=^=Ws0i71+ z_&^>up%fji_&(tSi&n@QS9hUxR2+(&5<`cy(|6g!`G3ByI%YiawtM+?BH)pBr~&BA zkn0h=7~LeQF6O1Pn=r`DlRaSTavtg0X1>25xTTI_TCFiLpyPM(B{vRfVIOU~`sg9a2a2RtrNP3w%wP1KqlzsR@)TTLyJMPtNR1dC&Dvf=jwLt9&YrbJ zo;%)UO@Q_oK;~XGk->S_-%ujn$=wpGI~bh zdkYs~SL+T)4$6rJwe;=O136bx6VvFUh3fM|Xr0+o@ovZ+-U!p3hjxxuRe&K8!=7UG zIzA1LgF9QEb~CJ4$Nn)q>SAQ%v1-53`pSB+TOHNL>hKGCHmx8O366XDSVQ6s@BjAj P03pAUBme*Q@Bjb+>e-=& delta 1329 zcmV-11myY5!(s)vkfFj-@Ej(-L#4k3%Q9uCxHL05Z=v#U9RM)aA%SZHpdU~W^nZaZLJ}9O zVbfqY#z+H>_aTw{J1Xv6DqN%j!+(1t73fmo-BEGBr{Xw98gSCEX|S7YLBo_y!?J)2sgk_qkk70Sb?j>fMYZlusv-A14NCIi z+QCahXEVBj3ia0X^x)&A{C@?H=XqO)f&f-fI3NlH003|l0G$CUNB~IyK9M|`NhPBq zp(<1jD6kRwvzueHiq^?tk~6;brM)q`H5qt;M47kSfN0H`C$fD%umb*OKqDPQ>V~a)S4r z=(TXXZqRcp4C;1*GoG@G*`3(o%+oNX|MEf@xI&{6+_ky`k3c<*gsjOu(!axLKberI zJpLw`6C~`fC^gXmlAD+}ObsF%@{YRd=ie^F7H-oFnb={;%72IA@FchEO7}hk?zrE? z8iYNe3X^m!_Dz*J0+hd|3Jw@%V3#A_%21^Y`>RX53?l9G9&{zJ5bLZpIzWo*bdrb& z*i?Ix=}$VSG=?xeB$%Wkt1gc+1aucIojNXO1((q^#8Qbd@|FGp?%-x1rfTJv3Apw% z1(;ACC^H)&;eQOl>QsHX0$>hvU%e+}k$Dl(m4fr#-KOZ3fQYj*yCj`AZ`Te)_Jtju zTx@u00|8$$)eaEcW*luY9FT+j-XyVe`4EdY7>+M*O7?T?ZtV~Ir z!tF?2{Y~egR;;}%Ai@ef-ZPE_tkW61rP#YjdPgLxCEy4-d6O!K5ypQBnHxH54Nhms zX$wb(!N3=>%=lqEt@_b@=J$)nw~b$kw=^WdNxL$l^cI&ic)rjl<7 zMY{oT27m0&=*S5}BS@h9^{SWaG9UBP$Ky8TVI|olmhzaZ31PtHQygo`BanM{BSEBc z#HG%T07QWqDZ6YHr!R{*iXG%R@OM6iyn_ywu~DFIL~49!oBHisuv<8MuvkKi`kJ(% z-LoO$k)^s!D@$LUB^ru%LSC~L{qB?X-sfO>tADLVm$vxL-I1tJKQr^yD@K^|`Gj+h zsC#9Op>OYViEfU1GFT4;VE_Dd3Mw}`)@v9&gaTeAHgK(L3zk~sAFYylNpEo;5Y`|nB7W+w@yAjf@A>7W&-{3f1 n|04go(QDW_-i0A(AB_He`W_eOmCpE0-T>d+<<^|m)(k)Zh>(!d diff --git a/app/src/main/res/mipmap-mdpi/icon_launcher.webp b/app/src/main/res/mipmap-mdpi/icon_launcher.webp index 329f4a3dfa2e428bf1010008cf3bf9948da83dac..753fcc10e43154d323d4022b353b0a925e3272d2 100644 GIT binary patch delta 723 zcmV;^0xbQ&3V;d*Qb|Te_yn;AJOY1)00001a8%p2+FS{V1CBdZmNE{bpyYro1j}?f z?I0o)v~9!mjlo(BdY~0f_GNeem|eM_gqB{=h*#D5YgVh+c!HldXM|1eKOiX17>huX z**}Bqn^IPjs53dcGs>NFzwB9_VJ=TJPBo4C{P)HhH~;7P9^re6??Jq0`5u4AcLKgc zezJ4$9VJ#!I3O$n003|c0G$CUFaR(BK9N3`NF}49Auc!zFt8E{YyiJ!tH-!pVLi43 zo=edO`+f4g=9T&qK$(cz$ILG#rcvKB4?22?FF!}*Jkh$nWYO1DTa`2-6(A7qnJJ>o zwvz~g0go4P!+-$({=yETH}!wr<&Y7%{E-I_uk>enW=~hpu1>?qiz-Wnvv~lK`>w#Z zgMc*Hg%{ssvrXw5l3~oR(iHO$J8lKJ;V~{wH3t#p+6+1{N68qo_c4 zQZ@?oTjv$;If9)BIdmqyRTDHz#|LiBQE8jT@Aegm7HI!jF_g{H&s_Do05b!Xa!59;Kb#`nYwJeDqgxm_KT~IL$7*(0pLTrz zvU1n_q-h#B7Rv=!86jF8x@Ei zd?k`~HP4X`7(TUfzm4t(KM)Vn=-+0=_~0K<_U&i9!yzw`BmhGQytZxwLHVhUD1`>f zdIztp;YmM#RAW+l{R_XwlHX3WCxHAh16t**-(D6I8jUG;7mfQHM{jd*pW*}inkviy F005qNQI!Ay delta 788 zcmV+v1MB>N3cv~mQb|TeI0dl=JOY2200001a1-0M>Rbu$Ir!}E2aPc&-H!oQKo%Z; zrc5MM?My4)+t{H7vf)*xy(zClRzo<`DTI0!RuCmAj7da9 ze31gV;6xLJgqo1|Ord;wWn=4c-)sVVvozI=bemY$;j z_>zNn!X-lQkO;eTZX-qoK|4ymcLSG75&%|EI3QR8006KI0G$CUFaR(BK8-Y&N2Ma7 zAvn@Z0H6_xYyhhRf%>lyhcKAS)?DB=z}0BCRB zDeFYX!Rt79w-6mLVyDAP=#PKk^C-^d24|4@K&M4)C#!$IH+l4BN&x=;dUnjx>($AV z%>OKf!2@|B+Vz{q37fY;5`6U@{Ov#?g zOv#Ni%((uI>cV;mkyY(Exd;ob$L@UG%oo$N!*Du3EQr_`_OaFNu95<75^SxAYQPHb zl(O0<2J-D3K?;SeF#dlw)XUwNQ9=GbD>@GI(1VbuS7;$9Z0sQt>1-bDDP*ax96 zeL3A)9HeYT4#n5O(HjK(v*};TSRDHKI8Xy%)kEigxoe2%OvZoIp7tt}XQcW#J94&R za~hP68|v<=%cUG(l=jfAB`v)^i_ZT|vsC2y6FCy@^q+)QqxJ%dZnN%DdbSP?qV+B* z969Os5Uqle<7Jy4{uKbUBhoT|clBb$)H=q|`_#0mQ{c`MLpXcc`SV6kOFn6>)!2_K S^QwH!{??35_!|V`lb8UQf`bA8 diff --git a/app/src/main/res/mipmap-xhdpi/icon_launcher.webp b/app/src/main/res/mipmap-xhdpi/icon_launcher.webp index 12e32ac12e155ec28cb201010277d3faa2fee207..440bce14e9f8e526513819f7d5ecf13553c30ea1 100644 GIT binary patch delta 1996 zcmV;-2Q&Db67UlRQb|Te=&=Po0)I&X0004i+iKg>>irRH;Is!45(BUS)Qn>L!W=BY z0#L#PbkHT|Hhuq%4)WXG6cH1ETSwj^t#&8TPbjBdl`gyy9%B#v>HY20a=T|B*mn_o21OYYvH{6>>)e07xySDNlBRM!M6O?VYt;eXbea_xRG z%QWe1_KAvxmBi|U(`wqS1Heo)@x%n|o>^}Lk)|GDTyQJK-k#gun+rFYr<#0Pv8%T1 zwnuhHVJG_E|KA^logCR6x9qkRyDDXu&V`%Iy*;q5)**a z@@gFbP_eL*Sbe}OW0lSDxqn-8s$F~?tQf5VT&cnppH--?f$|$RjjwQ{n_rk*au>Hx zu+L7qzvWn^1;b(|-j4<$C*mfHu+j zfc>ELrSx(B=hOrJhfzlI*ZF@nTFM)H%jdTUAhJ8&c1m|$zz5c@C3JyJTgb+t>m{&T zZ&^y(wY&CBArD!M0!;b zhD#GcZO5Vie|t-N-+zuvJtf=c5?M?@yB76hc$H;Fjj9ur?-_8`0$ei5VCY9Lk4lNs zClKCvlOY{~(tQixR`TilcZ7HtS&+`{?yG)RU1$IR{`~X+?{5tdQ~-Xa%KCofeO+Q6 z$P=@jJF@||LlbzHg>)C}_HJV8tLHO)B3=F625(=}xYD!$kbg~{sc)jhEIfGlt$C^` z{RaQUBB)~+;C42!{iy*ODQB5oo3n3=quND?*tu;gOlH(k6R80ejqtCA=K-T-X(&e0nw!MAEKvb%DziAmct&w9}_%qkpa;GEZO3Q_48v$FvrbZt@K9P4w5rBdUv3S8r8DB&MPWAgPo^2XDsx z4%cy(Huv%ZIBS$X!v&p?<7HKlzM!6$v$6H;%j^RK4TqiGBS5x%B!BkYD%OmF>3^0L-dwbUl_&DV zZ~y4P7iFZC%lVO>o(glFG9N;I%AgkUW{sa*`TfDg$oOxOp^+$2sONPvuwZA?^R%;D zb|+T+WI)-xoS0J-0VLcHDmL^RLZ|3wPxmL0sw5q+HVR$Hn$$zMR30`jNilE1u@rVd z48aZ%S%2x!)<-aD$$A&FTYC0AAxSry_Kf~ZXS>Z|b=U~;^!Y490*d_X=^6l;Ck#I? znXJS#c%!&wB9q{Y3?~Pm_F6Q@s*28ht=O-z$TnS89L^gIESdG@dZ-IgV`kH2c=Q)7 zR+1MItK}2APvD3HVEAPYQ!(dl@!?q8Mj1Lo8-GqEyrA!|lWulIcrjMs{CEZ+Zt}k= zpRZ5-EBet*z|1z@#;V4iYW&TPZmO0JLYLrd9Be>*;_nJ4CltLWx2NTPfH2v3ozbO-p{{O?Zs2xOo5TyhGE9{u#*oU9Cf0oJ<^^ zEqj<=ePEXWL;sMG_)m25vEk!*CO)z@{7ci0R=%tED|BN*He{RnYhij4YB6ZQpho&7 z_F$|1%*z+CibI~s%SQyPR38x+CIE*?4qwd7@Z#SSRsSb4f8Y@dw{p%jYl&?&Xn)3i zzDe{pe+72<4{nN89yxtzkY?WMndT(@86Nwjh1VTBzLl&18`=rfVlw{b%gCCW7ivHk zv&V}d>GFfmuV&r4olMuuj9gS6N^4MKgW*{-jfJxEE@QuupGr1FJebH|pChL-)*z#d z-LfjVCwg$A;BAX|wNtbAaU~=Q3V)sU3MaLn_jbRI$iJX6k+V8!X7@g7)s}V!T&|*c1LDp1q-9$~)pSmqzB_V8t23hv=7R-=0)} z@3!6P(dVO`%G*--r2x7p)-3M#mn&eyHokME@Nj=~*OYxL7)zKw$Kqdu59zoT)IOtInI9mhT4oZ?m`9z2}kN^K~0002Q(9}Bs delta 1782 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 THq!nZkO1ZX>OUse;THe^%LU?N delta 2874 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 Y>$vIhsv@w=el;^41B9BDPy(_z0JuMzfdBvi diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/icon_launcher.webp index 89a097bfa4aaf09534e57611378a2e8ac1dbdb07..18169b1e3ee78bdf6aa2db8f3e1cc7ff1e30b64a 100644 GIT binary patch delta 5174 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 diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml index 862c13a..be563f0 100644 --- a/app/src/main/res/values/color.xml +++ b/app/src/main/res/values/color.xml @@ -1,6 +1,6 @@ - #2964DA + #396BD0 #f8f8f8 @@ -25,6 +25,7 @@ #CC5155 #396BD0 #404145 + #5B5A5E #F9FAFB #FFFFFF diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 551a61e..3fcdd50 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -120,8 +120,8 @@ diff --git a/colorful/src/main/res/values/colors.xml b/colorful/src/main/res/values/colors.xml index e1cea37..6cc6200 100644 --- a/colorful/src/main/res/values/colors.xml +++ b/colorful/src/main/res/values/colors.xml @@ -4,8 +4,8 @@ - #2964DA - #2964DA + #396BD0 + #396BD0 #EBEBEB