Lock screen orientation to portrait (#2707)

* Lock screen orientation to portrait Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix failing test Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>
opensrp · Aug 25, 2023 · b75c50c · b75c50c
1 parent 5c108ee
commit b75c50c
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 80 deletions.
diff --git a/android/engine/src/main/AndroidManifest.xml b/android/engine/src/main/AndroidManifest.xml
@@ -25,5 +25,6 @@
                 android:value="androidx.startup"
                 tools:node="remove" />
         </provider>
+        <activity android:name=".util.test.HiltActivityForTest" />
     </application>
 </manifest>
diff --git a/...er/fhircore/engine/HiltActivityForTest.kt → ...e/engine/util/test/HiltActivityForTest.kt b/...er/fhircore/engine/HiltActivityForTest.kt → ...e/engine/util/test/HiltActivityForTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.smartregister.fhircore.engine
+package org.smartregister.fhircore.engine.util.test
 
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.fhir.sync.SyncJobStatus

diff --git a/...id/engine/src/test/java/org/smartregister/fhircore/engine/sync/SyncListenerManagerTest.kt b/...id/engine/src/test/java/org/smartregister/fhircore/engine/sync/SyncListenerManagerTest.kt
@@ -27,13 +27,13 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.robolectric.Robolectric
-import org.smartregister.fhircore.engine.HiltActivityForTest
 import org.smartregister.fhircore.engine.R
 import org.smartregister.fhircore.engine.app.fakes.Faker
 import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
 import org.smartregister.fhircore.engine.robolectric.RobolectricTest
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 
 @HiltAndroidTest
 class SyncListenerManagerTest : RobolectricTest() {

diff --git a/...ne/src/test/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensionTest.kt b/...ne/src/test/java/org/smartregister/fhircore/engine/util/extension/AndroidExtensionTest.kt
@@ -40,14 +40,14 @@ import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test
 import org.robolectric.Shadows
-import org.smartregister.fhircore.engine.HiltActivityForTest
 import org.smartregister.fhircore.engine.robolectric.RobolectricTest
 import org.smartregister.fhircore.engine.ui.theme.DangerColor
 import org.smartregister.fhircore.engine.ui.theme.DefaultColor
 import org.smartregister.fhircore.engine.ui.theme.InfoColor
 import org.smartregister.fhircore.engine.ui.theme.LightColors
 import org.smartregister.fhircore.engine.ui.theme.SuccessColor
 import org.smartregister.fhircore.engine.ui.theme.WarningColor
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 
 class AndroidExtensionTest : RobolectricTest() {
   private lateinit var context: Application

diff --git a/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/HiltActivityForTest.kt b/android/quest/src/androidTest/java/org/smartregister/fhircore/quest/HiltActivityForTest.kt
diff --git a/...oidTest/java/org/smartregister/fhircore/quest/integration/ui/profile/ProfileScreenTest.kt b/...oidTest/java/org/smartregister/fhircore/quest/integration/ui/profile/ProfileScreenTest.kt
@@ -39,7 +39,7 @@ import org.smartregister.fhircore.engine.configuration.ConfigType
 import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.domain.model.ResourceData
 import org.smartregister.fhircore.engine.domain.model.SnackBarMessageConfig
-import org.smartregister.fhircore.quest.HiltActivityForTest
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 import org.smartregister.fhircore.quest.integration.Faker
 import org.smartregister.fhircore.quest.ui.profile.DROPDOWN_MENU_TEST_TAG
 import org.smartregister.fhircore.quest.ui.profile.FAB_BUTTON_TEST_TAG

diff --git a/...rg/smartregister/fhircore/quest/integration/ui/register/RegisterScreenNoResultViewTest.kt b/...rg/smartregister/fhircore/quest/integration/ui/register/RegisterScreenNoResultViewTest.kt
@@ -30,7 +30,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.smartregister.fhircore.engine.configuration.navigation.NavigationMenuConfig
 import org.smartregister.fhircore.engine.configuration.register.NoResultsConfig
-import org.smartregister.fhircore.quest.HiltActivityForTest
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 import org.smartregister.fhircore.quest.ui.register.NO_REGISTER_VIEW_BUTTON_ICON_TEST_TAG
 import org.smartregister.fhircore.quest.ui.register.NO_REGISTER_VIEW_BUTTON_TEST_TAG
 import org.smartregister.fhircore.quest.ui.register.NO_REGISTER_VIEW_BUTTON_TEXT_TEST_TAG

diff --git a/android/quest/src/main/AndroidManifest.xml b/android/quest/src/main/AndroidManifest.xml
@@ -5,26 +5,29 @@
 
     <application
         android:name=".QuestApplication"
+        android:enableOnBackInvokedCallback="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
+        android:installLocation="internalOnly"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:usesCleartextTraffic="false"
         android:screenOrientation="portrait"
-        android:installLocation="internalOnly"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar"
+        android:usesCleartextTraffic="false"
         android:windowSoftInputMode="adjustResize"
         tools:ignore="UnusedAttribute,LockedOrientationActivity"
-        android:enableOnBackInvokedCallback="true"
         tools:replace="android:theme">
 
-        <meta-data android:name="io.sentry.auto-init" android:value="false" />
+        <meta-data
+            android:name="io.sentry.auto-init"
+            android:value="false" />
 
         <activity
             android:name=".ui.appsetting.AppSettingActivity"
+            android:clearTaskOnLaunch="true"
             android:exported="true"
-            android:clearTaskOnLaunch="true">
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -35,25 +38,27 @@
         <activity
             android:name=".ui.login.LoginActivity"
             android:exported="false"
-            android:launchMode="singleTop" />
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
 
         <activity
             android:name=".ui.pin.PinLoginActivity"
             android:exported="false"
-            android:launchMode="singleTop" />
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
 
         <activity
             android:name=".ui.main.AppMainActivity"
+            android:clearTaskOnLaunch="true"
             android:launchMode="singleTop"
-            android:clearTaskOnLaunch="true" />
+            android:screenOrientation="portrait" />
 
         <activity
             android:name=".ui.questionnaire.QuestionnaireActivity"
             android:exported="false"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
 
-        <activity android:name=".HiltActivityForTest" />
-
         <service
             android:name=".ui.login.AuthAndroidService"
             android:enabled="true"

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/HiltActivityForTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/HiltActivityForTest.kt
diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/HiltExtension.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/HiltExtension.kt
@@ -26,6 +26,7 @@ import androidx.navigation.testing.TestNavHostController
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import org.smartregister.fhircore.engine.R
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 
 /**
  * Inspired by the Hilt Extension in the Android Architectural samples here

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/login/LoginViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/login/LoginViewModelTest.kt
@@ -63,7 +63,7 @@ import org.smartregister.fhircore.engine.util.SecureSharedPreference
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.isDeviceOnline
-import org.smartregister.fhircore.quest.HiltActivityForTest
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.robolectric.AccountManagerShadow
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/main/AppMainViewModelTest.kt
@@ -71,7 +71,7 @@ import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.isDeviceOnline
 import org.smartregister.fhircore.engine.util.extension.showToast
-import org.smartregister.fhircore.quest.HiltActivityForTest
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.navigation.MainNavigationScreen
 import org.smartregister.fhircore.quest.navigation.NavigationArg

diff --git a/...src/test/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingViewModelTest.kt b/...src/test/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingViewModelTest.kt
@@ -56,7 +56,7 @@ import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.isDeviceOnline
 import org.smartregister.fhircore.engine.util.extension.launchActivityWithNoBackStackHistory
 import org.smartregister.fhircore.engine.util.extension.showToast
-import org.smartregister.fhircore.quest.HiltActivityForTest
+import org.smartregister.fhircore.engine.util.test.HiltActivityForTest
 import org.smartregister.fhircore.quest.app.AppConfigService
 import org.smartregister.fhircore.quest.app.fakes.Faker
 import org.smartregister.fhircore.quest.robolectric.RobolectricTest