R&D app

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "in.sminnovations.hpostesting.server"
         minSdk 30
         targetSdk 34
-        versionCode 134
+        versionCode 136
-        versionName "2.1.131"
+        versionName "2.1.133"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -24,13 +24,12 @@
     <uses-feature android:name="android.hardware.usb.host" />
 
     <uses-permission android:name="android.permission.USB_PERMISSION" />
-
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.ACCOUNT_MANAGER"
+    <uses-permission
+        android:name="android.permission.ACCOUNT_MANAGER"
         tools:ignore="ProtectedPermissions" />
 
-
     <application
         android:name="com.example.hpostesting.HPOSTestingApplication"
         android:allowBackup="true"
@@ -43,10 +42,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSTesting"
         tools:targetApi="31">
+        <activity
+            android:name="com.example.hpostesting.presentation.randd.RandDActivity"
+            android:exported="false" />
         <activity
             android:name="com.example.hpostesting.presentation.main_base.UpdateValuesActivity"
             android:exported="false"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
 
         <service
             android:name="com.example.hpostesting.util.MyAuthenticatorService"

app/src/main/java/com/example/hpostesting/firebase/FirebaseManage.kt

@@ -38,7 +38,7 @@ class FirebaseManager @Inject constructor(private val context: Context) {
 
     private val defaultServers = listOf(
         // i have it in different place look down
-        firebaseConfigProd,  firebaseConfigDev  , firebaseConfigQaQc,  firebaseConfigPreProd,
+        firebaseConfigProd,  firebaseConfigDev  , firebaseConfigQaQc,  firebaseConfigPreProd, firebaseConfigPreIIScRandD,
         configMolbio //not a firebase config
     )
 
@@ -158,6 +158,8 @@ fun delayedRestart(context: Context) {
     }
 }
 
+
+
 private val firebaseConfigDev = FirebaseConfig(
     serverName = "dev",
     apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
@@ -190,6 +192,14 @@ private val firebaseConfigPreProd = FirebaseConfig(
     storageBucket = "hpos-preprod.appspot.com"
 )
 
+private val firebaseConfigPreIIScRandD= FirebaseConfig(
+    serverName = "IISc R&D",
+    apiKey = "AIzaSyBvts2m1dZpULimZh6wn8C9E7npLnA8-A4",
+    appId = "1:699481688495:android:efe59ce3a83324dc00075a",
+    projectId = "randd-8329b",
+    storageBucket = "randd-8329b.firebasestorage.app"
+)
+
 private val configMolbio = FirebaseConfig(
     serverName = "molbio",
     apiKey = "molbio",

app/src/main/java/com/example/hpostesting/presentation/main_base/PanelFragment.kt

@@ -32,6 +32,7 @@ import com.example.hpostesting.presentation.main_base.ui.PasswordResetActivity
 import com.example.hpostesting.presentation.deviceinfo.DeviceActivity
 import com.example.hpostesting.presentation.deviceprovision.DeviceProvisionActivity
 import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
+import com.example.hpostesting.presentation.randd.RandDActivity
 import com.example.hpostesting.presentation.trueheme_test.TrueHemeTestViewModel
 import com.example.hpostesting.presentation.usb_teminal.UsbTerminalActivity
 import `in`.sminnovations.hpostesting.databinding.FragmentGalleryBinding
@@ -89,6 +90,7 @@ class PanelFragment : Fragment() {
             binding.btnDeviceInfo.visibility = View.VISIBLE
             binding.btnResetPassword.visibility = View.VISIBLE
             binding.btnUpdateValues.visibility = View.VISIBLE
+            binding.btnRnd.visibility = View.VISIBLE
         }else{
             binding.btnResetPassword.visibility = View.GONE
             binding.btnDeviceProvision.visibility = View.GONE
@@ -102,6 +104,7 @@ class PanelFragment : Fragment() {
             binding.btnSubmit.visibility = View.GONE
             binding.btnDeviceInfo.visibility = View.VISIBLE
             binding.btnUpdateValues.visibility = View.GONE
+            binding.btnRnd.visibility = View.GONE
         }
 
         binding.btnResetPassword.setOnClickListener{
@@ -142,6 +145,10 @@ class PanelFragment : Fragment() {
             startActivity(intent)
         }
 
+        binding.btnRnd.setOnClickListener{
+            startActivity(Intent(requireContext(),RandDActivity::class.java))
+        }
+
         binding.btnFiles.setOnClickListener {
             val intent = Intent(Intent.ACTION_GET_CONTENT)
             intent.type = "file/*"

app/src/main/java/com/example/hpostesting/presentation/randd/RandDActivity.kt

@@ -0,0 +1,19 @@
+package com.example.hpostesting.presentation.randd
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.example.hpostesting.presentation.randd.ui.randd.RandDFragment
+import `in`.sminnovations.hpostesting.R
+
+class RandDActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_randd)
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.container, RandDFragment.newInstance())
+                .commitNow()
+        }
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/randd/ui/randd/RandDFragment.kt

@@ -0,0 +1,33 @@
+package com.example.hpostesting.presentation.randd.ui.randd
+
+import androidx.fragment.app.viewModels
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import `in`.sminnovations.hpostesting.R
+
+
+class RandDFragment : Fragment() {
+
+    companion object {
+        fun newInstance() = RandDFragment()
+    }
+
+    private val viewModel: RandDViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // TODO: Use the ViewModel
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_rand_d, container, false)
+    }
+
+}

