From 14ccd9e9eb1f078ffd4e0a43942d9e7867d0c1c4 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 16 Aug 2018 11:12:18 +0800 Subject: [PATCH] Add night mode support --- .../src/main/java/be/mygod/vpnhotspot/MainActivity.kt | 2 +- .../be/mygod/vpnhotspot/client/ClientsFragment.kt | 2 +- mobile/src/main/res/layout/activity_main.xml | 2 +- mobile/src/main/res/layout/listitem_manage.xml | 2 +- mobile/src/main/res/values-night/colors.xml | 6 ++++++ mobile/src/main/res/values-night/styles.xml | 4 ++++ mobile/src/main/res/values/colors.xml | 4 ++-- mobile/src/main/res/values/styles.xml | 11 +++++++---- 8 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 mobile/src/main/res/values-night/colors.xml create mode 100644 mobile/src/main/res/values-night/styles.xml diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt index c44c6498..ad31efa2 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt @@ -46,7 +46,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS if (savedInstanceState == null) displayFragment(TetheringFragment()) badge = QBadgeView(this) badge.bindTarget((binding.navigation.getChildAt(0) as BottomNavigationMenuView).getChildAt(1)) - badge.badgeBackgroundColor = ContextCompat.getColor(this, R.color.colorAccent) + badge.badgeBackgroundColor = ContextCompat.getColor(this, R.color.colorSecondary) badge.badgeTextColor = ContextCompat.getColor(this, R.color.primary_text_default_material_light) badge.badgeGravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL badge.setGravityOffset(16f, 0f, true) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt index 1b4745cb..be75b8e0 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt @@ -45,7 +45,7 @@ class ClientsFragment : Fragment(), ServiceConnection { binding.clients.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false) binding.clients.itemAnimator = DefaultItemAnimator() binding.clients.adapter = adapter - binding.swipeRefresher.setColorSchemeResources(R.color.colorAccent) + binding.swipeRefresher.setColorSchemeResources(R.color.colorSecondary) binding.swipeRefresher.setOnRefreshListener { IpNeighbourMonitor.instance?.flush() } diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml index f09f977e..f9f76ad5 100644 --- a/mobile/src/main/res/layout/activity_main.xml +++ b/mobile/src/main/res/layout/activity_main.xml @@ -45,7 +45,7 @@ android:id="@+id/line" android:layout_width="0dp" android:layout_height="0.1px" - android:background="@color/navigationBarColor" + android:background="?android:attr/navigationBarColor" android:elevation="9dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/mobile/src/main/res/layout/listitem_manage.xml b/mobile/src/main/res/layout/listitem_manage.xml index 2e69cd8b..9b9b861c 100644 --- a/mobile/src/main/res/layout/listitem_manage.xml +++ b/mobile/src/main/res/layout/listitem_manage.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/ic_content_add" - android:tint="@color/colorAccent"/> + android:tint="@color/colorSecondary"/> + + #2e7d32 + #005005 + #AEEA00 + diff --git a/mobile/src/main/res/values-night/styles.xml b/mobile/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..30c39d2d --- /dev/null +++ b/mobile/src/main/res/values-night/styles.xml @@ -0,0 +1,4 @@ + + + + +