tweak(SimListActivity): improve next upcoming subscription schedule summary readability (#81)

* tweak(SimListActivity): improve next upcoming subscription schedule summary readability

This will force the date-time string in the next upcoming subscription
schedule summary to be separated by new line when displayed in portrait
orientation, otherwise by space.

Signed-off-by: iusmac <iusico.maxim@libero.it>

* Add screenshot tests

* Update golden screenshots for Roborazzi tests

---------

Signed-off-by: iusmac <iusico.maxim@libero.it>

Author: iusmac

src/com/github/iusmac/sevensim/ui/sim/SimListActivity.java

@@ -18,6 +18,7 @@
 import com.github.iusmac.sevensim.Logger;
 import com.github.iusmac.sevensim.R;
 import com.github.iusmac.sevensim.telephony.Subscriptions;
+import com.github.iusmac.sevensim.ui.UiUtils;
 import com.github.iusmac.sevensim.ui.components.CollapsingToolbarBaseActivity;
 import com.github.iusmac.sevensim.ui.preferences.PreferenceListActivity;
 
@@ -118,8 +119,9 @@ public void onSubscriptionsChanged() {
             mSubscriptionsChangedListenerInitialized = true;
         }
 
-        sHandler.postDelayed(getViewModel()::refreshSimEntries, mSubscriptionsChangedToken,
-                delayMillis);
+        final boolean isLandscape = UiUtils.isLandscape(this);
+        sHandler.postDelayed(() -> getViewModel().refreshSimEntries(isLandscape),
+                mSubscriptionsChangedToken, delayMillis);
     }
 
     @Override
@@ -152,9 +154,11 @@ public void onReceive(final Context context, final Intent intent) {
             mLogger.d("onReceive() : intent=" + intent);
 
             switch (action) {
-                case Intent.ACTION_TIMEZONE_CHANGED, Intent.ACTION_TIME_CHANGED ->
+                case Intent.ACTION_TIMEZONE_CHANGED, Intent.ACTION_TIME_CHANGED -> {
                     // Refresh SIM entries to regenerate time-sensitive data
-                    sHandler.post(getViewModel()::refreshSimEntries);
+                    final boolean isLandscape = UiUtils.isLandscape(context);
+                    sHandler.post(() -> getViewModel().refreshSimEntries(isLandscape));
+                }
 
                 default -> {
                     mLogger.e("onReceive() : Unhandled action: %s.", action);

src/com/github/iusmac/sevensim/ui/sim/SimListViewModel.java

@@ -65,9 +65,12 @@ LiveData<SparseArrayCompat<SimEntry>> getSimEntries() {
 
     /**
      * Refresh the live SIM entry list.
+     *
+     * @param isLandscape Whether the app is currently displayed in landscape orientation or not.
+     * Needed to improve readability of the next upcoming subscription schedule summary text.
      */
     @WorkerThread
-    void refreshSimEntries() {
+    void refreshSimEntries(final boolean isLandscape) {
         final SparseArrayCompat<SimEntry> simEntries = new SparseArrayCompat<>();
         final LocalDateTime now = mSystemTimeProvider.now();
         for (Subscription sub : mSubscriptions) {
@@ -78,8 +81,9 @@ void refreshSimEntries() {
             final int id = sub.getSlotIndex() == INVALID_SIM_SLOT_INDEX ? sub.getId() :
                 sub.getSlotIndex();
 
+            final String dateTimeSeparator = isLandscape ? null : "<br/>";
             final CharSequence nextUpcomingScheduleSummary = mSubscriptionSchedulerSummaryBuilder
-                .buildNextUpcomingSubscriptionScheduleSummary(sub, now);
+                .buildNextUpcomingSubscriptionScheduleSummary(sub, now, dateTimeSeparator);
 
             simEntries.put(id, new SimEntry(sub, nextUpcomingScheduleSummary));
         }

tests/test/java/com/github/iusmac/sevensim/ui/sim/SimListActivityTest.kt

@@ -417,6 +417,72 @@ class SimListActivityTest {
             }
         }
 
+        @Test
+        @Config(minSdk = Q, qualifiers = "+ru") // use the verbose Russian locale to get text wrapping
+        fun `test should separate date-time in SIM entries by new line when in portrait`() {
+            val subInfo = SubscriptionInfoBuilder.newBuilder().apply {
+                setId(1)
+                setDisplayName("SIM 1")
+                setIconTint(Color.BLUE)
+            }.buildSubscriptionInfo()
+            shadowOf(mSubscriptionManager).setAvailableSubscriptionInfos(subInfo)
+
+            // Insert a schedule for the SIM card in database to be displayed in the summary
+            runBlocking {
+                val insertJob = async(Dispatchers.Default) {
+                    val schedule = SubscriptionScheduleEntity().apply {
+                        setSubscriptionId(subInfo.subscriptionId)
+                        setSubscriptionEnabled(false)
+                        setEnabled(true)
+                        setDaysOfWeek(mDaysOfWeekFactory.create(*arrayOf(TUESDAY)))
+                        setTime(LocalTime.of(18, 30))
+                    }
+                    mAppDatabaseDE.subscriptionSchedulerDao().insert(schedule)
+                }
+                withTimeout(5.seconds) { insertJob.await() }
+            }
+
+            onActivity {
+                // Ensure ViewModel finished updating UI before capturing the initial state
+                waitActivityWorkerThreadUntilIdle()
+                shadowOf(Looper.getMainLooper()).idle()
+                onSimEntryAt(0).captureRoboImage(idleFor = SCROLL_BAR_FADE_DURATION)
+            }
+        }
+
+        @Test
+        @Config(minSdk = Q, qualifiers = "+land +ru") // use the verbose Russian locale to get text wrapping
+        fun `test should separate date-time in SIM entries by space when in landscape`() {
+            val subInfo = SubscriptionInfoBuilder.newBuilder().apply {
+                setId(1)
+                setDisplayName("SIM 1")
+                setIconTint(Color.BLUE)
+            }.buildSubscriptionInfo()
+            shadowOf(mSubscriptionManager).setAvailableSubscriptionInfos(subInfo)
+
+            // Insert a schedule for the SIM card in database to be displayed in the summary
+            runBlocking {
+                val insertJob = async(Dispatchers.Default) {
+                    val schedule = SubscriptionScheduleEntity().apply {
+                        setSubscriptionId(subInfo.subscriptionId)
+                        setSubscriptionEnabled(false)
+                        setEnabled(true)
+                        setDaysOfWeek(mDaysOfWeekFactory.create(*arrayOf(TUESDAY)))
+                        setTime(LocalTime.of(18, 30))
+                    }
+                    mAppDatabaseDE.subscriptionSchedulerDao().insert(schedule)
+                }
+                withTimeout(5.seconds) { insertJob.await() }
+            }
+
+            onActivity {
+                // Ensure ViewModel finished updating UI before capturing the initial state
+                waitActivityWorkerThreadUntilIdle()
+                shadowOf(Looper.getMainLooper()).idle()
+                onSimEntryAt(0).captureRoboImage(idleFor = SCROLL_BAR_FADE_DURATION)
+            }
+        }
+
         @Test
         @Config(minSdk = Q)
         fun `test should show No SIM cards inserted entry ONLY when appropriate`() = onActivity {