From 7b1fe80c50033d4b5301cedbf9122e24aa0ab7ca Mon Sep 17 00:00:00 2001
From: javavirys <javavirys@gmail.com>
Date: Fri, 14 Oct 2022 11:43:00 +0300
Subject: [PATCH] ail-2 Add logic for getting OS information

---
 .idea/codeStyles/Project.xml                   |  1 +
 .idea/deploymentTargetDropDown.xml             | 17 -----------------
 .../lib/DeviceInformationFactory.kt            |  6 +++++-
 .../lib/command/CommandInterface.kt            |  6 ++++++
 .../lib/command/GetOSInformationCommand.kt     | 18 ++++++++++++++++++
 .../androidinfo/lib/entity/OSInformation.kt    | 11 ++++++++---
 .../androidinfo/sample/ui/main/MainFragment.kt |  4 ++++
 .../sample/ui/main/MainViewModel.kt            |  8 +++++++-
 8 files changed, 49 insertions(+), 22 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/CommandInterface.kt
 create mode 100644 AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/GetOSInformationCommand.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 88ea3aa..3198b94 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="ENABLE_SECOND_REFORMAT" value="true" />
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index cb42379..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_XL_API_30.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-10-13T14:53:57.841638Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/DeviceInformationFactory.kt b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/DeviceInformationFactory.kt
index 89af2b2..0a06283 100644
--- a/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/DeviceInformationFactory.kt
+++ b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/DeviceInformationFactory.kt
@@ -2,11 +2,14 @@ package com.udfsoft.androidinfo.lib
 
 import android.os.Build
 import androidx.annotation.WorkerThread
+import com.udfsoft.androidinfo.lib.command.GetOSInformationCommand
 import com.udfsoft.androidinfo.lib.entity.*
 
 @WorkerThread
 object DeviceInformationFactory : DeviceInformation {
 
+    private const val LOG_TAG = "DeviceInformation"
+
     override fun getGeneralInformation() = GeneralInformation(Build.BRAND, Build.MODEL)
 
     override fun getDesignInformation(): DesignInformation {
@@ -26,7 +29,8 @@ object DeviceInformationFactory : DeviceInformation {
     }
 
     override fun getOSInformation(): OSInformation {
-        TODO("Not yet implemented")
+        val getOSInformationCommand = GetOSInformationCommand()
+        return getOSInformationCommand(Unit)
     }
 
     override fun getCPUInformation(): CPUInformation {
diff --git a/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/CommandInterface.kt b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/CommandInterface.kt
new file mode 100644
index 0000000..9f1749b
--- /dev/null
+++ b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/CommandInterface.kt
@@ -0,0 +1,6 @@
+package com.udfsoft.androidinfo.lib.command
+
+interface CommandInterface<P, R> {
+
+    operator fun invoke(param: P): R
+}
\ No newline at end of file
diff --git a/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/GetOSInformationCommand.kt b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/GetOSInformationCommand.kt
new file mode 100644
index 0000000..036d0b1
--- /dev/null
+++ b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/command/GetOSInformationCommand.kt
@@ -0,0 +1,18 @@
+package com.udfsoft.androidinfo.lib.command
+
+import android.os.Build
+import com.udfsoft.androidinfo.lib.entity.OSInformation
+
+class GetOSInformationCommand : CommandInterface<Unit, OSInformation> {
+
+    override fun invoke(param: Unit): OSInformation {
+        val manufacturer = Build.MANUFACTURER
+        val version = Build.VERSION.SDK_INT
+        val versionRelease = Build.VERSION.RELEASE
+        val incremental = Build.VERSION.INCREMENTAL
+        val codeName = Build.VERSION.CODENAME
+        val linuxVersion = System.getProperty("os.version")
+
+        return OSInformation(manufacturer, version, versionRelease, incremental, codeName, linuxVersion)
+    }
+}
\ No newline at end of file
diff --git a/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/entity/OSInformation.kt b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/entity/OSInformation.kt
index 80b7e52..a53bc42 100644
--- a/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/entity/OSInformation.kt
+++ b/AndroidInfoLib/src/main/java/com/udfsoft/androidinfo/lib/entity/OSInformation.kt
@@ -1,5 +1,10 @@
 package com.udfsoft.androidinfo.lib.entity
 
-class OSInformation {
-
-}
+data class OSInformation(
+    val manufacturer: String,
+    val version: Int,
+    val versionRelease: String,
+    val incremental: String,
+    val codeName: String,
+    val linuxVersion: String?
+)
diff --git a/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainFragment.kt b/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainFragment.kt
index 3ba75d8..ce6e3f0 100644
--- a/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainFragment.kt
+++ b/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainFragment.kt
@@ -21,6 +21,10 @@ class MainFragment : Fragment(R.layout.fragment_main) {
         viewModel.getGeneralInformationLiveData().observe(viewLifecycleOwner) {
             Log.d(TAG, "GeneralInformation: $it")
         }
+
+        viewModel.getOSInformationLiveData().observe(viewLifecycleOwner) {
+            Log.d(TAG, "OSInformation: $it")
+        }
     }
 
     companion object {
diff --git a/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainViewModel.kt b/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainViewModel.kt
index f0b3fcf..c476465 100644
--- a/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainViewModel.kt
+++ b/sample/src/main/java/com/udfsoft/androidinfo/sample/ui/main/MainViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.udfsoft.androidinfo.lib.DeviceInformationFactory
 import com.udfsoft.androidinfo.lib.entity.GeneralInformation
+import com.udfsoft.androidinfo.lib.entity.OSInformation
 import com.udfsoft.androidinfo.sample.util.toLiveData
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -13,9 +14,14 @@ class MainViewModel : ViewModel() {
 
     private val generalInformationLiveData = MutableLiveData<GeneralInformation>()
 
-    fun loadInformation() = viewModelScope.launch(Dispatchers.Main) {
+    private val osInformationLiveData = MutableLiveData<OSInformation>()
+
+    fun loadInformation() = viewModelScope.launch(Dispatchers.IO) {
         generalInformationLiveData.postValue(DeviceInformationFactory.getGeneralInformation())
+        osInformationLiveData.postValue(DeviceInformationFactory.getOSInformation())
     }
 
     fun getGeneralInformationLiveData() = generalInformationLiveData.toLiveData()
+
+    fun getOSInformationLiveData() = osInformationLiveData.toLiveData()
 }
\ No newline at end of file