diff --git a/app/release/hpos-app.apk b/app/release/hpos-app.apk deleted file mode 100644 index b9d6528..0000000 Binary files a/app/release/hpos-app.apk and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index acfe21e..d0bb693 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -4,15 +4,15 @@ "type": "APK", "kind": "Directory" }, - "applicationId": "com.example.hpos", + "applicationId": "in.sminnovations.hpostesting", "variantName": "release", "elements": [ { "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 1, - "versionName": "1.0", + "versionCode": 2, + "versionName": "2.0.1", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/GalleryFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/GalleryFragment.kt index 772ee88..1911ca0 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/GalleryFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/GalleryFragment.kt @@ -25,7 +25,7 @@ class GalleryFragment : Fragment() { // val galleryViewModel = // ViewModelProvider(this).get(GalleryViewModel::class.java) -// _binding = FragmentGalleryBinding.inflate(inflater, container, false) + _binding = FragmentGalleryBinding.inflate(inflater, container, false) val root: View = binding.root // val textView: TextView = binding.textGallery diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 927b26d..537a589 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -21,10 +21,11 @@ import com.example.hpostesting.presentation.UsbServiceListener import com.example.hpostesting.presentation.dashboard.DashboardActivity import com.example.hpostesting.presentation.utils.MyDialogListener import com.example.hpostesting.presentation.utils.UIUtils +import com.google.firebase.firestore.BuildConfig import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.ktx.firestore import com.google.firebase.ktx.Firebase -import `in`.sminnovations.hpostesting.BuildConfig +//import `in`.sminnovations.hpostesting.BuildConfig import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/hb/HBHemoCubeActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/hb/HBHemoCubeActivity.kt index 062c73a..d1d8476 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/hb/HBHemoCubeActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/hb/HBHemoCubeActivity.kt @@ -121,7 +121,7 @@ class HBHemoCubeActivity : AppCompatActivity() { val mPendingIntent: PendingIntent = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) { PendingIntent.getBroadcast( - this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_MUTABLE + this, 0, Intent(Constants.HOMOCUBE_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE ) } else { PendingIntent.getBroadcast( diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml index 2a4b95d..4757e97 100644 --- a/app/src/main/res/layout/fragment_gallery.xml +++ b/app/src/main/res/layout/fragment_gallery.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".presentation.dashboard.GalleryFragment"> + >