universal7885: parts: Show free space and swapfile size

universal7885-common/apps/SamsungParts/jni/Storage.cpp

@@ -0,0 +1,21 @@
+#include <filesystem>
+#include <sys/stat.h>
+#include <jni.h>
+
+namespace fs = std::filesystem;
+
+extern "C" JNIEXPORT jdouble JNICALL
+Java_com_eurekateam_samsungextras_interfaces_Swap_getFreeSpace(
+	JNIEnv *env, jclass clazz) {
+	fs::space_info data = fs::space("/data");
+	auto freespace = data.free / 1024 / 1024;
+	return static_cast<double>(freespace) / 1024;
+}
+
+extern "C" JNIEXPORT jlong JNICALL
+Java_com_eurekateam_samsungextras_interfaces_Swap_getSwapSize(
+	JNIEnv *env, jclass clazz){
+	struct stat stat_buf;
+	int rc = stat("/data/swap/swapfile", &stat_buf);
+	return rc == 0 ? stat_buf.st_size / 1024 / 1024 : -1;
+}

universal7885-common/apps/SamsungParts/res/values/strings.xml

@@ -61,6 +61,9 @@
 	<string name="swap_size_title">Swap size</string>
 	<string name="swap_size_summary">Adjust the size of swap</string>
 	<string name="swap_description">Creates the swap (not zram) on /data partiton. Useful for low memory devices.</string>
+	<string name="free_space">Free space on /data</string>
+	<string name="swap_file_size">Swap file size</string>
+
 	<!-- Display Category -->
 	<string name="misc_category">Misc</string>
 	<string name="dt2w_mode">Toggle for double tap to wake</string>

universal7885-common/apps/SamsungParts/res/xml/swap_settings.xml

@@ -2,5 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/swap_title">
 	<com.android.settingslib.widget.MainSwitchPreference android:defaultValue="false" android:key="swap_enable" android:title="@string/swap_enable_title"/>
 	<SeekBarPreference android:key="swap_size" android:title="@string/swap_size_title" android:icon="@drawable/ic_memory" android:summary="@string/swap_size_summary"/>
+	<Preference android:key="free_space" android:title="@string/free_space" android:selectable="false"/>
+	<Preference android:key="swap_file_size" android:title="@string/swap_file_size" android:selectable="false"/>
 	<com.android.settingslib.widget.FooterPreference android:title="@string/swap_description" android:selectable="false"/>
 </PreferenceScreen>

universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/BootReceiver.kt

@@ -9,11 +9,11 @@ import com.eurekateam.samsungextras.battery.BatteryFragment
 import com.eurekateam.samsungextras.dolby.DolbyCore
 import com.eurekateam.samsungextras.dolby.DolbyFragment
 import com.eurekateam.samsungextras.flashlight.FlashLightFragment
-import com.eurekateam.samsungextras.swap.SwapFragment
 import com.eurekateam.samsungextras.interfaces.Battery
 import com.eurekateam.samsungextras.interfaces.Display
 import com.eurekateam.samsungextras.interfaces.Flashlight
 import com.eurekateam.samsungextras.interfaces.Swap
+import com.eurekateam.samsungextras.swap.SwapFragment
 
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(p0: Context?, p1: Intent?) {
@@ -42,9 +42,9 @@ class BootReceiver : BroadcastReceiver() {
 
                 // FlashLight
                 Flashlight.setFlash(mSharedPreferences.getInt(FlashLightFragment.PREF_FLASHLIGHT, 5))
-	   // ZRAM
+                // ZRAM
-	    Swap.setSize(mSharedPreferences.getInt(SwapFragment.PREF_SWAP_SIZE, 50))
+                Swap.setSize(mSharedPreferences.getInt(SwapFragment.PREF_SWAP_SIZE, 50))
-	    Swap.setSwapOn(mSharedPreferences.getBoolean(SwapFragment.PREF_SWAP_ENABLE, false))
+                Swap.setSwapOn(mSharedPreferences.getBoolean(SwapFragment.PREF_SWAP_ENABLE, false))
 
                 // Display
                 Display.DT2W = mSharedPreferences.getBoolean(DeviceSettings.PREF_DOUBLE_TAP, true)

universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/battery/BatteryFragment.kt

@@ -61,8 +61,7 @@ class BatteryFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChang
             mSharedPreferences.edit().putBoolean(PREF_CHARGE, Battery.chargeSysfs == 0).apply()
             return true
         } else if (preference == mFastChargePref) {
-            Battery.setFastCharge(if (newValue as Boolean) 0 else 1) 
+            Battery.setFastCharge(if (newValue as Boolean) 0 else 1) mFastChargePref.isChecked = Battery.fastChargeSysfs == 0
-	mFastChargePref.isChecked = Battery.fastChargeSysfs == 0
             mSharedPreferences.edit().putBoolean(PREF_FASTCHARGE, Battery.fastChargeSysfs == 0).apply()
         }
         return false

universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Flashlight.kt

@@ -19,4 +19,5 @@ package com.eurekateam.samsungextras.interfaces
 object Flashlight {
     external fun setFlash(value: Int)
     external fun getFlash(isA10: Int): Int
-    external fun setEnabled(enable: Boolean) }
+    external fun setEnabled(enable: Boolean)
+}

universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/interfaces/Swap.kt

@@ -16,7 +16,9 @@
 
 package com.eurekateam.samsungextras.interfaces
 
-object Swap{
+object Swap {
-	external fun setSwapOn(mEnabled: Boolean)
+    external fun setSwapOn(mEnabled: Boolean)
-	external fun setSize(mSize : Int)
+    external fun setSize(mSize: Int)
+    external fun getFreeSize(): Double
+    external fun getSwapSize(): Long
 }

universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/swap/SwapFragment.kt

@@ -16,7 +16,6 @@
 package com.eurekateam.samsungextras.swap
 
 import android.content.SharedPreferences
-import android.os.Build
 import android.os.Bundle
 import android.widget.Switch
 import androidx.preference.Preference
@@ -27,11 +26,14 @@ import com.android.settingslib.widget.MainSwitchPreference
 import com.android.settingslib.widget.OnMainSwitchChangeListener
 import com.eurekateam.samsungextras.R
 import com.eurekateam.samsungextras.interfaces.Swap
+import java.lang.Thread
 
 class SwapFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeListener, OnMainSwitchChangeListener {
     private lateinit var mSwapSizePref: SeekBarPreference
     private lateinit var mSharedPreferences: SharedPreferences
     private lateinit var mSwapEnable: MainSwitchPreference
+    private lateinit var mFreeSpace: Preference
+    private lateinit var mSwapFileSize: Preference
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.swap_settings)
         mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
@@ -44,6 +46,10 @@ class SwapFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeLi
         mSwapEnable.isChecked = mSharedPreferences.getBoolean(PREF_SWAP_ENABLE, false)
         mSwapEnable.addOnSwitchChangeListener(this)
         mSwapSizePref.isEnabled = !mSwapEnable.isChecked
+        mFreeSpace = findPreference(INFO_FREE_SPACE)!!
+        mFreeSpace.summary = "${Swap.getFreeSpace()} GB"
+        mSwapFileSize = findPreference(INFO_SWAP_FILE_SIZE)!!
+        mSwapFileSize.summary = "${Swap.getSwapSize()} MB"
     }
 
     override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
@@ -51,19 +57,27 @@ class SwapFragment : PreferenceFragmentCompat(), Preference.OnPreferenceChangeLi
             val value = newValue as Int
             Swap.setSize(value)
             mSharedPreferences.edit().putInt(PREF_SWAP_SIZE, value).apply()
+            mFreeSpace.summary = "${Swap.getFreeSpace()} GB"
+            mSwapFileSize.summary = "${Swap.getSwapSize()} MB"
             return true
         }
         return false
     }
 
     override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
-    	Swap.setSwapOn(isChecked)
+        mSwapEnable.isEnabled = false
-        mSharedPreferences.edit().putBoolean(PREF_SWAP_ENABLE, isChecked).apply()
+        Thread {
-        mSwapSizePref.isEnabled = !isChecked
+            Swap.setSwapOn(isChecked)
-    } 
+            requireActivity().runOnUiThread {
-    
+                mSwapEnable.isEnabled = true
-    companion object {
+                mSharedPreferences.edit().putBoolean(PREF_SWAP_ENABLE, isChecked).apply()
+                mSwapSizePref.isEnabled = !isChecked
+            }
+        }.start()
+    } companion object {
         const val PREF_SWAP_SIZE = "swap_size"
         const val PREF_SWAP_ENABLE = "swap_enable"
+        const val INFO_FREE_SPACE = "free_space"
+        const val INFO_SWAP_FILE_SIZE = "swap_file_size"
     }
 }