From 3b1960c6ea67b0538b6103c68a3b9468e2708d52 Mon Sep 17 00:00:00 2001
From: SKULSHADY <anushekprasal@gmail.com>
Date: Thu, 3 Feb 2022 20:48:33 +0100
Subject: [PATCH] NetworkTraffic: Show single traffic for statusbar & allow
 custom font size [2/2]. Based on commits by idoybh, SKULSHADY and SDB: *
 https://github.com/pixeldust-project-caf/android_packages_apps_PixelDustSettings/commit/8f52988
 *
 https://github.com/pixeldust-project-caf/android_packages_apps_PixelDustSettings/commit/0a5424b
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ido Ben-Hur <idoybh2@gmail.com>
Co-authored-by: SuperDroidBond <superdroidbond@yahoo.com>
Signed-off-by: spezi77 <spezi7713@gmx.net>
Change-Id: I26c826066569af2cb07c2a9e6c03f6c71f8a18f7
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                  |  1 +
 res/xml/cherish_settings_traffic.xml            | 10 +++++++++-
 .../settings/fragments/fragments/Traffic.java   | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 8263c33..b18bca9 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -512,5 +512,6 @@
     <string name="network_traffic_dynamic">Dynamic</string>
     <string name="network_traffic_download">Download</string>
     <string name="network_traffic_upload">Upload</string>
+    <string name="network_traffic_font_size">Single net font size</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_traffic.xml b/res/xml/cherish_settings_traffic.xml
index e612bf9..3694861 100644
--- a/res/xml/cherish_settings_traffic.xml
+++ b/res/xml/cherish_settings_traffic.xml
@@ -51,4 +51,12 @@
         settings:units="sec"
         android:defaultValue="1" />
 
-</PreferenceScreen>
\ No newline at end of file
+    <com.cherish.settings.preferences.CustomSeekBarPreference
+        android:key="network_traffic_font_size"
+        android:title="@string/network_traffic_font_size"
+        android:max="20"
+        android:min="12"
+        settings:defaultValue="18"
+        settings:units="dp" />
+
+</PreferenceScreen>
diff --git a/src/com/cherish/settings/fragments/fragments/Traffic.java b/src/com/cherish/settings/fragments/fragments/Traffic.java
index 493832c..3d00b86 100644
--- a/src/com/cherish/settings/fragments/fragments/Traffic.java
+++ b/src/com/cherish/settings/fragments/fragments/Traffic.java
@@ -59,10 +59,12 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
     private static final String NETWORK_TRAFFIC_AUTOHIDE_THRESHOLD = "network_traffic_autohide_threshold";
     private static final String NETWORK_TRAFFIC_LOCATION = "network_traffic_location";
     private static final String NETWORK_TRAFFIC_REFRESH_INTERVAL = "network_traffic_refresh_interval";
+    private static final String NETWORK_TRAFFIC_FONT_SIZE  = "network_traffic_font_size";
 
     private CustomSeekBarPreference mThreshold;
     private SystemSettingSeekBarPreference mInterval;
     private ListPreference mNetTrafficLocation;
+    private CustomSeekBarPreference mNetTrafficSize;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -91,6 +93,12 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
         mInterval.setValue(val);
         mInterval.setOnPreferenceChangeListener(this);
 
+        int fontSize = Settings.System.getInt(resolver,
+                Settings.System.NETWORK_TRAFFIC_FONT_SIZE, 18);
+        mNetTrafficSize = (CustomSeekBarPreference) findPreference(NETWORK_TRAFFIC_FONT_SIZE);
+        mNetTrafficSize.setValue(fontSize / 1);
+        mNetTrafficSize.setOnPreferenceChangeListener(this);
+
         int netMonitorEnabled = Settings.System.getIntForUser(resolver,
                 Settings.System.NETWORK_TRAFFIC_STATE, 0, UserHandle.USER_CURRENT);
         if (netMonitorEnabled == 1) {
@@ -145,6 +153,11 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
                     Settings.System.NETWORK_TRAFFIC_REFRESH_INTERVAL, val,
                     UserHandle.USER_CURRENT);
             return true;
+        }  else if (preference == mNetTrafficSize) {
+            int fontSize = ((Integer)objValue).intValue();
+            Settings.System.putInt(getActivity().getContentResolver(),
+                    Settings.System.NETWORK_TRAFFIC_FONT_SIZE, fontSize);
+            return true;
         }
         return false;
     }
@@ -154,11 +167,15 @@ public class Traffic extends SettingsPreferenceFragment implements OnPreferenceC
             case 0:
                 mThreshold.setEnabled(false);
                 mInterval.setEnabled(false);
+                mNetTrafficSize.setEnabled(false);
                 break;
             case 1:
+                mNetTrafficSize.setEnabled(true);
+                break;
             case 2:
                 mThreshold.setEnabled(true);
                 mInterval.setEnabled(true);
+                mNetTrafficSize.setEnabled(false);
                 break;
             default:
                 break;