From a00496579e2c744502ba77eeca40d492f8e0f875 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 08 八月 2024 11:56:37 +0800
Subject: [PATCH] 2024年08月08日11:56:30
---
app/src/main/res/layout/activity_set.xml | 4 +---
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java | 3 ++-
app/src/main/res/layout/activity_me_change_password.xml | 3 ++-
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 1 +
app/src/main/res/layout/activity_language_selection.xml | 7 +++++--
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 1 +
app/src/main/res/layout/activity_power_stations_list.xml | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 1 +
app/src/main/res/layout/activity_contact_us.xml | 2 +-
app/src/main/res/layout/activity_bind_phone.xml | 3 ++-
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 1 +
app/src/main/res/layout/activity_account_and_security.xml | 3 ++-
app/src/main/res/layout/activity_bind_mail.xml | 3 ++-
app/src/main/res/layout/activity_qr_code_main.xml | 3 ++-
app/src/main/res/layout/activity_as_regards.xml | 2 +-
app/src/main/res/layout/activity_web.xml | 2 +-
app/src/main/res/layout/activity_temperature_unit.xml | 3 ++-
app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 1 +
app/src/main/res/layout/activity_bpersonal_data.xml | 2 +-
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 1 +
app/src/main/res/layout/activity_personal_data.xml | 2 +-
27 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
index 64b6f23..e2b8729 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
@@ -84,6 +84,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_account_security);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
if (UserConfigManage.getInstance().isBAccount()) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index 3dbdeaf..ba40c24 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
@@ -129,6 +129,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_regard);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
viewBinding.asRegardsIconVersionsTv.setText(versionsStr);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
index 9768b01..43fde85 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
@@ -67,6 +67,7 @@
private void initView() {
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentMeRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index 0513ca6..d7b2fe8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
@@ -93,6 +93,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_mail);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index ae6e205..2f0cf99 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -102,6 +102,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_change_bind_phone_number);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
try {
Country.load(this);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index eba87a4..06c0052 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -162,6 +162,7 @@
private void initView() {
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me_personal_data);
viewBinding.toolbarTopFragmentMeRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentMeRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentMeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentMeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.personalDataUserPortraitIl.sllLlRlNameTv.setText(R.string.me_personal_data_portrait);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
index 5cbbb8b..bf8ad57 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java
@@ -116,6 +116,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.contact_us);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index e0f93c4..c693283 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
@@ -167,6 +167,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.home_login_change_password);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.meChangePasswordOldIc.mePswTitleTv.setText(R.string.home_login_old_pws);
viewBinding.meChangePasswordOldIc.mePswEt.setHint(R.string.home_login_input_old_pws);
viewBinding.meChangePasswordOldIc.lineV.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
index 3056f0c..78d99cb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -91,9 +91,10 @@
private void initView() {
viewBinding.toolbarTopQrCodeRl.topTitleTv.setText(R.string.qr_code_business_card);
viewBinding.toolbarTopQrCodeRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopQrCodeRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopQrCodeRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopQrCodeRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.toolbarTopQrCodeRl.topMoreIv.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopQrCodeRl.topMoreBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopQrCodeRl.topMoreIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.save_image));
if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) {
viewBinding.userNameTv.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index 3dba84b..256c0d7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -90,6 +90,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_set);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.setLanguageIl.sllLlRlNameTv.setText(R.string.set_multilingual);
viewBinding.setAccountSecurityIl.sllLlRlNameTv.setText(R.string.set_account_security);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
index 7550b57..5a13871 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/TemperatureUnitActivity.java
@@ -114,6 +114,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_temperature_unit);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
languageAdapter = new LanguageAdapter(this.mList, _mActivity);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index de41ee8..03b6e9c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
@@ -61,6 +61,7 @@
}
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index 9dea7cb..b7f971a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -184,6 +184,7 @@
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.set_language_choice);
viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopFragmentHouseListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
LinearLayoutManager linearLayout = new LinearLayoutManager(_mActivity);
languageAdapter = new LanguageAdapter(this.list, _mActivity);
diff --git a/app/src/main/res/layout/activity_account_and_security.xml b/app/src/main/res/layout/activity_account_and_security.xml
index 4811c11..c4d0f3f 100644
--- a/app/src/main/res/layout/activity_account_and_security.xml
+++ b/app/src/main/res/layout/activity_account_and_security.xml
@@ -9,7 +9,8 @@
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
+
<include
diff --git a/app/src/main/res/layout/activity_as_regards.xml b/app/src/main/res/layout/activity_as_regards.xml
index ab6a5d0..01e0c7d 100644
--- a/app/src/main/res/layout/activity_as_regards.xml
+++ b/app/src/main/res/layout/activity_as_regards.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<ImageView
android:id="@+id/as_regards_icon_iv"
diff --git a/app/src/main/res/layout/activity_bind_mail.xml b/app/src/main/res/layout/activity_bind_mail.xml
index 0977f7d..586242a 100644
--- a/app/src/main/res/layout/activity_bind_mail.xml
+++ b/app/src/main/res/layout/activity_bind_mail.xml
@@ -4,11 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.me.BindMailActivity">
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<RelativeLayout
android:id="@+id/bind_mail_parent_rl"
diff --git a/app/src/main/res/layout/activity_bind_phone.xml b/app/src/main/res/layout/activity_bind_phone.xml
index 159a9ab..9220f5f 100644
--- a/app/src/main/res/layout/activity_bind_phone.xml
+++ b/app/src/main/res/layout/activity_bind_phone.xml
@@ -4,11 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.me.BindPhoneActivity">
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<RelativeLayout
android:id="@+id/bind_area_parent_rl"
diff --git a/app/src/main/res/layout/activity_bpersonal_data.xml b/app/src/main/res/layout/activity_bpersonal_data.xml
index 1f1645a..f8d3e65 100644
--- a/app/src/main/res/layout/activity_bpersonal_data.xml
+++ b/app/src/main/res/layout/activity_bpersonal_data.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar_top_fragment_me_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<LinearLayout
android:id="@+id/personal_data_ll"
diff --git a/app/src/main/res/layout/activity_contact_us.xml b/app/src/main/res/layout/activity_contact_us.xml
index 3e45303..a55e3d1 100644
--- a/app/src/main/res/layout/activity_contact_us.xml
+++ b/app/src/main/res/layout/activity_contact_us.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<RelativeLayout
android:id="@+id/wechat_id_rl"
diff --git a/app/src/main/res/layout/activity_language_selection.xml b/app/src/main/res/layout/activity_language_selection.xml
index ec64668..b625e22 100644
--- a/app/src/main/res/layout/activity_language_selection.xml
+++ b/app/src/main/res/layout/activity_language_selection.xml
@@ -6,10 +6,13 @@
android:layout_height="match_parent"
android:background="@color/text_F5F7FA"
tools:context=".ui.me.languageSelectionActivity">
-
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
+
+<!-- <include-->
+<!-- android:id="@+id/toolbar_top_fragment_house_list_rl"-->
+<!-- layout="@layout/toolbar_top_view_52" />-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/language_rc"
diff --git a/app/src/main/res/layout/activity_me_change_password.xml b/app/src/main/res/layout/activity_me_change_password.xml
index 29f57fc..af1f41c 100644
--- a/app/src/main/res/layout/activity_me_change_password.xml
+++ b/app/src/main/res/layout/activity_me_change_password.xml
@@ -4,11 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.me.MeChangePasswordActivity">
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<LinearLayout
android:id="@+id/me_psw_ll"
diff --git a/app/src/main/res/layout/activity_personal_data.xml b/app/src/main/res/layout/activity_personal_data.xml
index 989c73d..a4c7f66 100644
--- a/app/src/main/res/layout/activity_personal_data.xml
+++ b/app/src/main/res/layout/activity_personal_data.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar_top_fragment_me_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<LinearLayout
android:id="@+id/personal_data_ll"
diff --git a/app/src/main/res/layout/activity_power_stations_list.xml b/app/src/main/res/layout/activity_power_stations_list.xml
index e8ddd13..f2bbc0a 100644
--- a/app/src/main/res/layout/activity_power_stations_list.xml
+++ b/app/src/main/res/layout/activity_power_stations_list.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_EDEFF2"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.newC.PowerStationsListEdit">
<include
diff --git a/app/src/main/res/layout/activity_qr_code_main.xml b/app/src/main/res/layout/activity_qr_code_main.xml
index 77ede1c..24e3cd4 100644
--- a/app/src/main/res/layout/activity_qr_code_main.xml
+++ b/app/src/main/res/layout/activity_qr_code_main.xml
@@ -4,11 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.me.QrCodeMainActivity">
<include
android:id="@+id/toolbar_top_qr_code_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<ImageView
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index f8e3234..5a9dfd0 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -6,11 +6,9 @@
android:layout_height="match_parent"
android:background="@color/text_F5F7FA"
tools:context=".ui.me.SetActivity">
-
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
-
+ layout="@layout/toolbar_top_view_44" />
<ScrollView
android:id="@+id/set_sll"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_temperature_unit.xml b/app/src/main/res/layout/activity_temperature_unit.xml
index 574430c..e225775 100644
--- a/app/src/main/res/layout/activity_temperature_unit.xml
+++ b/app/src/main/res/layout/activity_temperature_unit.xml
@@ -4,11 +4,12 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_F5F7FA"
tools:context=".ui.me.TemperatureUnitActivity">
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/language_rc"
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
index 5ffb04b..5fa969d 100644
--- a/app/src/main/res/layout/activity_web.xml
+++ b/app/src/main/res/layout/activity_web.xml
@@ -9,7 +9,7 @@
<include
android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ layout="@layout/toolbar_top_view_44" />
<WebView
android:id="@+id/content_view"
--
Gitblit v1.8.0