From 69b512e3d15436e13c74273ee61bf5b811b29de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Mon, 11 Nov 2019 18:32:49 +0100
Subject: [PATCH] [Timetable] Extract string resources. Increase offscreen page
 limit.

---
 .../modules/timetable/v2/TimetableFragment.kt |  2 +-
 .../timetable/v2/day/TimetableDayFragment.kt  |  4 ++-
 .../main/res/layout/fragment_timetable_v2.xml | 17 ++++++++++--
 .../res/layout/fragment_timetable_v2_day.xml  | 27 ++++++++++++-------
 app/src/main/res/values/strings.xml           | 11 ++++++++
 5 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt
index 31b40e52..ac489ab6 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/TimetableFragment.kt
@@ -75,6 +75,7 @@ class TimetableFragment : Fragment() {
         }
 
         val pagerAdapter = TimetablePagerAdapter(fragmentManager ?: return, items)
+        b.viewPager.offscreenPageLimit = 2
         b.viewPager.adapter = pagerAdapter
         b.viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
             override fun onPageScrollStateChanged(state: Int) {
@@ -92,7 +93,6 @@ class TimetableFragment : Fragment() {
                     fabShown = true
                 }
             }
-
         })
 
         b.tabLayout.setUpWithViewPager(b.viewPager)
diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
index 07220a2e..3e09faad 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
@@ -69,6 +69,7 @@ class TimetableDayFragment(val date: Date) : Fragment() {
             b.dayScroll.visibility = View.GONE
             b.noTimetableLayout.visibility = View.VISIBLE
             b.noLessonsLayout.visibility = View.GONE
+            val weekStart = date.clone().stepForward(0, 0, -date.weekDay).stringY_m_d
             b.noTimetableSync.setOnClickListener {
                 EdziennikTask.syncProfile(
                         profileId = App.profileId,
@@ -76,10 +77,11 @@ class TimetableDayFragment(val date: Date) : Fragment() {
                                 DRAWER_ITEM_TIMETABLE to 0
                         ),
                         arguments = JsonObject(
-                                "weekStart" to date.clone().stepForward(0, 0, -date.weekDay).stringY_m_d
+                                "weekStart" to weekStart
                         )
                 ).enqueue(activity)
             }
+            b.noTimetableWeek.setText(R.string.timetable_no_timetable_week, weekStart)
             return
         }
         if (lessons.size == 1 && lessons[0].type == Lesson.TYPE_NO_LESSONS) {
diff --git a/app/src/main/res/layout/fragment_timetable_v2.xml b/app/src/main/res/layout/fragment_timetable_v2.xml
index 56644931..72c22fdb 100644
--- a/app/src/main/res/layout/fragment_timetable_v2.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2.xml
@@ -61,16 +61,29 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:fontFamily="sans-serif-light"
-                android:text="Brak planu lekcji"
+                android:text="@string/timetable_not_public_title"
                 android:textSize="24sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="Plan lekcji nie został opublikowany przez szkołę."
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center"
+                android:text="@string/timetable_not_public_text"
                 android:textSize="16sp" />
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center"
+                android:text="@string/timetable_not_public_hint"
+                android:textSize="14sp" />
+
         </LinearLayout>
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_timetable_v2_day.xml b/app/src/main/res/layout/fragment_timetable_v2_day.xml
index 2fa0f81a..36ccd46e 100644
--- a/app/src/main/res/layout/fragment_timetable_v2_day.xml
+++ b/app/src/main/res/layout/fragment_timetable_v2_day.xml
@@ -47,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:fontFamily="sans-serif-light"
-                android:text="Brak lekcji tego dnia"
+                android:text="@string/timetable_no_lessons_title"
                 android:textSize="24sp" />
 
         </LinearLayout>
@@ -71,21 +71,24 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:fontFamily="sans-serif-light"
-                android:text="Dzień wolny"
+                android:text="@string/timetable_free_day_title"
                 android:textSize="24sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="W tym dniu nie ma lekcji:"
+                android:text="@string/timetable_free_day_text"
                 android:textSize="14sp" />
 
             <TextView
                 android:id="@+id/freeDayText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Ferie zimowe"
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center"
+                tools:text="Dzień wolny dla szkoły z puli dyrektorskiej z okazji obchodów Światowego Dnia Wtorku w mieście Poznań i na przedmieśiach"
                 android:textSize="16sp" />
 
             <com.google.android.material.button.MaterialButton
@@ -93,7 +96,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="Pokaż plan lekcji" />
+                android:text="@string/timetable_free_day_show" />
 
         </LinearLayout>
 
@@ -104,7 +107,7 @@
             android:orientation="vertical"
             android:visibility="gone"
             android:gravity="center"
-            tools:visibility="gone">
+            tools:visibility="visible">
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -116,14 +119,17 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:fontFamily="sans-serif-light"
-                android:text="Brak planu lekcji"
+                android:text="@string/timetable_no_timetable_title"
                 android:textSize="24sp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="Nie pobrano planu lekcji na ten tydzień."
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center"
+                android:text="@string/timetable_no_timetable_text"
                 android:textSize="16sp" />
 
             <com.google.android.material.button.MaterialButton
@@ -131,12 +137,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="Pobierz plan lekcji" />
+                android:text="@string/timetable_no_timetable_sync" />
 
             <TextView
+                android:id="@+id/noTimetableWeek"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="na tydzień 2019-11-11"
+                tools:text="@string/timetable_no_timetable_week"
                 android:textSize="12sp"
                 android:textStyle="italic"/>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bffcc7f6..d4ab4de1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -995,4 +995,15 @@
     <string name="timetable_lesson_shifted_from_other_day">Lekcja przeniesiona z dnia %s, godz. %s</string>
     <string name="timetable_lesson_shifted">Lekcja przeniesiona na inny termin</string>
     <string name="timetable_lesson_shifted_from">Lekcja przeniesiona z innego terminu</string>
+    <string name="timetable_not_public_title">Brak planu lekcji</string>
+    <string name="timetable_not_public_text">Plan lekcji nie został opublikowany przez szkołę.</string>
+    <string name="timetable_not_public_hint">Skontaktuj się z wychowawcą w celu udostępnienia planu lekcji.</string>
+    <string name="timetable_free_day_title">Dzień wolny</string>
+    <string name="timetable_free_day_text">W tym dniu nie ma lekcji:</string>
+    <string name="timetable_free_day_show">Pokaż plan lekcji</string>
+    <string name="timetable_no_lessons_title">Brak lekcji tego dnia</string>
+    <string name="timetable_no_timetable_title">Brak planu lekcji</string>
+    <string name="timetable_no_timetable_text">Nie pobrano planu lekcji na ten tydzień.</string>
+    <string name="timetable_no_timetable_sync">Pobierz plan lekcji</string>
+    <string name="timetable_no_timetable_week">na tydzień %s</string>
 </resources>