diff --git a/app/build.gradle b/app/build.gradle index 5c4583f..545a736 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 1 - versionName "1.0.1" + versionName "1.0.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27BatteryInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27BatteryInfoTest.kt index 23385b4..34db919 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27BatteryInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27BatteryInfoTest.kt @@ -2,7 +2,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.R import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.DeviceBatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.DeviceBatteryInfo import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27CPUInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27CPUInfoTest.kt index 4c0514c..c3a7950 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27CPUInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27CPUInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.DeviceCPUInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.DeviceCPUInfo import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27DisplayInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27DisplayInfoTest.kt index 263dd84..682e507 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27DisplayInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27DisplayInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.DeviceDisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.DeviceDisplayInfo import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27GPUInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27GPUInfoTest.kt index 4f3eee0..5f7e561 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27GPUInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27GPUInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.DeviceGPUIInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.DeviceGPUIInfo import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27JVMInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27JVMInfoTest.kt index 4b7072b..c87ffba 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27JVMInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27JVMInfoTest.kt @@ -2,7 +2,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.R import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm.DeviceJVMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm.DeviceJVMInfo import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27RAMInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27RAMInfoTest.kt index 71cff83..ff729a2 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27RAMInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27RAMInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.DeviceRAMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.DeviceRAMInfo import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27SystemInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27SystemInfoTest.kt index abb933f..10fd8b7 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27SystemInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/pixel/api27/Api27SystemInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.pixel.api27 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.DeviceSystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.DeviceSystemInfo import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22BatteryInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22BatteryInfoTest.kt index d0ce71f..ec33ac5 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22BatteryInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22BatteryInfoTest.kt @@ -2,9 +2,8 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.R import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.DeviceBatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.DeviceBatteryInfo import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull import org.junit.Test class Api22BatteryInfoTest : BaseInfoTest() { diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22CPUInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22CPUInfoTest.kt index 0aef330..06f129f 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22CPUInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22CPUInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.DeviceCPUInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.DeviceCPUInfo import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22DisplayInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22DisplayInfoTest.kt index d0219d5..e8d930a 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22DisplayInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22DisplayInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.DeviceDisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.DeviceDisplayInfo import org.junit.Assert.* import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22GPUInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22GPUInfoTest.kt index a9ca152..03e9b5b 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22GPUInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22GPUInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.DeviceGPUIInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.DeviceGPUIInfo import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22JVMInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22JVMInfoTest.kt index cc5bd24..16d4d19 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22JVMInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22JVMInfoTest.kt @@ -2,7 +2,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.R import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm.DeviceJVMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm.DeviceJVMInfo import org.junit.Assert.assertEquals import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22RAMInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22RAMInfoTest.kt index a8b15f6..e11effd 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22RAMInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22RAMInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.DeviceRAMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.DeviceRAMInfo import org.junit.Assert.assertTrue import org.junit.Test diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22SystemInfoTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22SystemInfoTest.kt index 2b23544..eb87f5d 100644 --- a/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22SystemInfoTest.kt +++ b/app/src/androidTest/java/com/smlnskgmail/jaman/deviceinfo/info/travisci/api22/Api22SystemInfoTest.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.travisci.api22 import com.smlnskgmail.jaman.deviceinfo.info.BaseInfoTest -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.DeviceSystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.DeviceSystemInfo import org.junit.Assert.assertEquals import org.junit.Assert.assertNotNull import org.junit.Test diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6492340..7589f3f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/MainActivity.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/MainActivity.kt index ab5dd22..25b7300 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/MainActivity.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/MainActivity.kt @@ -3,18 +3,18 @@ package com.smlnskgmail.jaman.deviceinfo import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.ui.ViewPager2WithTabs -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.DeviceBatteryPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.DeviceCPUPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.DeviceDisplayPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.DeviceGPUPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.renderer.DeviceGPUActivity -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.renderer.GPURequestCode -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm.DeviceJVMPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.DeviceRAMPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.DeviceSystemPage -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.common.FirstLaunchPreferenceUnit -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.types.BooleanPreference +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.ui.ViewPager2WithTabs +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.DeviceBatteryPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.DeviceCPUPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.DeviceDisplayPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.DeviceGPUPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.renderer.DeviceGPUActivity +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.renderer.GPURequestCode +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm.DeviceJVMPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.DeviceRAMPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.DeviceSystemPage +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.PreferenceValue +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.impl.shared.BooleanPreference import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { @@ -35,7 +35,7 @@ class MainActivity : AppCompatActivity() { private fun isFirstLaunch() = BooleanPreference( this, - FirstLaunchPreferenceUnit() + FirstLaunchPreferenceValue() ).value() private fun firstLaunch() { @@ -68,15 +68,27 @@ class MainActivity : AppCompatActivity() { DeviceDisplayPage() ) - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + override fun onActivityResult( + requestCode: Int, + resultCode: Int, + data: Intent? + ) { super.onActivityResult(requestCode, resultCode, data) if (resultCode == GPURequestCode().requestCode()) { BooleanPreference( this, - FirstLaunchPreferenceUnit() + FirstLaunchPreferenceValue() ).save(false) loadInfoPages() } } + private inner class FirstLaunchPreferenceValue : PreferenceValue { + + override fun key() = "first_launch" + + override fun defaultValue() = true + + } + } diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/JVMInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/JVMInfo.kt deleted file mode 100644 index aa0ae50..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/JVMInfo.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info - -interface JVMInfo { - - fun jvmName(): String - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/BatteryInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/BatteryInfo.kt similarity index 67% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/BatteryInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/BatteryInfo.kt index 6c34467..6461c2b 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/BatteryInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/BatteryInfo.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info +package com.smlnskgmail.jaman.deviceinfo.logic.info.api interface BatteryInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/CPUInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/CPUInfo.kt similarity index 64% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/CPUInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/CPUInfo.kt index 56808b4..f09aa72 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/CPUInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/CPUInfo.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info +package com.smlnskgmail.jaman.deviceinfo.logic.info.api interface CPUInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/DisplayInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/DisplayInfo.kt similarity index 80% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/DisplayInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/DisplayInfo.kt index 7cc45e2..921b4d5 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/DisplayInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/DisplayInfo.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info +package com.smlnskgmail.jaman.deviceinfo.logic.info.api interface DisplayInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/GPUIInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/GPUIInfo.kt similarity index 57% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/GPUIInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/GPUIInfo.kt index 77df323..8460de0 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/GPUIInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/GPUIInfo.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info +package com.smlnskgmail.jaman.deviceinfo.logic.info.api interface GPUIInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/JVMInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/JVMInfo.kt new file mode 100644 index 0000000..ad1c5d4 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/JVMInfo.kt @@ -0,0 +1,7 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.api + +interface JVMInfo { + + fun jvmName(): String + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/RAMInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/RAMInfo.kt similarity index 63% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/RAMInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/RAMInfo.kt index 484425e..d6a3f3d 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/RAMInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/RAMInfo.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info +package com.smlnskgmail.jaman.deviceinfo.logic.info.api interface RAMInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/SystemInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/SystemInfo.kt similarity index 90% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/SystemInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/SystemInfo.kt index f446584..76bd5b6 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/SystemInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/api/SystemInfo.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info +package com.smlnskgmail.jaman.deviceinfo.logic.info.api @SuppressWarnings("TooManyFunctions") interface SystemInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/BaseListInfoPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/BaseListInfoPage.kt similarity index 64% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/BaseListInfoPage.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/BaseListInfoPage.kt index a75321c..8d2d3c5 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/BaseListInfoPage.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/BaseListInfoPage.kt @@ -1,13 +1,13 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.ui.Page2 -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoAdapter -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.ui.Page2 +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoAdapter +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem import kotlinx.android.synthetic.main.fragment_list.* abstract class BaseListInfoPage : Page2() { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/DeviceBatteryInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/DeviceBatteryInfo.kt similarity index 95% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/DeviceBatteryInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/DeviceBatteryInfo.kt index 41aff11..cf33ae5 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/DeviceBatteryInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/DeviceBatteryInfo.kt @@ -1,11 +1,11 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.BatteryManager import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.BatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.BatteryInfo class DeviceBatteryInfo(private val context: Context) : BatteryInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/DeviceBatteryPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/DeviceBatteryPage.kt new file mode 100644 index 0000000..7754e69 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/DeviceBatteryPage.kt @@ -0,0 +1,33 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery + +import com.smlnskgmail.jaman.deviceinfo.R +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.recycler.BatteryActionInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.recycler.BatteryHealthInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.recycler.BatteryPluggedInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.BatteryInfo + +class DeviceBatteryPage : BaseListInfoPage() { + + override fun infoItems(): List { + val batteryInfo: BatteryInfo = DeviceBatteryInfo(context!!) + return listOf( + BatteryHealthInfoItem( + context!!, + batteryInfo + ), + BatteryActionInfoItem( + context!!, + batteryInfo + ), + BatteryPluggedInfoItem( + context!!, + batteryInfo + ) + ) + } + + override fun pageTitleResId() = R.string.page_title_battery + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryActionInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryActionInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryActionInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryActionInfoItem.kt index c937fff..93d0c29 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryActionInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryActionInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.BatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.BatteryInfo class BatteryActionInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryHealthInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryHealthInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryHealthInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryHealthInfoItem.kt index 0f6707a..5ec369a 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryHealthInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryHealthInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.BatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.BatteryInfo class BatteryHealthInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryPluggedInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryPluggedInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryPluggedInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryPluggedInfoItem.kt index 26774d1..85ff72d 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/recycler/BatteryPluggedInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/battery/recycler/BatteryPluggedInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.battery.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.BatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.BatteryInfo class BatteryPluggedInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/DeviceCPUInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/DeviceCPUInfo.kt similarity index 94% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/DeviceCPUInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/DeviceCPUInfo.kt index 3b1ee5a..1ab0c1f 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/DeviceCPUInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/DeviceCPUInfo.kt @@ -1,6 +1,6 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu -import com.smlnskgmail.jaman.deviceinfo.logic.info.CPUInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.CPUInfo import com.smlnskgmail.jaman.deviceinfo.support.handlers.NullHandle import java.io.File import java.io.FileFilter diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/DeviceCPUPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/DeviceCPUPage.kt new file mode 100644 index 0000000..606a717 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/DeviceCPUPage.kt @@ -0,0 +1,28 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu + +import com.smlnskgmail.jaman.deviceinfo.R +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.recycler.CPUCoresInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.recycler.CPUFreqInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.CPUInfo + +class DeviceCPUPage : BaseListInfoPage() { + + override fun infoItems(): List { + val cpuInfo: CPUInfo = DeviceCPUInfo() + return listOf( + CPUCoresInfoItem( + context!!, + cpuInfo + ), + CPUFreqInfoItem( + context!!, + cpuInfo + ) + ) + } + + override fun pageTitleResId() = R.string.page_title_cpu + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/Ghz.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/Ghz.kt similarity index 63% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/Ghz.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/Ghz.kt index 89a294c..1415b84 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/Ghz.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/Ghz.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu class Ghz(private val mgz: Int) { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/recycler/CPUCoresInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/recycler/CPUCoresInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/recycler/CPUCoresInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/recycler/CPUCoresInfoItem.kt index bb13748..13b2a5e 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/recycler/CPUCoresInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/recycler/CPUCoresInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.CPUInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.CPUInfo class CPUCoresInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/recycler/CPUFreqInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/recycler/CPUFreqInfoItem.kt similarity index 61% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/recycler/CPUFreqInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/recycler/CPUFreqInfoItem.kt index 832b1ae..7094165 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/recycler/CPUFreqInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/cpu/recycler/CPUFreqInfoItem.kt @@ -1,10 +1,10 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.Ghz -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.CPUInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.cpu.Ghz +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.CPUInfo class CPUFreqInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/DeviceDisplayInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/DeviceDisplayInfo.kt similarity index 83% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/DeviceDisplayInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/DeviceDisplayInfo.kt index 945549c..9aeed07 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/DeviceDisplayInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/DeviceDisplayInfo.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display import android.app.Activity import android.os.Build import android.util.DisplayMetrics -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class DeviceDisplayInfo(activity: Activity) : DisplayInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/DeviceDisplayPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/DeviceDisplayPage.kt similarity index 72% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/DeviceDisplayPage.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/DeviceDisplayPage.kt index de86b01..1be33a8 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/DeviceDisplayPage.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/DeviceDisplayPage.kt @@ -1,10 +1,10 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler.* +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler.* class DeviceDisplayPage : BaseListInfoPage() { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DensityDpiInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DensityDpiInfoItem.kt similarity index 57% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DensityDpiInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DensityDpiInfoItem.kt index 4732c3a..d843337 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DensityDpiInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DensityDpiInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class DensityDpiInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DensityInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DensityInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DensityInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DensityInfoItem.kt index d52af63..8af8ff3 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DensityInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DensityInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class DensityInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DisplayInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DisplayInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DisplayInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DisplayInfoItem.kt index fcffad1..2a5323b 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/DisplayInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/DisplayInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class DisplayInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/HeightPixelsInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/HeightPixelsInfoItem.kt similarity index 57% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/HeightPixelsInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/HeightPixelsInfoItem.kt index bfe5142..55d9f43 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/HeightPixelsInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/HeightPixelsInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class HeightPixelsInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/ScaledDensityDpiInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/ScaledDensityDpiInfoItem.kt similarity index 58% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/ScaledDensityDpiInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/ScaledDensityDpiInfoItem.kt index 980c0e2..1ec14f3 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/ScaledDensityDpiInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/ScaledDensityDpiInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class ScaledDensityDpiInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/WidthPixelsInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/WidthPixelsInfoItem.kt similarity index 57% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/WidthPixelsInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/WidthPixelsInfoItem.kt index fa5bbf6..f63d335 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/WidthPixelsInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/WidthPixelsInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class WidthPixelsInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/XDpiInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/XDpiInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/XDpiInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/XDpiInfoItem.kt index 1588369..c2fe8ca 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/XDpiInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/XDpiInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class XDpiInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/YDpiInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/YDpiInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/YDpiInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/YDpiInfoItem.kt index 4f2e18c..9673ea9 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/display/recycler/YDpiInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/display/recycler/YDpiInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.display.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.display.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class YDpiInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/DeviceGPUIInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/DeviceGPUIInfo.kt new file mode 100644 index 0000000..cfcadd3 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/DeviceGPUIInfo.kt @@ -0,0 +1,22 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu + +import android.content.Context +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.preferences.GPUModelPreferenceValue +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.preferences.GPUVendorPreferenceValue +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.GPUIInfo +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.impl.shared.StringPreference + +class DeviceGPUIInfo(private val context: Context) : + GPUIInfo { + + override fun vendor() = StringPreference( + context, + GPUVendorPreferenceValue() + ).value() + + override fun model() = StringPreference( + context, + GPUModelPreferenceValue() + ).value() + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/DeviceGPUPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/DeviceGPUPage.kt new file mode 100644 index 0000000..e98e2ce --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/DeviceGPUPage.kt @@ -0,0 +1,28 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu + +import com.smlnskgmail.jaman.deviceinfo.R +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.recycler.GPUModelInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.recycler.GPUVendorInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.GPUIInfo + +class DeviceGPUPage : BaseListInfoPage() { + + override fun infoItems(): List { + val gpuInfo: GPUIInfo = DeviceGPUIInfo(context!!) + return listOf( + GPUModelInfoItem( + context!!, + gpuInfo + ), + GPUVendorInfoItem( + context!!, + gpuInfo + ) + ) + } + + override fun pageTitleResId() = R.string.page_title_gpu + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/preferences/GPUModelPreferenceValue.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/preferences/GPUModelPreferenceValue.kt new file mode 100644 index 0000000..3facad3 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/preferences/GPUModelPreferenceValue.kt @@ -0,0 +1,12 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.preferences + +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.PreferenceValue + +class GPUModelPreferenceValue : + PreferenceValue { + + override fun key() = "gpu_model" + + override fun defaultValue() = "" + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/preferences/GPUVendorPreferenceValue.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/preferences/GPUVendorPreferenceValue.kt new file mode 100644 index 0000000..0350b8e --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/preferences/GPUVendorPreferenceValue.kt @@ -0,0 +1,12 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.preferences + +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.PreferenceValue + +class GPUVendorPreferenceValue : + PreferenceValue { + + override fun key() = "gpu_vendor" + + override fun defaultValue() = "" + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/recycler/GPUModelInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/recycler/GPUModelInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/recycler/GPUModelInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/recycler/GPUModelInfoItem.kt index 100cfec..0cfd56f 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/recycler/GPUModelInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/recycler/GPUModelInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.GPUIInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.GPUIInfo class GPUModelInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/recycler/GPUVendorInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/recycler/GPUVendorInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/recycler/GPUVendorInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/recycler/GPUVendorInfoItem.kt index af8d24c..5879300 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/recycler/GPUVendorInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/recycler/GPUVendorInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.GPUIInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.GPUIInfo class GPUVendorInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/AppGLSurfaceViewRenderer.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/AppGLSurfaceViewRenderer.kt similarity index 80% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/AppGLSurfaceViewRenderer.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/AppGLSurfaceViewRenderer.kt index eda3492..8e58cfe 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/AppGLSurfaceViewRenderer.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/AppGLSurfaceViewRenderer.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.renderer +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.renderer import android.opengl.GLSurfaceView import javax.microedition.khronos.egl.EGLConfig diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/DeviceGPUActivity.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/DeviceGPUActivity.kt similarity index 73% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/DeviceGPUActivity.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/DeviceGPUActivity.kt index c9a2f9f..2d4ad3c 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/DeviceGPUActivity.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/DeviceGPUActivity.kt @@ -1,12 +1,12 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.renderer +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.renderer import android.opengl.GLSurfaceView import android.os.Bundle import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.preferences.GPUModelPreferenceUnit -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.preferences.GPUVendorPreferenceUnit -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.types.StringPreference +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.preferences.GPUModelPreferenceValue +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.preferences.GPUVendorPreferenceValue +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.impl.shared.StringPreference import javax.microedition.khronos.egl.EGLConfig import javax.microedition.khronos.opengles.GL10 @@ -36,14 +36,14 @@ class DeviceGPUActivity : AppCompatActivity() { private fun saveVendor(vendor: String) { StringPreference( this@DeviceGPUActivity, - GPUVendorPreferenceUnit() + GPUVendorPreferenceValue() ).save(vendor) } private fun saveModel(model: String) { StringPreference( this@DeviceGPUActivity, - GPUModelPreferenceUnit() + GPUModelPreferenceValue() ).save(model) } diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/GPURequestCode.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/GPURequestCode.kt similarity index 61% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/GPURequestCode.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/GPURequestCode.kt index 162aebd..17803a3 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/renderer/GPURequestCode.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/gpu/renderer/GPURequestCode.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.renderer +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.gpu.renderer import com.smlnskgmail.jaman.deviceinfo.support.requests.RequestCode diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/DeviceJVMInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/DeviceJVMInfo.kt similarity index 77% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/DeviceJVMInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/DeviceJVMInfo.kt index afd5321..6f21f98 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/DeviceJVMInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/DeviceJVMInfo.kt @@ -1,8 +1,8 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.JVMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.JVMInfo class DeviceJVMInfo(private val context: Context) : JVMInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/DeviceJVMPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/DeviceJVMPage.kt new file mode 100644 index 0000000..4f51659 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/DeviceJVMPage.kt @@ -0,0 +1,24 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm + +import com.smlnskgmail.jaman.deviceinfo.R +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm.recycler.JVMNameInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.JVMInfo +import java.util.* + +class DeviceJVMPage : BaseListInfoPage() { + + override fun infoItems(): List { + val jvmInfo: JVMInfo = DeviceJVMInfo(context!!) + return Collections.singletonList( + JVMNameInfoItem( + context!!, + jvmInfo + ) + ) + } + + override fun pageTitleResId() = R.string.page_title_jvm + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/recycler/JVMNameInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/recycler/JVMNameInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/recycler/JVMNameInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/recycler/JVMNameInfoItem.kt index b1ce8fa..aaaf5c7 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/recycler/JVMNameInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/jvm/recycler/JVMNameInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.jvm.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.JVMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.JVMInfo class JVMNameInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/BytesInMegabytes.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/BytesInMegabytes.kt similarity index 69% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/BytesInMegabytes.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/BytesInMegabytes.kt index 702eec4..4a287e2 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/BytesInMegabytes.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/BytesInMegabytes.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram class BytesInMegabytes(private val bytes: Long) { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/DeviceRAMInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/DeviceRAMInfo.kt similarity index 82% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/DeviceRAMInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/DeviceRAMInfo.kt index 2a3c4a3..797c5e0 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/DeviceRAMInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/DeviceRAMInfo.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram import android.app.ActivityManager import android.content.Context import android.content.Context.ACTIVITY_SERVICE -import com.smlnskgmail.jaman.deviceinfo.logic.info.RAMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.RAMInfo class DeviceRAMInfo(context: Context) : RAMInfo { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/DeviceRAMPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/DeviceRAMPage.kt new file mode 100644 index 0000000..4955c19 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/DeviceRAMPage.kt @@ -0,0 +1,29 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram + +import com.smlnskgmail.jaman.deviceinfo.R +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.recycler.AvailableRAMInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.recycler.TotalRAMInfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.RAMInfo + +class DeviceRAMPage : BaseListInfoPage() { + + override fun infoItems(): List { + val ramInfo: RAMInfo = DeviceRAMInfo(context!!) + ramInfo.loadState() + return listOf( + AvailableRAMInfoItem( + context!!, + ramInfo + ), + TotalRAMInfoItem( + context!!, + ramInfo + ) + ) + } + + override fun pageTitleResId() = R.string.page_title_ram + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/recycler/AvailableRAMInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/recycler/AvailableRAMInfoItem.kt similarity index 59% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/recycler/AvailableRAMInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/recycler/AvailableRAMInfoItem.kt index 07824c5..392efc6 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/recycler/AvailableRAMInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/recycler/AvailableRAMInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.RAMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.RAMInfo class AvailableRAMInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/recycler/TotalRAMInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/recycler/TotalRAMInfoItem.kt similarity index 58% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/recycler/TotalRAMInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/recycler/TotalRAMInfoItem.kt index 80e13d9..4470a94 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/recycler/TotalRAMInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/ram/recycler/TotalRAMInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.ram.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.RAMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.RAMInfo class TotalRAMInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoAdapter.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoAdapter.kt similarity index 87% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoAdapter.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoAdapter.kt index ed43150..05a5253 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoAdapter.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoAdapter.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoHolder.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoHolder.kt similarity index 86% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoHolder.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoHolder.kt index 0201b5a..e9f0374 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoHolder.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoHolder.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler import android.view.View import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoItem.kt new file mode 100644 index 0000000..5ff05ce --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/recycler/InfoItem.kt @@ -0,0 +1,8 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler + +interface InfoItem { + + fun title(): String + fun body(): String + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/DeviceSystemInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/DeviceSystemInfo.kt similarity index 92% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/DeviceSystemInfo.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/DeviceSystemInfo.kt index 24df24d..eb376e1 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/DeviceSystemInfo.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/DeviceSystemInfo.kt @@ -1,10 +1,10 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system import android.annotation.SuppressLint import android.content.Context import android.os.Build import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/DeviceSystemPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/DeviceSystemPage.kt similarity index 81% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/DeviceSystemPage.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/DeviceSystemPage.kt index 49d2442..1ce6997 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/DeviceSystemPage.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/DeviceSystemPage.kt @@ -1,10 +1,10 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler.* +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.BaseListInfoPage +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler.* class DeviceSystemPage : BaseListInfoPage() { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ApiLevelInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ApiLevelInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ApiLevelInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ApiLevelInfoItem.kt index c77c1c5..1973944 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ApiLevelInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ApiLevelInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class ApiLevelInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ArchInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ArchInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ArchInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ArchInfoItem.kt index 5cbe689..6eebb71 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ArchInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ArchInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class ArchInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BoardInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BoardInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BoardInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BoardInfoItem.kt index 1473dba..57f4d60 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BoardInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BoardInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class BoardInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BootloaderInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BootloaderInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BootloaderInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BootloaderInfoItem.kt index 438f038..91ab4ae 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BootloaderInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BootloaderInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class BootloaderInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BrandInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BrandInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BrandInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BrandInfoItem.kt index 8c32348..7bbe6ea 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/BrandInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/BrandInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class BrandInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/CodeNameInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/CodeNameInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/CodeNameInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/CodeNameInfoItem.kt index de3b973..c97d835 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/CodeNameInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/CodeNameInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class CodeNameInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/DateInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/DateInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/DateInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/DateInfoItem.kt index 8e16c2c..706f0a0 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/DateInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/DateInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class DateInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/FingerprintInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/FingerprintInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/FingerprintInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/FingerprintInfoItem.kt index a9294c6..a4aa637 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/FingerprintInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/FingerprintInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class FingerprintInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/HardwareInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/HardwareInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/HardwareInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/HardwareInfoItem.kt index 3b321fc..05bf7db 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/HardwareInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/HardwareInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class HardwareInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/HostInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/HostInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/HostInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/HostInfoItem.kt index cdab29b..63f1773 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/HostInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/HostInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class HostInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/KernelVersionInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/KernelVersionInfoItem.kt similarity index 57% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/KernelVersionInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/KernelVersionInfoItem.kt index e4736fa..e21e2b2 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/KernelVersionInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/KernelVersionInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class KernelVersionInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ManufacturerInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ManufacturerInfoItem.kt similarity index 56% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ManufacturerInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ManufacturerInfoItem.kt index a90fdd8..d43e29c 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ManufacturerInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ManufacturerInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class ManufacturerInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ModelInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ModelInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ModelInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ModelInfoItem.kt index 143ed2b..b89813f 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ModelInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ModelInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class ModelInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ProductInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ProductInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ProductInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ProductInfoItem.kt index 72626e5..9bf3acc 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ProductInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ProductInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class ProductInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ReleaseVersionInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ReleaseVersionInfoItem.kt similarity index 57% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ReleaseVersionInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ReleaseVersionInfoItem.kt index d8167f7..b22adf0 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/ReleaseVersionInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/ReleaseVersionInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class ReleaseVersionInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/TypeInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/TypeInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/TypeInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/TypeInfoItem.kt index 675c9a1..02e2560 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/TypeInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/TypeInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class TypeInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/UserInfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/UserInfoItem.kt similarity index 55% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/UserInfoItem.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/UserInfoItem.kt index 09121a7..7e66340 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/system/recycler/UserInfoItem.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/pages/system/recycler/UserInfoItem.kt @@ -1,9 +1,9 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.system.recycler +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.system.recycler import android.content.Context import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.pages.recycler.InfoItem +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class UserInfoItem( private val context: Context, diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/Page2.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/Page2.kt similarity index 60% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/Page2.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/Page2.kt index da16308..8a5f2ad 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/Page2.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/Page2.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.ui +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.ui import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/Pages2Adapter.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/Pages2Adapter.kt similarity index 85% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/Pages2Adapter.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/Pages2Adapter.kt index a9844b6..6e2d967 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/Pages2Adapter.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/Pages2Adapter.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.ui +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.ui import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/ViewPager2WithTabs.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/ViewPager2WithTabs.kt similarity index 91% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/ViewPager2WithTabs.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/ViewPager2WithTabs.kt index fe1a844..7e791e9 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/ui/ViewPager2WithTabs.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/impl/androidsdk/ui/ViewPager2WithTabs.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.ui +package com.smlnskgmail.jaman.deviceinfo.logic.info.impl.androidsdk.ui import androidx.appcompat.app.AppCompatActivity import androidx.viewpager2.widget.ViewPager2 diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/DeviceBatteryPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/DeviceBatteryPage.kt deleted file mode 100644 index 108b862..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/battery/DeviceBatteryPage.kt +++ /dev/null @@ -1,33 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery - -import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.recycler.BatteryActionInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.recycler.BatteryHealthInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.battery.recycler.BatteryPluggedInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.BatteryInfo - -class DeviceBatteryPage : BaseListInfoPage() { - - override fun infoItems(): List { - val batteryInfo: BatteryInfo = DeviceBatteryInfo(context!!) - return listOf( - BatteryHealthInfoItem( - context!!, - batteryInfo - ), - BatteryActionInfoItem( - context!!, - batteryInfo - ), - BatteryPluggedInfoItem( - context!!, - batteryInfo - ) - ) - } - - override fun pageTitleResId() = R.string.page_title_battery - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/DeviceCPUPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/DeviceCPUPage.kt deleted file mode 100644 index beb687a..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/cpu/DeviceCPUPage.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu - -import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.recycler.CPUCoresInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.cpu.recycler.CPUFreqInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.CPUInfo - -class DeviceCPUPage : BaseListInfoPage() { - - override fun infoItems(): List { - val cpuInfo: CPUInfo = DeviceCPUInfo() - return listOf( - CPUCoresInfoItem( - context!!, - cpuInfo - ), - CPUFreqInfoItem( - context!!, - cpuInfo - ) - ) - } - - override fun pageTitleResId() = R.string.page_title_cpu - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/DeviceGPUIInfo.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/DeviceGPUIInfo.kt deleted file mode 100644 index 013ca24..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/DeviceGPUIInfo.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu - -import android.content.Context -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.preferences.GPUModelPreferenceUnit -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.preferences.GPUVendorPreferenceUnit -import com.smlnskgmail.jaman.deviceinfo.logic.info.GPUIInfo -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.types.StringPreference - -class DeviceGPUIInfo(private val context: Context) : - GPUIInfo { - - override fun vendor() = StringPreference( - context, - GPUVendorPreferenceUnit() - ).value() - - override fun model() = StringPreference( - context, - GPUModelPreferenceUnit() - ).value() - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/DeviceGPUPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/DeviceGPUPage.kt deleted file mode 100644 index 16cb5a2..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/DeviceGPUPage.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu - -import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.recycler.GPUModelInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.recycler.GPUVendorInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.GPUIInfo - -class DeviceGPUPage : BaseListInfoPage() { - - override fun infoItems(): List { - val gpuInfo: GPUIInfo = DeviceGPUIInfo(context!!) - return listOf( - GPUModelInfoItem( - context!!, - gpuInfo - ), - GPUVendorInfoItem( - context!!, - gpuInfo - ) - ) - } - - override fun pageTitleResId() = R.string.page_title_gpu - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/preferences/GPUModelPreferenceUnit.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/preferences/GPUModelPreferenceUnit.kt deleted file mode 100644 index 781b263..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/preferences/GPUModelPreferenceUnit.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.preferences - -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.PreferenceUnit - -class GPUModelPreferenceUnit : - PreferenceUnit { - - override fun key() = "gpu_model" - - override fun defaultValue() = "" - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/preferences/GPUVendorPreferenceUnit.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/preferences/GPUVendorPreferenceUnit.kt deleted file mode 100644 index 9bc3c84..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/gpu/preferences/GPUVendorPreferenceUnit.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.gpu.preferences - -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.PreferenceUnit - -class GPUVendorPreferenceUnit : - PreferenceUnit { - - override fun key() = "gpu_vendor" - - override fun defaultValue() = "" - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/DeviceJVMPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/DeviceJVMPage.kt deleted file mode 100644 index 85060b7..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/jvm/DeviceJVMPage.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm - -import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.jvm.recycler.JVMNameInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.JVMInfo -import java.util.* - -class DeviceJVMPage : BaseListInfoPage() { - - override fun infoItems(): List { - val jvmInfo: JVMInfo = DeviceJVMInfo(context!!) - return Collections.singletonList( - JVMNameInfoItem( - context!!, - jvmInfo - ) - ) - } - - override fun pageTitleResId() = R.string.page_title_jvm - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/DeviceRAMPage.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/DeviceRAMPage.kt deleted file mode 100644 index 419d4e2..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/ram/DeviceRAMPage.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram - -import com.smlnskgmail.jaman.deviceinfo.R -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.BaseListInfoPage -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.recycler.AvailableRAMInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.ram.recycler.TotalRAMInfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler.InfoItem -import com.smlnskgmail.jaman.deviceinfo.logic.info.RAMInfo - -class DeviceRAMPage : BaseListInfoPage() { - - override fun infoItems(): List { - val ramInfo: RAMInfo = DeviceRAMInfo(context!!) - ramInfo.loadState() - return listOf( - AvailableRAMInfoItem( - context!!, - ramInfo - ), - TotalRAMInfoItem( - context!!, - ramInfo - ) - ) - } - - override fun pageTitleResId() = R.string.page_title_ram - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoItem.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoItem.kt deleted file mode 100644 index fffba2f..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/info/realizations/mainpager/pages/recycler/InfoItem.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.info.realizations.mainpager.pages.recycler - -interface InfoItem { - - fun title(): String - fun body(): String - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/PreferenceUnit.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/PreferenceUnit.kt deleted file mode 100644 index ca96e2b..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/PreferenceUnit.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.preferences - -interface PreferenceUnit { - - fun key(): String - fun defaultValue(): T - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/Preference.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/api/Preference.kt similarity index 53% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/Preference.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/api/Preference.kt index 6bff4a6..3d14f7f 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/Preference.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/api/Preference.kt @@ -1,4 +1,4 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.preferences +package com.smlnskgmail.jaman.deviceinfo.logic.preferences.api interface Preference { diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/api/PreferenceValue.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/api/PreferenceValue.kt new file mode 100644 index 0000000..1e068a6 --- /dev/null +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/api/PreferenceValue.kt @@ -0,0 +1,8 @@ +package com.smlnskgmail.jaman.deviceinfo.logic.preferences.api + +interface PreferenceValue { + + fun key(): String + fun defaultValue(): T + +} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/common/FirstLaunchPreferenceUnit.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/common/FirstLaunchPreferenceUnit.kt deleted file mode 100644 index f07beb7..0000000 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/common/FirstLaunchPreferenceUnit.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.preferences.common - -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.PreferenceUnit - -class FirstLaunchPreferenceUnit : - PreferenceUnit { - - override fun key() = "first_launch" - - override fun defaultValue() = true - -} diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/types/BooleanPreference.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/impl/shared/BooleanPreference.kt similarity index 54% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/types/BooleanPreference.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/impl/shared/BooleanPreference.kt index d98c4f5..cc375a9 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/types/BooleanPreference.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/impl/shared/BooleanPreference.kt @@ -1,16 +1,16 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.preferences.types +package com.smlnskgmail.jaman.deviceinfo.logic.preferences.impl.shared import android.content.Context import androidx.preference.PreferenceManager -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.Preference -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.PreferenceUnit +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.Preference +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.PreferenceValue class BooleanPreference( private val context: Context, - private val preferenceUnit: PreferenceUnit + private val preferenceValue: PreferenceValue ) : Preference { - private val key = preferenceUnit.key() + private val key = preferenceValue.key() override fun save(value: Boolean) { PreferenceManager.getDefaultSharedPreferences(context) @@ -21,7 +21,7 @@ class BooleanPreference( override fun value(): Boolean { return PreferenceManager.getDefaultSharedPreferences(context) - .getBoolean(key, preferenceUnit.defaultValue()) + .getBoolean(key, preferenceValue.defaultValue()) } } diff --git a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/types/StringPreference.kt b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/impl/shared/StringPreference.kt similarity index 54% rename from app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/types/StringPreference.kt rename to app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/impl/shared/StringPreference.kt index 3c8dfe1..92095e3 100644 --- a/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/types/StringPreference.kt +++ b/app/src/main/java/com/smlnskgmail/jaman/deviceinfo/logic/preferences/impl/shared/StringPreference.kt @@ -1,16 +1,16 @@ -package com.smlnskgmail.jaman.deviceinfo.logic.preferences.types +package com.smlnskgmail.jaman.deviceinfo.logic.preferences.impl.shared import android.content.Context import androidx.preference.PreferenceManager -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.Preference -import com.smlnskgmail.jaman.deviceinfo.logic.preferences.PreferenceUnit +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.Preference +import com.smlnskgmail.jaman.deviceinfo.logic.preferences.api.PreferenceValue class StringPreference( private val context: Context, - private val preferenceUnit: PreferenceUnit + private val preferenceValue: PreferenceValue ) : Preference { - private val key = preferenceUnit.key() + private val key = preferenceValue.key() override fun save(value: String) { PreferenceManager.getDefaultSharedPreferences(context) @@ -21,7 +21,7 @@ class StringPreference( override fun value(): String { return PreferenceManager.getDefaultSharedPreferences(context) - .getString(key, preferenceUnit.defaultValue())!! + .getString(key, preferenceValue.defaultValue())!! } } diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeBatteryInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeBatteryInfo.kt index 1505964..1ee5560 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeBatteryInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeBatteryInfo.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoStringResult -import com.smlnskgmail.jaman.deviceinfo.logic.info.BatteryInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.BatteryInfo class FakeBatteryInfo : BatteryInfo { diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeCPUInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeCPUInfo.kt index cd69af2..cfaca1c 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeCPUInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeCPUInfo.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoIntResult -import com.smlnskgmail.jaman.deviceinfo.logic.info.CPUInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.CPUInfo class FakeCPUInfo : CPUInfo { diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeDisplayInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeDisplayInfo.kt index 31aae0c..36d2fec 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeDisplayInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeDisplayInfo.kt @@ -2,7 +2,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoIntResult import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoStringResult -import com.smlnskgmail.jaman.deviceinfo.logic.info.DisplayInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.DisplayInfo class FakeDisplayInfo : DisplayInfo { diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeGPUInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeGPUInfo.kt index 9b3f2e8..2000aa5 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeGPUInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeGPUInfo.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoStringResult -import com.smlnskgmail.jaman.deviceinfo.logic.info.GPUIInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.GPUIInfo class FakeGPUInfo : GPUIInfo { diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeRAMInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeRAMInfo.kt index 364cbc0..02f839a 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeRAMInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeRAMInfo.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoIntResult -import com.smlnskgmail.jaman.deviceinfo.logic.info.RAMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.RAMInfo class FakeRAMInfo : RAMInfo { diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeSystemInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeSystemInfo.kt index 15f00d0..172dc9e 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeSystemInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/FakeSystemInfo.kt @@ -1,7 +1,7 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo import com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata.FakeInfoStringResult -import com.smlnskgmail.jaman.deviceinfo.logic.info.SystemInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.SystemInfo class FakeSystemInfo : SystemInfo { diff --git a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/defaultdata/FakeJVMInfo.kt b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/defaultdata/FakeJVMInfo.kt index d7403c0..679674e 100644 --- a/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/defaultdata/FakeJVMInfo.kt +++ b/app/src/test/java/com/smlnskgmail/jaman/deviceinfo/info/structure/categories/fakeinfo/defaultdata/FakeJVMInfo.kt @@ -1,6 +1,6 @@ package com.smlnskgmail.jaman.deviceinfo.info.structure.categories.fakeinfo.defaultdata -import com.smlnskgmail.jaman.deviceinfo.logic.info.JVMInfo +import com.smlnskgmail.jaman.deviceinfo.logic.info.api.JVMInfo class FakeJVMInfo : JVMInfo { diff --git a/build.gradle b/build.gradle index 454825d..215d256 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,6 @@ allprojects { repositories { google() jcenter() - } }