diff --git a/app/src/main/java/com/bingce/controlnetwork/App.java b/app/src/main/java/com/bingce/controlnetwork/App.java index fc35294..901b971 100644 --- a/app/src/main/java/com/bingce/controlnetwork/App.java +++ b/app/src/main/java/com/bingce/controlnetwork/App.java @@ -9,6 +9,7 @@ import android.text.TextUtils; import android.util.Log; import android.widget.ImageView; +import androidx.appcompat.app.AppCompatDelegate; import androidx.preference.PreferenceManager; import com.bingce.AppChannel; @@ -143,6 +144,12 @@ public class App extends RepositoryBaseApp { .translucent(false) .dark(SettingValueUtil.isThemeDark()); Colorful.init(this); + + if (SettingValueUtil.isThemeDark()) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + } else { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + } } private void restorePrefs() { diff --git a/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt b/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt index 1971a05..1004964 100644 --- a/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt +++ b/app/src/main/java/com/bingce/controlnetwork/newui/mefragment/MeFragment.kt @@ -84,8 +84,6 @@ class MeFragment : BaseFragmentBinding() { } mBinding.llAbout.setOnClickListener { //关于 - Log.d("hwhw", "ss" + 5 / 0) - startActivity(Intent(requireContext(), AboutActivity::class.java)) } mBinding.llUser.setOnClickListener { diff --git a/app/src/main/res/layout/fragment_project_detail_list_layout.xml b/app/src/main/res/layout/fragment_project_detail_list_layout.xml index 7e61924..0f31eb8 100644 --- a/app/src/main/res/layout/fragment_project_detail_list_layout.xml +++ b/app/src/main/res/layout/fragment_project_detail_list_layout.xml @@ -16,6 +16,7 @@ android:elevation="@dimen/default_elevation" app:dividerVisible="invisible" app:text="@string/control_point" + app:text_color="@color/text_color_1" app:text_size="@dimen/middle_text" /> + android:textSize="@dimen/middle_text" + app:text_color="@color/text_color_1" /> + diff --git a/app/src/main/res/layout/fragment_project_list.xml b/app/src/main/res/layout/fragment_project_list.xml index 13c2748..06c9e11 100644 --- a/app/src/main/res/layout/fragment_project_list.xml +++ b/app/src/main/res/layout/fragment_project_list.xml @@ -1,6 +1,5 @@ diff --git a/app/src/main/res/layout/new_fragment_me.xml b/app/src/main/res/layout/new_fragment_me.xml index b1fde8b..b684587 100644 --- a/app/src/main/res/layout/new_fragment_me.xml +++ b/app/src/main/res/layout/new_fragment_me.xml @@ -2,6 +2,7 @@ diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..657c64e --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,10 @@ + + + #444444 + + #ffffff + #303030 + #fff + #33ffffff + + \ No newline at end of file diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml index d5b392f..e0ca120 100644 --- a/app/src/main/res/values/color.xml +++ b/app/src/main/res/values/color.xml @@ -10,4 +10,7 @@ #AAA #00B050 #FFFF00 + #33333333 + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9d6826b..2efe196 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -37,7 +37,7 @@ @color/material_drawer_dark_header_selection_text - @color/white + @drawable/bg_splash