diff --git a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt index 0df960f..f666779 100644 --- a/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt +++ b/app/src/main/java/com/example/hpostesting/data/constant/Constants.kt @@ -28,8 +28,8 @@ object Constants { const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb" const val ABHA_APP_PACKAGE = "in.ndhm.phr" - const val MOLBIO_INTEGRATION = false - const val FIREBASE_INTEGRATION = true + const val MOLBIO_INTEGRATION = true + const val FIREBASE_INTEGRATION = false const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in" const val deviceProvisionPassword = "f2ab0e7f9d69" const val DEVICE_ID_API = "deviceIDAPI" diff --git a/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt b/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt index aef5c7d..a68660d 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/AppVersionTapManage.kt @@ -1,16 +1,21 @@ package com.example.hpostesting.presentation.main_base +import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION +import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION + class AppVersionTapManager { private var tapCount = 0 private val maxTapCount = 5 + val shouldEnable = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION + val notEnable = MOLBIO_INTEGRATION && !FIREBASE_INTEGRATION fun registerTap(onMaxTapsReached: () -> Unit) { tapCount++ - if (tapCount >= maxTapCount) { - onMaxTapsReached() - reset() - } + if (tapCount >= maxTapCount && shouldEnable) { + onMaxTapsReached() + reset() + } } private fun reset() { tapCount = 0 diff --git a/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt index dea3a37..65c1667 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/main_base/SettingsFragment.kt @@ -31,6 +31,8 @@ import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceManager import androidx.preference.SwitchPreferenceCompat import com.example.hpostesting.data.constant.Constants +import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION +import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION import com.example.hpostesting.data.constant.DataHolder import com.example.hpostesting.data.constant.LanguageManager import com.example.hpostesting.data.repository.DatabaseRepository @@ -201,11 +203,11 @@ class PrefsFragment : PreferenceFragmentCompat() { } } - + val shouldEnableCurrentServerVersion = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION val appVersionPreference = Preference(requireContext()).apply { title = "App Version" summary = - getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + "->" + currentServer + "]" + getAppVersion(requireContext()) + " [ " + getAppEnvironment(requireContext()) + "->" + if (shouldEnableCurrentServerVersion) currentServer else "molbio"+ "]" icon = ContextCompat.getDrawable(requireContext(), R.drawable.baseline_info_24) setOnPreferenceClickListener { diff --git a/app/src/main/res/values-hi/arrays.xml b/app/src/main/res/values-hi/arrays.xml index 8d3aa16..76fac26 100644 --- a/app/src/main/res/values-hi/arrays.xml +++ b/app/src/main/res/values-hi/arrays.xml @@ -13,9 +13,68 @@ - Mysuru - Kodagu - Chamarajanagar + अररिया + अरवल + औरंगाबाद + बांका + बेगूसराय + भागलपुर + भोजपुर + बक्सर + दरभंगा + पूर्वी चंपारण + गया + गोपालगंज + जमुई + जहानाबाद + कैमूर + कटिहार + खगड़िया + किशनगंज + लखीसराय + मधेपुरा + मधुबनी + मुंगेर + मुजफ्फरपुर + नालंदा + नवादा + पटना + पूर्णिया + रोहतास + सहरसा + समस्तीपुर + सारण + शेखपुरा + शिवहर + सीतामढ़ी + सिवान + सुपौल + वैशाली + पश्चिमी चंपारण + बोकारो + चतरा + देवघर + धनबाद + दुमका + पूर्वी सिंहभूम + गढवा + गिरिडीह + गोड्डा + गुमला + हजारीबाग + जामताड़ा + खूंटी + कोडरमा + लातेहार + लोहरदगा + पाकुड़ + पलामू + रामगढ़ + रांची + साहिबगंज + सरायकेला खरसावां + सिमडेगा + पश्चिमी सिंहभूम Other \ No newline at end of file diff --git a/app/src/main/res/values-kn/arrays.xml b/app/src/main/res/values-kn/arrays.xml index 8d3aa16..2148e30 100644 --- a/app/src/main/res/values-kn/arrays.xml +++ b/app/src/main/res/values-kn/arrays.xml @@ -13,9 +13,68 @@ - Mysuru - Kodagu - Chamarajanagar + Araria + Arwal + Aurangabad + Banka + Begusarai + Bhagalpur + Bhojpur + Buxar + Darbhanga + East Champaran + Gaya + Gopalganj + Jamui + Jehanabad + Kaimur + Katihar + Khagaria + Kishanganj + Lakhisarai + Madhepura + Madhubani + Munger + Muzaffarpur + Nalanda + Nawada + Patna + Purnia + Rohtas + Saharsa + Samastipur + Saran + Sheikhpura + Sheohar + Sitamarhi + Siwan + Supaul + Vaishali + West Champaran + Bokaro + Chatra + Deoghar + Dhanbad + Dumka + East Singhbhum + Garhwa + Giridih + Godda + Gumla + Hazaribagh + Jamtara + Khunti + Koderma + Latehar + Lohardaga + Pakur + Palamu + Ramgarh + Ranchi + Sahibganj + Seraikela Kharsawan + Simdega + West Singhbhum Other \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 4f00558..37b475d 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -26,9 +26,68 @@ - Mysuru - Kodagu - Chamarajanagar + Araria + Arwal + Aurangabad + Banka + Begusarai + Bhagalpur + Bhojpur + Buxar + Darbhanga + East Champaran + Gaya + Gopalganj + Jamui + Jehanabad + Kaimur + Katihar + Khagaria + Kishanganj + Lakhisarai + Madhepura + Madhubani + Munger + Muzaffarpur + Nalanda + Nawada + Patna + Purnia + Rohtas + Saharsa + Samastipur + Saran + Sheikhpura + Sheohar + Sitamarhi + Siwan + Supaul + Vaishali + West Champaran + Bokaro + Chatra + Deoghar + Dhanbad + Dumka + East Singhbhum + Garhwa + Giridih + Godda + Gumla + Hazaribagh + Jamtara + Khunti + Koderma + Latehar + Lohardaga + Pakur + Palamu + Ramgarh + Ranchi + Sahibganj + Seraikela Kharsawan + Simdega + West Singhbhum Other