diff --git a/.idea/.name b/.idea/.name index 9fc5d44..1a945db 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Refactored App \ No newline at end of file +hpos \ No newline at end of file diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 36a10f0..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..fdc392f --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 87da94e..94a290b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,12 +2,13 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' } +//apply plugin: 'kotlin-android' android { compileSdk 32 defaultConfig { - applicationId "com.example.refactoredapp" + applicationId "com.example.hpos" minSdk 21 targetSdk 32 versionCode 1 @@ -44,8 +45,6 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -// androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" implementation 'com.opencsv:opencsv:4.6' @@ -55,4 +54,11 @@ dependencies { implementation 'com.opencsv:opencsv:4.6' -} \ No newline at end of file +// implementation 'androidx.appcompat:appcompat:1.1.0' +// implementation "androidx.core:core-ktx:+" +// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + +} +//repositories { +// mavenCentral() +//} \ No newline at end of file diff --git a/app/src/androidTest/java/com/example/refactoredapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/hpos/ExampleInstrumentedTest.kt similarity index 94% rename from app/src/androidTest/java/com/example/refactoredapp/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/example/hpos/ExampleInstrumentedTest.kt index 97c1e24..9237558 100644 --- a/app/src/androidTest/java/com/example/refactoredapp/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/example/hpos/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp +package com.example.hpos import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b572898..ec9de22 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="com.example.hpos"> @@ -15,16 +15,16 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.RefactoredApp" + android:theme="@style/Theme.HPOS" tools:targetApi="31"> @@ -35,7 +35,7 @@ @@ -47,7 +47,7 @@ diff --git a/app/src/main/java/com/example/refactoredapp/MyApplication.kt b/app/src/main/java/com/example/hpos/MyApplication.kt similarity index 88% rename from app/src/main/java/com/example/refactoredapp/MyApplication.kt rename to app/src/main/java/com/example/hpos/MyApplication.kt index 9f55a8c..ae854cc 100644 --- a/app/src/main/java/com/example/refactoredapp/MyApplication.kt +++ b/app/src/main/java/com/example/hpos/MyApplication.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp +package com.example.hpos import android.app.Application diff --git a/app/src/main/java/com/example/refactoredapp/data/DataHolder.kt b/app/src/main/java/com/example/hpos/data/DataHolder.kt similarity index 82% rename from app/src/main/java/com/example/refactoredapp/data/DataHolder.kt rename to app/src/main/java/com/example/hpos/data/DataHolder.kt index e52ea6f..62be78a 100644 --- a/app/src/main/java/com/example/refactoredapp/data/DataHolder.kt +++ b/app/src/main/java/com/example/hpos/data/DataHolder.kt @@ -1,6 +1,6 @@ -package com.example.refactoredapp.data +package com.example.hpos.data -import com.example.refactoredapp.data.model.TestRightDeviceConstants +import com.example.hpos.data.model.TestRightDeviceConstants object DataHolder { var isStoragePermissionGranted = false diff --git a/app/src/main/java/com/example/hpos/data/Repository.kt b/app/src/main/java/com/example/hpos/data/Repository.kt new file mode 100644 index 0000000..6f89be1 --- /dev/null +++ b/app/src/main/java/com/example/hpos/data/Repository.kt @@ -0,0 +1,7 @@ +package com.example.hpos.data + +import com.example.hpos.data.model.TestInfo + +interface Repository { + suspend fun saveToDatabase(info: TestInfo) +} \ No newline at end of file diff --git a/app/src/main/java/com/example/refactoredapp/data/RepositoryImpl.kt b/app/src/main/java/com/example/hpos/data/RepositoryImpl.kt similarity index 53% rename from app/src/main/java/com/example/refactoredapp/data/RepositoryImpl.kt rename to app/src/main/java/com/example/hpos/data/RepositoryImpl.kt index a8aba4a..6f097b3 100644 --- a/app/src/main/java/com/example/refactoredapp/data/RepositoryImpl.kt +++ b/app/src/main/java/com/example/hpos/data/RepositoryImpl.kt @@ -1,6 +1,6 @@ -package com.example.refactoredapp.data +package com.example.hpos.data -import com.example.refactoredapp.data.model.TestInfo +import com.example.hpos.data.model.TestInfo class RepositoryImpl : Repository { diff --git a/app/src/main/java/com/example/refactoredapp/data/constant/Constants.kt b/app/src/main/java/com/example/hpos/data/constant/Constants.kt similarity index 91% rename from app/src/main/java/com/example/refactoredapp/data/constant/Constants.kt rename to app/src/main/java/com/example/hpos/data/constant/Constants.kt index c6fc8a5..a21025c 100644 --- a/app/src/main/java/com/example/refactoredapp/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpos/data/constant/Constants.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.constant +package com.example.hpos.data.constant object Constants { const val ACTION_USB_PERMISSION = "shanmukha.in.sickle_cell.USB_PERMISSION" diff --git a/app/src/main/java/com/example/refactoredapp/data/constant/TestRightCommands.kt b/app/src/main/java/com/example/hpos/data/constant/TestRightCommands.kt similarity index 78% rename from app/src/main/java/com/example/refactoredapp/data/constant/TestRightCommands.kt rename to app/src/main/java/com/example/hpos/data/constant/TestRightCommands.kt index d5b6ac9..8a92eca 100644 --- a/app/src/main/java/com/example/refactoredapp/data/constant/TestRightCommands.kt +++ b/app/src/main/java/com/example/hpos/data/constant/TestRightCommands.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.constant +package com.example.hpos.data.constant enum class TestRightCommands(val command: String) { led2Set50("led2 50\r"), @@ -8,4 +8,5 @@ enum class TestRightCommands(val command: String) { run("run\r"), printInRange("print 239 339\r"), printAll("print\r"), + testByEnter("\n\r") } \ No newline at end of file diff --git a/app/src/main/java/com/example/HPOS/data/model/CalculationVariableForTest.kt b/app/src/main/java/com/example/hpos/data/model/CalculationVariableForTest.kt similarity index 86% rename from app/src/main/java/com/example/HPOS/data/model/CalculationVariableForTest.kt rename to app/src/main/java/com/example/hpos/data/model/CalculationVariableForTest.kt index 48671a4..c15cc2b 100644 --- a/app/src/main/java/com/example/HPOS/data/model/CalculationVariableForTest.kt +++ b/app/src/main/java/com/example/hpos/data/model/CalculationVariableForTest.kt @@ -1,4 +1,4 @@ -package com.example.HPOS.data.model +package com.example.hpos.data.model data class CalculationVariableForTest( var pixelNo: Int, diff --git a/app/src/main/java/com/example/refactoredapp/data/model/DeviceType.kt b/app/src/main/java/com/example/hpos/data/model/DeviceType.kt similarity index 53% rename from app/src/main/java/com/example/refactoredapp/data/model/DeviceType.kt rename to app/src/main/java/com/example/hpos/data/model/DeviceType.kt index 53dde45..a0e1006 100644 --- a/app/src/main/java/com/example/refactoredapp/data/model/DeviceType.kt +++ b/app/src/main/java/com/example/hpos/data/model/DeviceType.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.model +package com.example.hpos.data.model enum class DeviceType { Denovix, diff --git a/app/src/main/java/com/example/refactoredapp/data/model/PatientData.kt b/app/src/main/java/com/example/hpos/data/model/PatientData.kt similarity index 73% rename from app/src/main/java/com/example/refactoredapp/data/model/PatientData.kt rename to app/src/main/java/com/example/hpos/data/model/PatientData.kt index b6add54..d9cbee1 100644 --- a/app/src/main/java/com/example/refactoredapp/data/model/PatientData.kt +++ b/app/src/main/java/com/example/hpos/data/model/PatientData.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.model +package com.example.hpos.data.model data class PatientData( val name: String, diff --git a/app/src/main/java/com/example/refactoredapp/data/model/TestInfo.kt b/app/src/main/java/com/example/hpos/data/model/TestInfo.kt similarity index 84% rename from app/src/main/java/com/example/refactoredapp/data/model/TestInfo.kt rename to app/src/main/java/com/example/hpos/data/model/TestInfo.kt index 3aeab66..536aa56 100644 --- a/app/src/main/java/com/example/refactoredapp/data/model/TestInfo.kt +++ b/app/src/main/java/com/example/hpos/data/model/TestInfo.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.model +package com.example.hpos.data.model data class TestInfo( val value: String, diff --git a/app/src/main/java/com/example/refactoredapp/data/model/TestRightCalculationData.kt b/app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt similarity index 87% rename from app/src/main/java/com/example/refactoredapp/data/model/TestRightCalculationData.kt rename to app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt index 601c64c..f21b6d6 100644 --- a/app/src/main/java/com/example/refactoredapp/data/model/TestRightCalculationData.kt +++ b/app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.model +package com.example.hpos.data.model data class TestRightCalculationData( var absorbanceOne: Double?, diff --git a/app/src/main/java/com/example/refactoredapp/data/model/TestRightDeviceConstants.kt b/app/src/main/java/com/example/hpos/data/model/TestRightDeviceConstants.kt similarity index 71% rename from app/src/main/java/com/example/refactoredapp/data/model/TestRightDeviceConstants.kt rename to app/src/main/java/com/example/hpos/data/model/TestRightDeviceConstants.kt index adc8405..7e576c6 100644 --- a/app/src/main/java/com/example/refactoredapp/data/model/TestRightDeviceConstants.kt +++ b/app/src/main/java/com/example/hpos/data/model/TestRightDeviceConstants.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.model +package com.example.hpos.data.model data class TestRightDeviceConstants( var a: String, diff --git a/app/src/main/java/com/example/refactoredapp/data/model/TestRightResultType.kt b/app/src/main/java/com/example/hpos/data/model/TestRightResultType.kt similarity index 69% rename from app/src/main/java/com/example/refactoredapp/data/model/TestRightResultType.kt rename to app/src/main/java/com/example/hpos/data/model/TestRightResultType.kt index 79a8ddd..3ca397e 100644 --- a/app/src/main/java/com/example/refactoredapp/data/model/TestRightResultType.kt +++ b/app/src/main/java/com/example/hpos/data/model/TestRightResultType.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.data.model +package com.example.hpos.data.model enum class TestRightResultType { NORMAL, diff --git a/app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithAvgImpl.kt b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt similarity index 94% rename from app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithAvgImpl.kt rename to app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt index 771a1b2..1595947 100644 --- a/app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithAvgImpl.kt +++ b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt @@ -1,8 +1,8 @@ -package com.example.refactoredapp.domain +package com.example.hpos.domain -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.model.TestRightCalculationData -import com.example.refactoredapp.data.model.TestRightResultType +import com.example.hpos.data.constant.Constants +import com.example.hpos.data.model.TestRightCalculationData +import com.example.hpos.data.model.TestRightResultType class ResultCalculationWithAvgImpl : TestRightResultCalculation { diff --git a/app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithFirstImpl.kt b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithFirstImpl.kt similarity index 95% rename from app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithFirstImpl.kt rename to app/src/main/java/com/example/hpos/domain/ResultCalculationWithFirstImpl.kt index 4b118df..b350f18 100644 --- a/app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithFirstImpl.kt +++ b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithFirstImpl.kt @@ -1,8 +1,8 @@ -package com.example.refactoredapp.domain +package com.example.hpos.domain import android.util.Log -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.model.TestRightResultType +import com.example.hpos.data.constant.Constants +import com.example.hpos.data.model.TestRightResultType import kotlin.math.log10 class ResultCalculationWithFirstImpl { diff --git a/app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithMaxImpl.kt b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt similarity index 93% rename from app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithMaxImpl.kt rename to app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt index 39a98b6..6d6f39a 100644 --- a/app/src/main/java/com/example/refactoredapp/domain/ResultCalculationWithMaxImpl.kt +++ b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt @@ -1,8 +1,8 @@ -package com.example.refactoredapp.domain +package com.example.hpos.domain -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.model.TestRightCalculationData -import com.example.refactoredapp.data.model.TestRightResultType +import com.example.hpos.data.constant.Constants +import com.example.hpos.data.model.TestRightCalculationData +import com.example.hpos.data.model.TestRightResultType class ResultCalculationWithMaxImpl : TestRightResultCalculation { diff --git a/app/src/main/java/com/example/refactoredapp/domain/SaveRawData.kt b/app/src/main/java/com/example/hpos/domain/SaveRawData.kt similarity index 94% rename from app/src/main/java/com/example/refactoredapp/domain/SaveRawData.kt rename to app/src/main/java/com/example/hpos/domain/SaveRawData.kt index ba689d5..0327a9b 100644 --- a/app/src/main/java/com/example/refactoredapp/domain/SaveRawData.kt +++ b/app/src/main/java/com/example/hpos/domain/SaveRawData.kt @@ -1,6 +1,6 @@ -package com.example.refactoredapp.domain +package com.example.hpos.domain -import com.example.refactoredapp.data.model.TestRightCalculationData +import com.example.hpos.data.model.TestRightCalculationData import com.opencsv.CSVWriter import java.io.File import java.io.FileWriter diff --git a/app/src/main/java/com/example/HPOS/domain/SaveRawDataTest.kt b/app/src/main/java/com/example/hpos/domain/SaveRawDataTest.kt similarity index 93% rename from app/src/main/java/com/example/HPOS/domain/SaveRawDataTest.kt rename to app/src/main/java/com/example/hpos/domain/SaveRawDataTest.kt index e69bce9..84615e7 100644 --- a/app/src/main/java/com/example/HPOS/domain/SaveRawDataTest.kt +++ b/app/src/main/java/com/example/hpos/domain/SaveRawDataTest.kt @@ -1,6 +1,6 @@ -package com.example.HPOS.domain +package com.example.hpos.domain -import com.example.HPOS.data.model.CalculationVariableForTest +import com.example.hpos.data.model.CalculationVariableForTest import com.opencsv.CSVWriter import java.io.File import java.io.FileWriter diff --git a/app/src/main/java/com/example/hpos/domain/TestRightResultCalculation.kt b/app/src/main/java/com/example/hpos/domain/TestRightResultCalculation.kt new file mode 100644 index 0000000..63df403 --- /dev/null +++ b/app/src/main/java/com/example/hpos/domain/TestRightResultCalculation.kt @@ -0,0 +1,9 @@ +package com.example.hpos.domain + +import com.example.hpos.data.model.TestRightCalculationData + +interface TestRightResultCalculation { + fun getResults( + wavelengthToAbsorbance: ArrayList> + ): TestRightCalculationData +} \ No newline at end of file diff --git a/app/src/main/java/com/example/refactoredapp/presentation/MainActivity.kt b/app/src/main/java/com/example/hpos/presentation/MainActivity.kt similarity index 70% rename from app/src/main/java/com/example/refactoredapp/presentation/MainActivity.kt rename to app/src/main/java/com/example/hpos/presentation/MainActivity.kt index 0260cbd..6032226 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/MainActivity.kt +++ b/app/src/main/java/com/example/hpos/presentation/MainActivity.kt @@ -1,13 +1,13 @@ -package com.example.refactoredapp.presentation +package com.example.hpos.presentation import android.content.Intent import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider -import com.example.refactoredapp.databinding.ActivityMainBinding -import com.example.refactoredapp.presentation.testRight.TestRightActivity -import com.example.refactoredapp.util.MyViewModelFactory +import com.example.hpos.databinding.ActivityMainBinding +import com.example.hpos.presentation.testRight.TestRightActivity +import com.example.hpos.util.MyViewModelFactory class MainActivity : AppCompatActivity() @@ -45,17 +45,4 @@ class MainActivity : AppCompatActivity() } - - private fun setupObservers() { -// viewModel.isStoragePermission.observe(this) { -// if (it) { -// createFolder() -// } -// } - } - - override fun onDestroy() { - super.onDestroy() - } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpos/presentation/MainViewModel.kt b/app/src/main/java/com/example/hpos/presentation/MainViewModel.kt new file mode 100644 index 0000000..d5a1bfb --- /dev/null +++ b/app/src/main/java/com/example/hpos/presentation/MainViewModel.kt @@ -0,0 +1,7 @@ +package com.example.hpos.presentation + +import androidx.lifecycle.ViewModel + +class MainViewModel : ViewModel() { + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/refactoredapp/presentation/RVAdapter.kt b/app/src/main/java/com/example/hpos/presentation/RVAdapter.kt similarity index 86% rename from app/src/main/java/com/example/refactoredapp/presentation/RVAdapter.kt rename to app/src/main/java/com/example/hpos/presentation/RVAdapter.kt index 45d4828..0a45278 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/RVAdapter.kt +++ b/app/src/main/java/com/example/hpos/presentation/RVAdapter.kt @@ -1,11 +1,11 @@ -package com.example.refactoredapp.presentation +package com.example.hpos.presentation import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.example.refactoredapp.R -import com.example.refactoredapp.data.model.PatientData +import com.example.hpos.R +import com.example.hpos.data.model.PatientData class RVAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/example/refactoredapp/presentation/SplashActivity.kt b/app/src/main/java/com/example/hpos/presentation/SplashActivity.kt similarity index 93% rename from app/src/main/java/com/example/refactoredapp/presentation/SplashActivity.kt rename to app/src/main/java/com/example/hpos/presentation/SplashActivity.kt index 26b6df1..af96328 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/SplashActivity.kt +++ b/app/src/main/java/com/example/hpos/presentation/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation +package com.example.hpos.presentation import android.Manifest import android.content.Intent @@ -13,11 +13,9 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import com.example.refactoredapp.R -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.databinding.ActivitySplashBinding -import com.example.refactoredapp.util.MyUtils -import java.io.File +import com.example.hpos.data.DataHolder +import com.example.hpos.databinding.ActivitySplashBinding +import com.example.hpos.util.MyUtils /** * Splash Activity diff --git a/app/src/main/java/com/example/refactoredapp/presentation/UsbServiceListener.kt b/app/src/main/java/com/example/hpos/presentation/UsbServiceListener.kt similarity index 69% rename from app/src/main/java/com/example/refactoredapp/presentation/UsbServiceListener.kt rename to app/src/main/java/com/example/hpos/presentation/UsbServiceListener.kt index 15ea960..7a331d8 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/UsbServiceListener.kt +++ b/app/src/main/java/com/example/hpos/presentation/UsbServiceListener.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation +package com.example.hpos.presentation interface UsbServiceListener { fun onUsbRead(data: ByteArray?) diff --git a/app/src/main/java/com/example/refactoredapp/presentation/testRight/TestRightActivity.kt b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightActivity.kt similarity index 93% rename from app/src/main/java/com/example/refactoredapp/presentation/testRight/TestRightActivity.kt rename to app/src/main/java/com/example/hpos/presentation/testRight/TestRightActivity.kt index 7411c5c..676cd20 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/testRight/TestRightActivity.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightActivity.kt @@ -1,5 +1,6 @@ -package com.example.refactoredapp.presentation.testRight +package com.example.hpos.presentation.testRight +import android.R import android.app.PendingIntent import android.content.* import android.hardware.usb.UsbDevice @@ -8,13 +9,16 @@ import android.hardware.usb.UsbManager import android.os.Bundle import android.os.IBinder import android.util.Log +import android.view.MenuItem +import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.ViewModelProvider -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.databinding.ActivityTestRightBinding -import com.example.refactoredapp.util.MyViewModelFactory +import com.example.hpos.data.DataHolder +import com.example.hpos.data.constant.Constants +import com.example.hpos.databinding.ActivityTestRightBinding +import com.example.hpos.util.MyViewModelFactory +import com.google.android.material.snackbar.Snackbar import com.hoho.android.usbserial.driver.UsbSerialDriver import com.hoho.android.usbserial.driver.UsbSerialProber diff --git a/app/src/main/java/com/example/refactoredapp/presentation/testRight/TestRightExpReference.kt b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpReference.kt similarity index 96% rename from app/src/main/java/com/example/refactoredapp/presentation/testRight/TestRightExpReference.kt rename to app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpReference.kt index e090eec..2d5540f 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/testRight/TestRightExpReference.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpReference.kt @@ -1,23 +1,21 @@ -package com.example.refactoredapp.presentation.testRight +package com.example.hpos.presentation.testRight import android.os.Bundle import android.os.Handler import android.os.Looper import android.util.Log import android.view.LayoutInflater -import android.view.MotionEvent import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.refactoredapp.R -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.constant.TestRightCommands -import com.example.refactoredapp.databinding.FragmentTestRightExpReferenceBinding -import com.example.refactoredapp.presentation.UsbServiceListener -import com.example.refactoredapp.presentation.utils.MyDialogListener -import com.example.refactoredapp.presentation.utils.UIUtils +import com.example.hpos.R +import com.example.hpos.data.DataHolder +import com.example.hpos.data.constant.TestRightCommands +import com.example.hpos.databinding.FragmentTestRightExpReferenceBinding +import com.example.hpos.presentation.UsbServiceListener +import com.example.hpos.presentation.utils.MyDialogListener +import com.example.hpos.presentation.utils.UIUtils class TestRightExpReference : Fragment() { diff --git a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt index ff67192..5830e0a 100644 --- a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightExpSample.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation.testRight +package com.example.hpos.presentation.testRight import android.os.Bundle import android.os.Handler @@ -9,14 +9,12 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.refactoredapp.R -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.constant.TestRightCommands -import com.example.refactoredapp.data.model.PatientData -import com.example.refactoredapp.data.model.TestRightResultType -import com.example.refactoredapp.databinding.FragmentTestRightExpSampleBinding -import com.example.refactoredapp.presentation.UsbServiceListener +import com.example.hpos.R +import com.example.hpos.data.constant.TestRightCommands +import com.example.hpos.data.model.PatientData +import com.example.hpos.data.model.TestRightResultType +import com.example.hpos.databinding.FragmentTestRightExpSampleBinding +import com.example.hpos.presentation.UsbServiceListener class TestRightExpSample : Fragment() { diff --git a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightResults.kt b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightResults.kt index 533abb8..6d00ffc 100644 --- a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightResults.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightResults.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation.testRight +package com.example.hpos.presentation.testRight import android.content.Intent import android.os.Bundle @@ -8,13 +8,13 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels -import com.example.refactoredapp.R -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.model.TestRightResultType -import com.example.refactoredapp.databinding.FragmentTestRightResultsBinding -import com.example.refactoredapp.presentation.MainActivity -import com.example.refactoredapp.util.MyUtils +import com.example.hpos.R +import com.example.hpos.data.DataHolder +import com.example.hpos.data.constant.Constants +import com.example.hpos.data.model.TestRightResultType +import com.example.hpos.databinding.FragmentTestRightResultsBinding +import com.example.hpos.presentation.MainActivity +import com.example.hpos.util.MyUtils import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightViewModel.kt index 768d982..ce1d45b 100644 --- a/app/src/main/java/com/example/hpos/presentation/testRight/TestRightViewModel.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/TestRightViewModel.kt @@ -1,16 +1,18 @@ -package com.example.refactoredapp.presentation.testRight +package com.example.hpos.presentation.testRight import android.util.Log import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.data.model.PatientData -import com.example.refactoredapp.data.model.TestRightCalculationData -import com.example.refactoredapp.data.model.TestRightDeviceConstants -import com.example.refactoredapp.domain.ResultCalculationWithMaxImpl -import com.example.refactoredapp.domain.SaveRawData -import com.example.refactoredapp.domain.TestRightResultCalculation +import com.example.hpos.data.constant.Constants +import com.example.hpos.data.DataHolder +import com.example.hpos.data.model.CalculationVariableForTest +import com.example.hpos.data.model.PatientData +import com.example.hpos.data.model.TestRightCalculationData +import com.example.hpos.data.model.TestRightDeviceConstants +import com.example.hpos.domain.ResultCalculationWithMaxImpl +import com.example.hpos.domain.SaveRawData +import com.example.hpos.domain.SaveRawDataTest +import com.example.hpos.domain.TestRightResultCalculation import java.lang.Exception import java.text.SimpleDateFormat import java.util.* @@ -41,7 +43,7 @@ class TestRightViewModel : ViewModel() { // private val intensityReferenceArray = ArrayList() /* (For exp sample) Contains pixel no. -> Intensity of light falling on that pixel */ - private val intensitySampleArray = ArrayList() + val intensitySampleArray = ArrayList() val wavelengthToAbsorbance = ArrayList>() @@ -186,7 +188,6 @@ class TestRightViewModel : ViewModel() { // for ((index,wavelength) in wavelengthToPixelArray.withIndex()) { for (index in 0 until DataHolder.wavelengthToPixelArray.size) { - // Todo: handle indexInIntensityArrays <0 val invertedPixelIndex = (Constants.TEST_RIGHT_TOTAL_PIXEL) - (index + 1) diff --git a/app/src/main/java/com/example/refactoredapp/presentation/testRight/UsbService.kt b/app/src/main/java/com/example/hpos/presentation/testRight/UsbService.kt similarity index 94% rename from app/src/main/java/com/example/refactoredapp/presentation/testRight/UsbService.kt rename to app/src/main/java/com/example/hpos/presentation/testRight/UsbService.kt index 8f04f20..787566f 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/testRight/UsbService.kt +++ b/app/src/main/java/com/example/hpos/presentation/testRight/UsbService.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation.testRight +package com.example.hpos.presentation.testRight import android.app.Service import android.content.Intent @@ -6,9 +6,9 @@ import android.hardware.usb.UsbDeviceConnection import android.os.Binder import android.os.IBinder import android.util.Log -import com.example.refactoredapp.data.constant.Constants -import com.example.refactoredapp.data.constant.TestRightCommands -import com.example.refactoredapp.presentation.UsbServiceListener +import com.example.hpos.data.constant.Constants +import com.example.hpos.data.constant.TestRightCommands +import com.example.hpos.presentation.UsbServiceListener import com.hoho.android.usbserial.driver.UsbSerialDriver import com.hoho.android.usbserial.driver.UsbSerialPort import com.hoho.android.usbserial.util.SerialInputOutputManager diff --git a/app/src/main/java/com/example/refactoredapp/presentation/utils/MyDialogListener.kt b/app/src/main/java/com/example/hpos/presentation/utils/MyDialogListener.kt similarity index 59% rename from app/src/main/java/com/example/refactoredapp/presentation/utils/MyDialogListener.kt rename to app/src/main/java/com/example/hpos/presentation/utils/MyDialogListener.kt index 29d491f..8fb31de 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/utils/MyDialogListener.kt +++ b/app/src/main/java/com/example/hpos/presentation/utils/MyDialogListener.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation.utils +package com.example.hpos.presentation.utils interface MyDialogListener { fun onClickBtnOne() diff --git a/app/src/main/java/com/example/refactoredapp/presentation/utils/UIUtils.kt b/app/src/main/java/com/example/hpos/presentation/utils/UIUtils.kt similarity index 92% rename from app/src/main/java/com/example/refactoredapp/presentation/utils/UIUtils.kt rename to app/src/main/java/com/example/hpos/presentation/utils/UIUtils.kt index 70fb1b6..796a6ba 100644 --- a/app/src/main/java/com/example/refactoredapp/presentation/utils/UIUtils.kt +++ b/app/src/main/java/com/example/hpos/presentation/utils/UIUtils.kt @@ -1,4 +1,4 @@ -package com.example.refactoredapp.presentation.utils +package com.example.hpos.presentation.utils import android.content.Context import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/com/example/refactoredapp/util/MyUtils.kt b/app/src/main/java/com/example/hpos/util/MyUtils.kt similarity index 83% rename from app/src/main/java/com/example/refactoredapp/util/MyUtils.kt rename to app/src/main/java/com/example/hpos/util/MyUtils.kt index 42377e0..79f3a6e 100644 --- a/app/src/main/java/com/example/refactoredapp/util/MyUtils.kt +++ b/app/src/main/java/com/example/hpos/util/MyUtils.kt @@ -1,11 +1,9 @@ -package com.example.refactoredapp.util +package com.example.hpos.util import android.content.Context import android.os.Environment -import android.widget.Toast -import com.example.refactoredapp.R -import com.example.refactoredapp.data.DataHolder -import com.example.refactoredapp.data.model.DeviceType +import com.example.hpos.R +import com.example.hpos.data.model.DeviceType import java.io.File class MyUtils { diff --git a/app/src/main/java/com/example/refactoredapp/util/MyViewModelFactory.kt b/app/src/main/java/com/example/hpos/util/MyViewModelFactory.kt similarity index 58% rename from app/src/main/java/com/example/refactoredapp/util/MyViewModelFactory.kt rename to app/src/main/java/com/example/hpos/util/MyViewModelFactory.kt index 49afe7d..4848ff8 100644 --- a/app/src/main/java/com/example/refactoredapp/util/MyViewModelFactory.kt +++ b/app/src/main/java/com/example/hpos/util/MyViewModelFactory.kt @@ -1,18 +1,16 @@ -package com.example.refactoredapp.util +package com.example.hpos.util import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.example.refactoredapp.domain.ParseDenovixUseCase -import com.example.refactoredapp.domain.ParseTestRightCSVUseCase -import com.example.refactoredapp.presentation.MainViewModel -import com.example.refactoredapp.presentation.testRight.TestRightViewModel +import com.example.hpos.presentation.MainViewModel +import com.example.hpos.presentation.testRight.TestRightViewModel class MyViewModelFactory(private val context: Context) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { if (modelClass.isAssignableFrom(MainViewModel::class.java)) - return MainViewModel(ParseDenovixUseCase(), ParseTestRightCSVUseCase()) as T + return MainViewModel() as T else if (modelClass.isAssignableFrom(TestRightViewModel::class.java)) return TestRightViewModel() as T else diff --git a/app/src/main/java/com/example/refactoredapp/data/Repository.kt b/app/src/main/java/com/example/refactoredapp/data/Repository.kt deleted file mode 100644 index 4c54fb0..0000000 --- a/app/src/main/java/com/example/refactoredapp/data/Repository.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.refactoredapp.data - -import com.example.refactoredapp.data.model.TestInfo -import java.io.File - -interface Repository { - suspend fun saveToDatabase(info: TestInfo) -} \ No newline at end of file diff --git a/app/src/main/java/com/example/refactoredapp/domain/TestRightResultCalculation.kt b/app/src/main/java/com/example/refactoredapp/domain/TestRightResultCalculation.kt deleted file mode 100644 index 63e3a47..0000000 --- a/app/src/main/java/com/example/refactoredapp/domain/TestRightResultCalculation.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.refactoredapp.domain - -import com.example.refactoredapp.data.model.TestRightCalculationData -import com.example.refactoredapp.data.model.TestRightResultType - -interface TestRightResultCalculation { - fun getResults( - wavelengthToAbsorbance: ArrayList> - ): TestRightCalculationData -} \ No newline at end of file diff --git a/app/src/main/java/com/example/refactoredapp/presentation/MainViewModel.kt b/app/src/main/java/com/example/refactoredapp/presentation/MainViewModel.kt deleted file mode 100644 index 3cae34d..0000000 --- a/app/src/main/java/com/example/refactoredapp/presentation/MainViewModel.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.example.refactoredapp.presentation - -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.example.refactoredapp.data.model.DeviceType -import com.example.refactoredapp.domain.ParseCSV -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import java.io.File - -class MainViewModel(private val parseDenovix: ParseCSV, private val parseTestRight: ParseCSV) : ViewModel() { - - var device = DeviceType.TestRight - var isStoragePermission = MutableLiveData(false) - -// val resultsLiveData = MutableLiveData>() - - fun parseCSV(file: File){ - viewModelScope.launch(Dispatchers.IO) { - parseDenovix.parseCSV(file) - } - } -} \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index cee21d1..e59fba0 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,7 @@ -