Second commit, app is now usable

Author: EmiyaSyahriel

README.MD

@@ -1,33 +1,35 @@
-# Temperamon
-Simple floating window to show some device status controllable via Notification bar, for Android, 
-sprinkled with my (and some of the contributors) ego.
+# FloatStat
+Simple, plugin-based floating window to show some device status controllable via Notification bar, 
+for Android, sprinkled with my (and some of the contributors) ego.
 
 ## Features
 - **Notification Control** - fast show/hide toggle
-- ***Kinda accurate* SoC Temperature reading** - Gives average of all recognized thermal zone state 
-  instead of reading just one. *Well, your phone is just a fist-size slab, average value should be suffice*
-- **** - 
+- **Completely plugin-based** - Even the internal data provider is a plugin that have minimal 
+  ties to the main floating service, See [Plugin Creation](readme/CONTRIBS.MD#plugin) for more info.  
+- **Simple** - Customizable, just not yet skinnable 
+
+### Internal Data 
+- Network Traffic
+- *Kinda Accurate* SoC Temperature, but due to the size nature of a phone, battery temperature might be your best measure
+- Battery Temperature
+- RAM Usage
+- Battery Percentage
+
 
 ## Why?
 Have you ever seen this kind of dialog?
-![Some annoying ad push notification confirmation dialog](readme/1.jpg)
-On some Phone / ROM (e.g My Nokia 6.1 Plus running Android 10), this kind of dialog cannot be 
-responded when there is a floating window active due to some security concern. When you try to 
-respond it, it will ask you to deactivate any floating window before you can really respond the 
-dialog. My last app from other dev offering similar functionality will require me to open it's app 
-to deactivate the floating window or revoke their permission from Settings, thus making it 
-inefficient to just respond a dialog. Some app that does offer the notification-based control will 
-asks you to buy the their "Pro" version or "Pro functionality" IAP, or the worst, The app have ads 
-that triggered by their floating window that will fully cover the entire screen anytime and 
-anywhere!
-<details>
-  <summary><i>My complaints and cursing, but nvm.</i></summary>
-SHAME ON YOU, THE DEV IMPLEMENTING THE "ANYTIME AND ANYWHERE" ADS! I KNOW YOU NEED MONEY, ME TOO! 
-JUST DON'T BE GREEDY AND ANNOY YOUR USER! MAY YOU BECAME CONSTANTLY H?RN? UNTIL YOU FIX YOUR APP!
-</details>
-
-Well, Sometimes it's worth it to re-invent a new kind of wheel when the existing wheels needs too 
+
+![Some example of annoying ad push notification confirmation dialog](1.jpg)
+
+On some Phone / ROM (e.g My Nokia 6.1 Plus running Android 10), this kind of dialog cannot be
+responded when there is a floating window active due to some security concern. When you try to
+respond it, it will ask you to deactivate any floating window before you can really respond the
+dialog.
+
+Well, Sometimes it's worth it to re-invent a new kind of wheel when the existing wheels needs too
 much energy to roll over or is designed to work by constantly trampling your toes.
 
+For some more info, See [Why](readme/WHY.MD)
+
 ## License
 Apache License 2.0, with some file is under Public Domain.

floatstat/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <application
         android:allowBackup="true"
@@ -41,7 +42,7 @@
             android:exported="false">
             <intent-filter>
                 <action android:name="id.psw.floatstat.action.START_PLUGIN"/>
-                <category android:name="id.psw.floatstat.category.PLUGIN"/>
+                <category android:name="id.psw.floatstat.category.DATA_PLUGIN"/>
             </intent-filter>
         </service>
         <provider

floatstat/src/main/java/id/psw/floatstat/App.kt

@@ -39,6 +39,7 @@ class App : Application() {
         const val PK_THREADED_UPDATE_FREQ = "KeseringanPembaruan"
         const val PK_ENABLED_PLUGIN = "TetambahanAktif"
         const val PK_DEFAULT_PLUGIN_DISPLAY = "TetambahanTampil"
+        const val PK_RUN_ON_STARTUP = "MulaiPasHidup"
     }
 
 
@@ -126,6 +127,7 @@ class App : Application() {
     }
 
     val pluginList = arrayListOf<PluginInfo>()
+    private val displayNames = mutableMapOf<ComponentName, String>()
     private val pluginConnector = object : ServiceConnection {
         var hasBound = false
         private val TAG = "PluginQuery"
@@ -134,8 +136,9 @@ class App : Application() {
             if(service != null && name != null){
                 val asPlugin = IFloatStatDataPlugin.Stub.asInterface(service)
                 if(pluginList.count { it.name == name } == 0){
-                    Log.d(TAG, "$name -> ${asPlugin.pluginName}")
-                    val vInfo = PluginInfo(asPlugin, name, asPlugin.pluginName)
+                    val pluginDspName = displayNames[name] ?: name.toString() ?: "???"
+                    Log.d(TAG, "$name -> $pluginDspName")
+                    val vInfo = PluginInfo(asPlugin, name, pluginDspName)
                     asPlugin.dataIds.split(',').forEach {
                         val dName = asPlugin.getDataName(it)
                         val dInfo = PluginDataInfo(
@@ -158,21 +161,21 @@ class App : Application() {
     }
 
     private fun listPlugins(){
-        val i = Intent(ACTION_START_PLUGIN)
-        val pkgs = packageManager.queryIntentServices(i, 0)
+        val i = Intent(ACTION_START_PLUGIN).addCategory(CATEGORY_PLUGIN)
+        val dPkg = packageManager.queryIntentServices(i, 0)
         if(pluginConnector.hasBound){
             unbindService(pluginConnector)
             pluginConnector.hasBound = false
         }
         pluginList.clear()
 
-        pkgs.forEach {
+        dPkg.forEach {
             try{
+                val cName = ComponentName(it.serviceInfo.packageName, it.serviceInfo.name)
                 val sbi = Intent(ACTION_START_PLUGIN)
-                    .setComponent(ComponentName(it.serviceInfo.packageName, it.serviceInfo.name))
+                    .setComponent(cName)
                     .putExtra(PluginData.EXTRA_DATA_SENDER, packageName)
-
-
+                displayNames[cName] = it.serviceInfo.loadLabel(packageManager).toString()
                 if(!bindService(sbi, pluginConnector, BIND_AUTO_CREATE)){
                     Log.d("App", "Cannot bind ${it.serviceInfo.name}")
                 }
@@ -183,6 +186,7 @@ class App : Application() {
     }
 
     var shouldUpdate = false
+    var startOnBoot = false
 
     var reReadPreference = false
     val activePlugins = arrayListOf<PluginId>()
@@ -220,6 +224,7 @@ class App : Application() {
         if(defPlug != null){
             defaultPlugin = PluginId(defPlug)
         }
+        startOnBoot = pref.getBoolean(PK_RUN_ON_STARTUP, false)
     }
 
     fun savePreferences(){
@@ -229,6 +234,7 @@ class App : Application() {
             .putLong(PK_THREADED_UPDATE_FREQ, updateFrequency)
             .putString(PK_ENABLED_PLUGIN, activePluginIds.toString())
             .putString(PK_DEFAULT_PLUGIN_DISPLAY, defaultPlugin.toString())
+            .putBoolean(PK_RUN_ON_STARTUP, startOnBoot)
             .apply()
     }
 

floatstat/src/main/java/id/psw/floatstat/BootStartReceiver.kt

@@ -0,0 +1,18 @@
+package id.psw.floatstat
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+
+class BootStartReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if(context != null){
+            if(context.app().startOnBoot){
+                if(intent?.action == Intent.ACTION_BOOT_COMPLETED){
+                    FloatWindowService.startServiceS(context)
+                }
+            }
+        }
+    }
+}

floatstat/src/main/java/id/psw/floatstat/FloatWindowService.kt

@@ -2,6 +2,7 @@ package id.psw.floatstat
 
 import android.annotation.SuppressLint
 import android.app.*
+import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
 import android.graphics.*
@@ -37,6 +38,15 @@ class FloatWindowService : Service() {
         const val ACTION_CLOSE = "id.psw.temperamon.action.CLOSE"
         const val ACTION_EXPAND = "id.psw.temperamon.action.EXPAND"
         private const val allowEditor: Boolean = true
+
+        fun startServiceS(ctx: Context){
+            val i = Intent(ctx, FloatWindowService::class.java)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                ctx.startForegroundService(i)
+            }else{
+                ctx.startService(i)
+            }
+        }
     }
 
     private var vMainView : StatusView? = null
@@ -138,19 +148,19 @@ class FloatWindowService : Service() {
         val notifFlag = if(sdkAtLeast(Build.VERSION_CODES.M)) PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT else 0
 
         val notif = NotificationCompat.Builder(this, NOTIF_ID)
-            .setContentTitle("Floating Stats is running")
-            .setContentText("Expand this notification to control the floating widget")
+            .setContentTitle(getString(R.string.float_stat_notif_title))
+            .setContentText(getString(R.string.float_stat_notif_desc))
             .setSmallIcon(R.drawable.ic_main_notification)
             .setSilent(true)
             .setContentIntent(PendingIntent.getService(this, INT_ACTION_EXPAND,
                     Intent(ACTION_EXPAND), notifFlag))
-            .addAction(android.R.drawable.ic_menu_view, "Show/Hide",
+            .addAction(android.R.drawable.ic_menu_view, getString(R.string.float_stat_notif_visibility),
                 PendingIntent.getService(this, INT_ACTION_VISIBILITY,
                     Intent(ACTION_VISIBILITY), notifFlag))
-            .addAction(android.R.drawable.ic_menu_edit, "Edit",
+            .addAction(android.R.drawable.ic_menu_edit, getString(R.string.float_stat_notif_edit),
                 PendingIntent.getService(this, INT_ACTION_EDIT,
                     Intent(ACTION_EDIT), notifFlag))
-            .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Close",
+            .addAction(android.R.drawable.ic_menu_close_clear_cancel, getString(R.string.float_stat_notif_close),
                 PendingIntent.getService(this, INT_ACTION_CLOSE,
                     Intent(ACTION_CLOSE), notifFlag))
             .build()
@@ -236,19 +246,25 @@ class FloatWindowService : Service() {
                 setOnClickListener { btn ->
                     PopupMenu(context, this).apply {
                         menuInflater.inflate(R.menu.selector_menu, menu)
+                        menu.findItem(R.id.plugin_selector_bootstart).isChecked = app.startOnBoot
+
                         setOnMenuItemClickListener {
                             when(it.itemId){
                                 R.id.plugin_selector_donate -> { app().openDonateUri() }
                                 R.id.plugin_selector_refresh -> {
                                     editWindow?.cancel()
                                     app().refreshPluginList()
-                                    Toast.makeText(app, "Updating Data and Plugin List, The data selector list will re-open after 1 second,", Toast.LENGTH_LONG).show()
+                                    Toast.makeText(app, context.getString(R.string.plugin_selector_updating_warning), Toast.LENGTH_LONG).show()
                                     Timer("UpdateWait", false).schedule(1000){
                                         wHandler.post {
                                             openEditWindow()
                                         }
                                     }
                                 }
+                                R.id.plugin_selector_bootstart -> {
+                                    app.startOnBoot = !app.startOnBoot
+                                    app.savePreferences()
+                                }
                             }
                             true
                         }

floatstat/src/main/java/id/psw/floatstat/InternalStatProviderService.kt

@@ -216,14 +216,14 @@ class InternalStatProviderService : Service() {
         override val iconId: Int = IC_UPLINK
 
         override val dataGetter: Long
-            get() = TrafficStats.getMobileTxBytes()
+            get() = TrafficStats.getTotalTxBytes()
     }
 
     private val dnLinkData = object : IDeltaNetPlugin(){
         override val iconId: Int = IC_DOWNLINK
 
         override val dataGetter: Long
-            get() = TrafficStats.getMobileRxBytes()
+            get() = TrafficStats.getTotalRxBytes()
     }
 
     private val cpuTempData = object : IPlugin(){
@@ -379,10 +379,6 @@ class InternalStatProviderService : Service() {
             return sb.toString()
         }
 
-        override fun getPluginName(): String {
-            return getString(R.string.internal_plugin_name)
-        }
-
         override fun getDataName(dataId: String?): String {
             return when(dataId) {
                 DAT_BATTERY_INFO -> getString(R.string.internal_stat_battery_info)

floatstat/src/main/java/id/psw/floatstat/MainActivity.kt

@@ -31,12 +31,7 @@ class MainActivity : Activity() {
     }
 
     private fun startWindowService() {
-        val i = Intent(applicationContext, FloatWindowService::class.java)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForegroundService(i)
-        }else{
-            startService(i)
-        }
+        FloatWindowService.startServiceS(applicationContext)
     }
 
     private fun askPermission() {

floatstat/src/main/res/drawable/ic_bootstart.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>

floatstat/src/main/res/menu/selector_menu.xml

@@ -9,4 +9,9 @@
         android:id="@+id/plugin_selector_donate"
         android:icon="@drawable/ic_donation"
         android:title="@string/selector_donate" />
+    <item
+        android:id="@+id/plugin_selector_bootstart"
+        android:icon="@drawable/ic_bootstart"
+        android:checkable="true"
+        android:title="@string/selector_bootstart" />
 </menu>

floatstat/src/main/res/values-in/strings.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Kondilayang</string>
+    <string name="svc_name">Layanan Jendela Kondilayang</string>
+    <string name="err_not_yet_allowed">Aplikasi belum diizinkan untuk berjalan diatas aplikasi lain</string>
+    <string name="allow_please">Mohon untuk memperbolehkan aplikasi ini untuk berjalan diatas aplikasi lain</string>
+    <string name="temperamon_start">Memulai Kondilayang, semua kendali ada di Bilah Pemberitahuan, kecuali kalau anda sembunyikan.</string>
+    <string name="notif_channel_id">Kendali Kondilayang</string>
+    <string name="internal_plugin_name">Bawaan</string>
+    <string name="internal_stat_uplink">Kec. Unggah</string>
+    <string name="internal_stat_downlink">Kec. Unduh</string>
+    <string name="internal_stat_battery_info">Tingkat Baterai</string>
+    <string name="internal_stat_ram_usage">P.gunaan RAM</string>
+    <string name="internal_stat_temp_bat">Suhu Baterai</string>
+    <string name="internal_stat_temp_cpu">Suhu CPU</string>
+    <string name="internal_stat_service_name">Pemberi Data Bawaan</string>
+    <string name="plugin_icon_error">Icon untuk data %1$s dari Pengaya %2$s rusak, atau mungkin tidak sah</string>
+    <string name="title_plugin_selector">Pengatur Pengaya</string>
+    <string name="selector_refresh_plugins">Perbarui Pengaya</string>
+    <string name="selector_donate">Ikut Andil</string>
+    <string name="svc_name_bootstart">Layanan Automulai Kondilayang</string>
+    <string name="selector_bootstart">Mulai saat boot</string>
+    <string name="plugin_selector_updating_warning">Memperbarui daftar pengaya data, pengatur pengaya akan dibuka lagi dalam 1 detik.</string>
+    <string name="float_stat_notif_title">Kondilayang sedang berjalan</string>
+    <string name="float_stat_notif_desc">Perluas pemberitahuan ini untuk menampilkan kendali jendela layang</string>
+    <string name="float_stat_notif_visibility">Tampil/Sembunyi</string>
+    <string name="float_stat_notif_edit">Ubah</string>
+    <string name="float_stat_notif_close">Tutup</string>
+</resources>