app/src/main/java/com/example/hpostesting/presentation/randd/ui/randd/RandDViewModel.kt

@@ -0,0 +1,7 @@
+package com.example.hpostesting.presentation.randd.ui.randd
+
+import androidx.lifecycle.ViewModel
+
+class RandDViewModel : ViewModel() {
+    // TODO: Implement the ViewModel
+}

app/src/main/java/com/example/hpostesting/presentation/trueheme/TrueHemeFragment.kt

@@ -593,7 +593,7 @@ class TrueHemeFragment : Fragment() {
                 binding.btnSubmit.visibility = View.VISIBLE
                 binding.btnSubmit.isEnabled = true
                 binding.btnSubmit.isClickable = true
-//                        binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
+//              binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
                 binding.ivCheck.visibility = View.VISIBLE
             }
         } else {
@@ -736,7 +736,7 @@ class TrueHemeFragment : Fragment() {
         }
     }
 
-    private fun processResult() {
+    private fun processResult(){
         try {
             hemoCubeViewModel.messages.postValue(getString(R.string.processing_result))
             val deviceLog = resultData

app/src/main/res/layout/activity_randd.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+     />

app/src/main/res/layout/fragment_gallery.xml

@@ -55,7 +55,21 @@
         app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
 
 
-    <Button
+        <Button
+            android:id="@+id/btn_rnd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="24dp"
+            android:clickable="false"
+            android:text="R and D"
+            android:textColor="@color/white"
+            app:cornerRadius="16dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+
+        <Button
         android:id="@+id/btn_diagnostics"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -67,7 +81,7 @@
         app:cornerRadius="16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
+        app:layout_constraintTop_toBottomOf="@id/btn_rnd" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_auto_dac"
@@ -153,6 +167,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_update_values"
             android:layout_width="match_parent"
@@ -160,12 +175,13 @@
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="24dp"
             android:clickable="false"
-            android:text="Update values"
+            android:text="Update valueLs"
             android:textColor="@color/white"
             app:cornerRadius="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_firefox"
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_rand_d.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/rand_d"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.randd.RandDFragment">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="409dp"
+        android:layout_height="729dp"
+        android:forceDarkAllowed="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <Button
+            android:id="@+id/blankTestButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Do Blank"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.23" />
+
+        <Button
+            android:id="@+id/sampleTestButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Do Sample"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.393" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="222dp"
+            android:layout_height="63dp"
+            android:fontFamily="@font/poppins_bold"
+            android:hint="do your R and D Stuff"
+            android:rotation="0"
+            android:text="R and D Screen"
+            android:textAlignment="center"
+            android:textIsSelectable="true"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.498"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.081" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>