Merge pull request #4 from DavideAG/fix/code_improvements

Release 1.0.0 🎉

Author: DavideAG

.idea/deploymentTargetDropDown.xml

@@ -1,13 +1,22 @@
+## 1.0.0 (November, 10, 2023)
+
+- add cpu core spinner support
+
+## 0.6.0 (November, 7, 2023)
+
+- update to JDK 17 and Gradle 7.5
+- fix bug about free disk space
+
 ## 0.5.4 (April, 27, 2022)
 
 - added a method to show free disk space in a more human friendly way
 
 ## 0.5.3 (April, 27, 2021)
 
-* Defined layout for settings page
-* created author ref to http://giorgiodavide.it with "Open on Phone" animation
-* added spinner for CPUs in order to compute the CPU usage in the correct way (default disabled)
-* added app version information in the setting page
+- Defined layout for settings page
+- created author ref to http://giorgiodavide.it with "Open on Phone" animation
+- added spinner for CPUs in order to compute the CPU usage in the correct way (default disabled)
+- added app version information in the setting page
 
 ## 0.5.2 (July, 14, 2020)
 

.idea/misc.xml

@@ -15,34 +15,36 @@ NcMonitor is a native [WearOS](https://wearos.google.com/#hands-free-help) appli
 </p>
 
 ## Displayed metrics :mag:
-Currently this application is still under development and the information that are displayed are:
+The goal of this application is to provide information about your NC instance:
 
 - CPU usage (last-minute)
 - RAM usage
 - SWAP usage
 - Disk free space
 
-The final goal is to provide to the user more information about the Nc instance. In the future more metrics will be added.
-
-Data are retrived from [Nextcloud/serverinfo](https://github.com/nextcloud/serverinfo).
+Data are retrived from [Nextcloud/serverinfo](https://github.com/nextcloud/serverinfo) and we will provide more metrics when available.
 
 ## How to use it :question:
-To use the application you have to install the application (see Project status) and then you have to log-in in your Nc server using:
+The application requires basic authentication to communicate with the server and get back the metrics from [Nextcloud/serverinfo](https://github.com/nextcloud/serverinfo). During the first start it will require:
 
 - select your HyperText Transfer Protocol (`http` or `https`)
-- server URL (e.g. myserver.com)
+- server URL (e.g. `myserver.com`)
 - Nextcloud username
 - Nextcloud password
 
+### CPU Cores
+To calculate the app's total CPU load percentage, it requires information about the number of CPU cores in your NC instance, which is set to a default value of 4. You can modify this setting through the configuration panel.
+
 ## Changelog
 Changelog information are reported [here](https://github.com/DavideAG/NcMonitor/blob/master/CHANGELOG.md).
 
-## Project status :hammer_and_wrench:
-This application is in `beta` phase and is working but it is not yet released in Google Play Store.
-If you want to use this application you can download the `apk` in the release section of this repository or you can manually build the project.
+## Project status
+The application has not been officially launched on the Google Play Store yet. To access and use the application, you can download the APK from the release section of this repository, or alternatively, you have the option to manually build the project. The initial release will soon be made available on the Google Play Store.
+
+Please contact me if you have any problem with this installation process.
 
 ## License :scroll:
 This application is licensed under the `AGPLv3`
 
 ## Contact
-Any comment or idea about the project is appreciated. You can ping me at [davide@giorgiodavide.it](mailto:davide@giorgiodavide.it?subject=[GitHub]%20NcMonitor)
+Any comment or idea about the project is appreciated, feel free to ping me at [davide@giorgiodavide.it](mailto:davide@giorgiodavide.it?subject=[GitHub]%20NcMonitor) or open an issue on GitHub.

CHANGELOG.md

@@ -10,7 +10,7 @@ android {
         minSdkVersion 25
         targetSdkVersion 30
         versionCode 8
-        versionName "0.5.4"
+        versionName "1.0.0"
     }
 
     buildTypes {
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'davideag.wearos.ncmonitor'
 }
 
 dependencies {

README.md

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="davideag.wearos.ncmonitor">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />

app/build.gradle

@@ -40,13 +40,14 @@ import okhttp3.Response
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
+import java.net.HttpURLConnection
+
 
 
 const val SERVERINFO_API = "ocs/v2.php/apps/serverinfo/api/v1/info?format=json"
 const val PERMISSION_REQUEST = 10
 const val PREF_KEY = "profile"
 const val PREF_NAME = "USER"
-const val OK_200 = 200
 
 
 class LoginActivity : WearableActivity()
@@ -139,8 +140,8 @@ class LoginActivity : WearableActivity()
     }
 
     /* This method is used to request the server status to your
-     * NC instance. Then, if the result code is OK_200, results
-     * are passed to the next activity.
+     * NC instance. Then, if the return code is HttpURLConnection.HTTP_OK
+     * results are passed to the next activity.
      */
     private fun requestNcStatus(serverURL: String, username: String, password: String, domain: String, context: Context)
     {
@@ -157,7 +158,7 @@ class LoginActivity : WearableActivity()
                     val metaObject = responseObject.getJSONObject("meta")
                     val statusCode = metaObject.getInt("statuscode")
 
-                    if (statusCode == OK_200) {
+                    if (statusCode == HttpURLConnection.HTTP_OK) {
                         val userInfo = JSONObject()
                         userInfo.put("serverURL", serverURL)
                         userInfo.put("username", username)

app/src/main/AndroidManifest.xml

@@ -28,11 +28,13 @@ import android.view.View
 import kotlinx.android.synthetic.main.activity_main.*
 import org.json.JSONException
 import org.json.JSONObject
-import kotlin.math.roundToInt
+import java.net.HttpURLConnection
+
 
 
 const val Byte = 1024
-const val N_CORES = 4   /* number of cores in your server. 4 for RPi4. */
+var N_CORES = 4   /* number of cores in your server. 4 for RPi4. */
+var CPU_LOAD = 0.0
 
 
 class MainActivity : WearableActivity()
@@ -63,6 +65,14 @@ class MainActivity : WearableActivity()
         }
     }
 
+    /* Refresh the cpu_load_placeholder with the new N_CORES.
+     * We need to handle the new number of CPU cores to compute the CPU load
+     */
+    override fun onRestart() {
+        super.onRestart()
+        cpu_load_placeholder.text = "%.2f".format((CPU_LOAD / N_CORES) * 100)
+    }
+
     /* This method shows the results retrieved from
      * the server. View are populated correctly.
      * In case of error a message is displayed
@@ -78,32 +88,32 @@ class MainActivity : WearableActivity()
 
             val responseObject = json.getJSONObject("ocs")
             val metaObject = responseObject.getJSONObject("meta")
-
             val statusCode = metaObject.getInt("statuscode")
 
-            if (statusCode == 200) {
+            if (statusCode == HttpURLConnection.HTTP_OK) {
                 status_code_response_layout.visibility = View.GONE
                 status_message_response_layout.visibility = View.GONE
                 server_name_url.visibility = View.VISIBLE
                 server_name_url.text = serverURL
 
-                val dataObject =  responseObject.getJSONObject("data")
-                val nextcloudObject =  dataObject.getJSONObject("nextcloud")
-                val systemObject =  nextcloudObject.getJSONObject("system")
+                val dataObject = responseObject.getJSONObject("data")
+                val nextcloudObject = dataObject.getJSONObject("nextcloud")
+                val systemObject = nextcloudObject.getJSONObject("system")
 
                 // cpu load
-                var cpuLoad = systemObject.getJSONArray("cpuload")[0]
-                if (cpuLoad is Int) cpuLoad = cpuLoad.toDouble()
+                CPU_LOAD = systemObject.getJSONArray("cpuload")[0] as Double
+                //var cpuLoad = systemObject.getJSONArray("cpuload")[0]
+                //if (CPU_LOAD is Int) CPU_LOAD = CPU_LOAD
                 // ram
                 val ramTotal = systemObject.getLong("mem_total")
                 val ramFree = systemObject.getLong("mem_free")
                 // swap
                 val swapTotal = systemObject.getLong("swap_total")
                 val swapFree = systemObject.getLong("swap_free")
                 // disk
-                val diskFree = systemObject.getDouble("freespace")
+                val diskFree = systemObject.getLong("freespace")
 
-                updateViews(cpuLoad as Double, ramTotal-ramFree, ramTotal,
+                updateViews(ramTotal-ramFree, ramTotal,
                     swapTotal-swapFree, swapTotal, diskFree)
 
             } else {
@@ -130,22 +140,18 @@ class MainActivity : WearableActivity()
      * using the information coming from the server.
      */
     private fun updateViews(
-        cpuLoad: Double,
         ramBusy: Long,
         ramTotal: Long,
         swapBusy: Long,
         swapTotal: Long,
-        diskFree: Double)
+        diskFree: Long)
     {
 
         // Todo: to move as option and let this. We can't supposing the number of cpu cores
         //       and it has to be specified by the final user using a specific option menu.
-        // cpu_load_placeholder.text = cpuLoad.toString()
-
-        val cpuLoad3Digit = (((cpuLoad * 100) / N_CORES) * 1000.0).roundToInt() / 1000.0
-        val cpuLoad2Digit = (cpuLoad3Digit * 100.0).roundToInt() / 100.0
+        val cpuLoadPercentage = (CPU_LOAD / N_CORES) * 100
 
-        cpu_load_placeholder.text =  cpuLoad2Digit.toString()
+        cpu_load_placeholder.text =  "%.2f".format(cpuLoadPercentage)
         ram_used_placeholder.text = (ramBusy / Byte).toString()
         ram_total_placeholder.text = (ramTotal / Byte).toString()
         swap_used_placeholder.text = (swapBusy / Byte).toString()
@@ -159,15 +165,16 @@ class MainActivity : WearableActivity()
     /* This function is used to convert the free disk
      * space in an human friendly measure
      */
-    private fun humanReadableByteCountBin(bytes: Double): Pair<String, String> {
+    private fun humanReadableByteCountBin(bytes: Long): Pair<String, String> {
         return when {
-            bytes == Double.MIN_VALUE || bytes < 0 -> Pair("N/A", "")
+            bytes == Long.MIN_VALUE || bytes < 0 -> Pair("N/A", "")
             bytes < 1024L -> Pair("$bytes", "B")
-            bytes <= 0xfffccccccccccccL shr 40 -> Pair("%.1f".format(bytes / (0x1 shl 10)), "KiB")
-            bytes <= 0xfffccccccccccccL shr 30 -> Pair("%.1f".format(bytes / (0x1 shl 20)), "MiB")
-            bytes <= 0xfffccccccccccccL shr 20 -> Pair("%.1f".format(bytes / (0x1 shl 30)), "GiB")
-            bytes <= 0xfffccccccccccccL shr 10 -> Pair("%.1f".format(bytes / (0x1 shl 40)), "TiB")
-            else -> Pair("N/A", "")
+            bytes <= 0xfffccccccccccccL shr 40 -> Pair("%.1f".format(bytes.toDouble() / (0x1 shl 10)), "KiB")
+            bytes <= 0xfffccccccccccccL shr 30 -> Pair("%.1f".format(bytes.toDouble() / (0x1 shl 20)), "MiB")
+            bytes <= 0xfffccccccccccccL shr 20 -> Pair("%.1f".format(bytes.toDouble() / (0x1 shl 30)), "GiB")
+            bytes <= 0xfffccccccccccccL shr 10 -> Pair("%.1f".format(bytes.toDouble() / (0x1 shl 40)), "TiB")
+            bytes <= 0xfffccccccccccccL -> Pair("%.1f".format((bytes shr 10).toDouble() / (0x1 shl 40)), "PiB")
+            else -> Pair("%.1f".format((bytes shr 20).toDouble() / (0x1 shl 40)), "EiB")
         }
     }
 }

app/src/main/java/davideag/wearos/ncmonitor/LoginActivity.kt

@@ -25,12 +25,19 @@ import android.net.Uri
 import android.os.Bundle
 import android.support.wearable.activity.ConfirmationActivity
 import android.support.wearable.activity.WearableActivity
+import android.util.Log
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.SpinnerAdapter
 import com.google.android.wearable.intent.RemoteIntent
+import kotlinx.android.synthetic.main.activity_main.cpu_load_placeholder
 import kotlinx.android.synthetic.main.activity_settings.*
 
 
 const val VERSION = BuildConfig.VERSION_NAME
 const val AUTHOR_WEBSITE = "http://giorgiodavide.it"
+val CPU_CORES = (1..32).toList()
 
 
 class Settings : WearableActivity()
@@ -41,9 +48,34 @@ class Settings : WearableActivity()
         setContentView(R.layout.activity_settings)
 
         version_number_placeholder.text = VERSION
+        cpuSpinnerInit()
         creator_webpage.setOnClickListener{ launchBrowserOnPhone() }
     }
 
+    /* This method will configure the CPU spinner
+     */
+    private fun cpuSpinnerInit()
+    {
+        // set the elements of the spinner (CPU_CORES
+        val adapter: ArrayAdapter<Int> = ArrayAdapter<Int>(this, android.R.layout.simple_spinner_item, CPU_CORES)
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+        cpu_spinner.adapter = adapter
+
+        // configure the selected N_CORES
+        val selectedItemIndex = CPU_CORES.indexOf(N_CORES)
+        cpu_spinner.setSelection(selectedItemIndex)
+
+        // handle the new N_CORES value
+        cpu_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                N_CORES = CPU_CORES[position]
+                Log.d("selected cpu cores", "$N_CORES")
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+    }
+
     /* This method will launch the phone browser
      */
     private fun launchBrowserOnPhone()
@@ -56,7 +88,7 @@ class Settings : WearableActivity()
         )
         startActivity(intentAnimation)
 
-        // launch the browser in the phone
+        // launch the phone browser
         val intentBrowser = Intent(Intent.ACTION_VIEW)
             .addCategory(Intent.CATEGORY_BROWSABLE)
             .setData(Uri.parse(AUTHOR_WEBSITE))

app/src/main/java/davideag/wearos/ncmonitor/MainActivity.kt

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
                 // NOTE: Do not place your application dependencies here; they belong

app/src/main/java/davideag/wearos/ncmonitor/Settings.kt

@@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists