Merge branch 'preprod-temp' into 'preprod-temp-App-Updation'
# Conflicts: # app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
This commit is contained in:
@@ -104,6 +104,7 @@ class MainActivity : AppCompatActivity() {
|
||||
val deviceType = when {
|
||||
availableDrivers.isNotEmpty() -> {
|
||||
val device = availableDrivers[0].device
|
||||
Toast.makeText(this, R.string.device, Toast.LENGTH_SHORT).show()
|
||||
when {
|
||||
device.productId == Constants.HOMO_CUBE_ID && device.vendorId == Constants.VENDOR_ID -> {
|
||||
binding.cvItem1.visibility = View.VISIBLE
|
||||
|
||||
@@ -232,6 +232,7 @@
|
||||
<string name="permission_grant">You must grant permission to access all files to use the app</string>
|
||||
<string name="permission_required">All permissions are required to use the app.</string>
|
||||
<string name="device_not">Device Not Connected.</string>
|
||||
<string name="device">Device is Connected.</string>
|
||||
<string name="enter_proper_login_id">Please enter a proper Login ID</string>
|
||||
<string name="enter_proper_password">Please enter a proper password</string>
|
||||
<string name="wrong_password">Wrong Password</string>
|
||||
|
||||
Reference in New Issue
Block a user