From dd2c69601a966481f6dff2e0fc104032d3a428a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Sun, 6 May 2018 21:16:03 +0200
Subject: [PATCH] Change description date in exam and fix styles (#98)

---
 .../github/wulkanowy/api/exams/ExamsWeek.java |  2 +-
 .../wulkanowy/api/exams/ExamsWeekTest.java    |  6 +++---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              |  4 +++-
 .../wulkanowy/data/db/dao/DbHelper.java       |  4 ++--
 .../wulkanowy/data/db/dao/entities/Exam.java  | 20 +++++++++----------
 .../{Migration25.java => Migration26.java}    |  4 ++--
 .../data/db/shared/SharedPrefRepository.java  |  2 +-
 .../github/wulkanowy/data/sync/ExamsSync.java | 10 ++--------
 .../ui/main/exams/ExamsDialogFragment.java    |  4 ++--
 .../wulkanowy/utils/DataObjectConverter.java  |  4 ++--
 app/src/main/res/layout/exams_dialog.xml      |  2 +-
 app/src/main/res/values-pl/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/styles.xml            | 17 ++++++++++++++--
 app/src/main/res/xml/preferences.xml          |  2 +-
 16 files changed, 48 insertions(+), 37 deletions(-)
 rename app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/{Migration25.java => Migration26.java} (86%)

diff --git a/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java b/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java
index 50aa48e71..c111ce848 100644
--- a/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java
+++ b/api/src/main/java/io/github/wulkanowy/api/exams/ExamsWeek.java
@@ -58,7 +58,7 @@ public class ExamsWeek {
                         .setType(snp.getRowDataChildValue(e, 2))
                         .setDescription(snp.getRowDataChildValue(e, 3))
                         .setTeacher(snp.getRowDataChildValue(e, 4).split(", ")[0])
-                        .setEntryDate(snp.getRowDataChildValue(e, 4).split(", ")[1])
+                        .setEntryDate(getFormattedDate(snp.getRowDataChildValue(e, 4).split(", ")[1]))
                 );
             }
 
diff --git a/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java b/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java
index 14b55e8d9..0a99c4657 100644
--- a/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java
+++ b/api/src/test/java/io/github/wulkanowy/api/exams/ExamsWeekTest.java
@@ -104,8 +104,8 @@ public class ExamsWeekTest extends StudentAndParentTestCase {
     public void getExamEntryDateTest() throws Exception {
         List<ExamDay> dayList = onePerDay.getCurrent().getDays();
 
-        Assert.assertEquals("16.10.2017", dayList.get(0).getExamList().get(0).getEntryDate());
-        Assert.assertEquals("17.10.2017", dayList.get(1).getExamList().get(0).getEntryDate());
-        Assert.assertEquals("16.10.2017", dayList.get(2).getExamList().get(0).getEntryDate());
+        Assert.assertEquals("2017-10-16", dayList.get(0).getExamList().get(0).getEntryDate());
+        Assert.assertEquals("2017-10-17", dayList.get(1).getExamList().get(0).getEntryDate());
+        Assert.assertEquals("2017-10-16", dayList.get(2).getExamList().get(0).getEntryDate());
     }
 }
diff --git a/app/build.gradle b/app/build.gradle
index 3850e793e..634471511 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 greendao {
-    schemaVersion 25
+    schemaVersion 26
     generateTests = true
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 09e353e77..2abcf5e7b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,12 +32,14 @@
             android:name=".ui.login.LoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_login"
+            android:theme="@style/WulkanowyTheme.LoginTheme"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/activity_dashboard_text"
-            android:launchMode="singleTop" />
+            android:launchMode="singleTop"
+            android:theme="@style/WulkanowyTheme" />
 
         <service
             android:name=".services.jobs.SyncJob"
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java
index b1f92f2a6..07307e529 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java
@@ -17,7 +17,7 @@ import javax.inject.Singleton;
 import io.github.wulkanowy.api.Vulcan;
 import io.github.wulkanowy.data.db.dao.entities.DaoMaster;
 import io.github.wulkanowy.data.db.dao.migrations.Migration23;
-import io.github.wulkanowy.data.db.dao.migrations.Migration25;
+import io.github.wulkanowy.data.db.dao.migrations.Migration26;
 import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.di.annotations.DatabaseInfo;
@@ -75,7 +75,7 @@ public class DbHelper extends DaoMaster.OpenHelper {
     private List<Migration> getMigrations() {
         List<Migration> migrations = new ArrayList<>();
         migrations.add(new Migration23());
-        migrations.add(new Migration25());
+        migrations.add(new Migration26());
 
         // Sorting just to be safe, in case other people add migrations in the wrong order.
         Comparator<Migration> migrationComparator = new Comparator<Migration>() {
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java
index c492ae3d2..89913c49f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Exam.java
@@ -33,8 +33,8 @@ public class Exam implements Serializable {
     @Property(nameInDb = "teacher")
     private String teacher = "";
 
-    @Property(nameInDb = "date")
-    private String date = "";
+    @Property(nameInDb = "entry_date")
+    private String entryDate = "";
 
     private static final long serialVersionUID = 42L;
 
@@ -50,16 +50,16 @@ public class Exam implements Serializable {
     @Generated(hash = 973692038)
     private transient ExamDao myDao;
 
-    @Generated(hash = 1455345431)
-    public Exam(Long id, Long dayId, String subjectAndGroup, String type,
-                String description, String teacher, String date) {
+    @Generated(hash = 998653360)
+    public Exam(Long id, Long dayId, String subjectAndGroup, String type, String description,
+                String teacher, String entryDate) {
         this.id = id;
         this.dayId = dayId;
         this.subjectAndGroup = subjectAndGroup;
         this.type = type;
         this.description = description;
         this.teacher = teacher;
-        this.date = date;
+        this.entryDate = entryDate;
     }
 
     @Generated(hash = 945526930)
@@ -120,12 +120,12 @@ public class Exam implements Serializable {
         return this;
     }
 
-    public String getDate() {
-        return date;
+    public String getEntryDate() {
+        return entryDate;
     }
 
-    public Exam setDate(String date) {
-        this.date = date;
+    public Exam setEntryDate(String entryDate) {
+        this.entryDate = entryDate;
         return this;
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration25.java b/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration26.java
similarity index 86%
rename from app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration25.java
rename to app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration26.java
index a5359b35a..332f2dd27 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration25.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration26.java
@@ -6,11 +6,11 @@ import io.github.wulkanowy.api.Vulcan;
 import io.github.wulkanowy.data.db.dao.DbHelper;
 import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 
-public class Migration25 implements DbHelper.Migration {
+public class Migration26 implements DbHelper.Migration {
 
     @Override
     public Integer getVersion() {
-        return 25;
+        return 26;
     }
 
     @Override
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java
index 484af3d1e..bf46ce35a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java
+++ b/app/src/main/java/io/github/wulkanowy/data/db/shared/SharedPrefRepository.java
@@ -57,7 +57,7 @@ public class SharedPrefRepository implements SharedPrefContract {
 
     @Override
     public int getStartupTab() {
-        return Integer.parseInt(settingsSharedPref.getString(SettingsFragment.SHARED_KEY_START_TAB, "2"));
+        return Integer.parseInt(settingsSharedPref.getString(SettingsFragment.SHARED_KEY_START_TAB, "0"));
     }
 
     @Override
diff --git a/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java b/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java
index 2fd188662..fad38c20a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java
+++ b/app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java
@@ -1,14 +1,9 @@
 package io.github.wulkanowy.data.sync;
 
-import org.threeten.bp.LocalDate;
-import org.threeten.bp.format.DateTimeFormatter;
-import org.threeten.bp.format.TextStyle;
-
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -22,7 +17,6 @@ import io.github.wulkanowy.data.db.dao.entities.Exam;
 import io.github.wulkanowy.data.db.dao.entities.ExamDao;
 import io.github.wulkanowy.data.db.dao.entities.Week;
 import io.github.wulkanowy.data.db.dao.entities.WeekDao;
-import io.github.wulkanowy.utils.AppConstant;
 import io.github.wulkanowy.utils.DataObjectConverter;
 import io.github.wulkanowy.utils.LogUtils;
 import io.github.wulkanowy.utils.TimeUtils;
@@ -122,7 +116,7 @@ public class ExamsSync {
 
     private void prepareExam(List<io.github.wulkanowy.api.exams.Exam> examList,
                              List<Exam> preparedExams, long dayId) {
-        List<Exam> examsApiEntity = DataObjectConverter.examsToExamsEntitiy(examList);
+        List<Exam> examsApiEntity = DataObjectConverter.examsToExamsEntity(examList);
 
         for (Exam examApi : examsApiEntity) {
             Exam examDb = getExamFromDb(examApi, dayId);
@@ -139,7 +133,7 @@ public class ExamsSync {
     private Exam getExamFromDb(Exam examApi, long dayId) {
         return daoSession.getExamDao().queryBuilder()
                 .where(ExamDao.Properties.DayId.eq(dayId),
-                        ExamDao.Properties.Date.eq(examApi.getDate()),
+                        ExamDao.Properties.EntryDate.eq(examApi.getEntryDate()),
                         ExamDao.Properties.SubjectAndGroup.eq(examApi.getSubjectAndGroup()),
                         ExamDao.Properties.Teacher.eq(examApi.getTeacher()))
                 .unique();
diff --git a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java
index 6128cf6d7..8c4fafcd1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java
+++ b/app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsDialogFragment.java
@@ -31,7 +31,7 @@ public class ExamsDialogFragment extends DialogFragment {
     TextView teacher;
 
     @BindView(R.id.exams_dialog_date_value)
-    TextView date;
+    TextView entryDate;
 
     @BindView(R.id.exams_dialog_description_value)
     TextView description;
@@ -65,7 +65,7 @@ public class ExamsDialogFragment extends DialogFragment {
         subject.setText(exam.getSubjectAndGroup());
         teacher.setText(exam.getTeacher());
         type.setText(exam.getType());
-        date.setText(exam.getDate());
+        entryDate.setText(exam.getEntryDate());
 
         if (!exam.getDescription().isEmpty()) {
             description.setText(exam.getDescription());
diff --git a/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java b/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
index 11c1aeaf4..3b599c8f7 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
+++ b/app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java
@@ -170,13 +170,13 @@ public final class DataObjectConverter {
         return lessonEntityList;
     }
 
-    public static List<Exam> examsToExamsEntitiy(List<io.github.wulkanowy.api.exams.Exam> examList) {
+    public static List<Exam> examsToExamsEntity(List<io.github.wulkanowy.api.exams.Exam> examList) {
         List<Exam> examEntityList = new ArrayList<>();
 
         for (io.github.wulkanowy.api.exams.Exam exam : examList) {
             examEntityList.add(new Exam()
                     .setDescription(exam.getDescription())
-                    .setDate(exam.getEntryDate())
+                    .setEntryDate(exam.getEntryDate())
                     .setSubjectAndGroup(exam.getSubjectAndGroup())
                     .setTeacher(exam.getTeacher())
                     .setType(exam.getType()));
diff --git a/app/src/main/res/layout/exams_dialog.xml b/app/src/main/res/layout/exams_dialog.xml
index 5da1baac8..47fd7bb70 100644
--- a/app/src/main/res/layout/exams_dialog.xml
+++ b/app/src/main/res/layout/exams_dialog.xml
@@ -118,7 +118,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_below="@+id/exams_dialog_teacher_value"
                 android:layout_marginTop="10dp"
-                android:text="@string/dialog_date_text"
+                android:text="@string/exams_dialog_entry_date"
                 android:textSize="17sp" />
 
             <TextView
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 76ec9e0e1..41eda2739 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -141,4 +141,5 @@
     <string name="widget_timetable_tomorrow">Jutro</string>
     <string name="exams_no_entries">Brak sprawdzianów w tym tygodniu</string>
     <string name="exams_type">Typ</string>
+    <string name="exams_dialog_entry_date">Data wpisu</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a6931d9f..630592835 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -136,4 +136,5 @@
     <string name="widget_timetable_tomorrow">Tomorrow</string>
     <string name="exams_no_entries">No exams in this week</string>
     <string name="exams_type">Type</string>
+    <string name="exams_dialog_entry_date">Date of entry</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a32e7c546..07ec76646 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,9 +16,22 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
+    <style name="WulkanowyTheme.LoginTheme" parent="@style/Theme.AppCompat.Light">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorPrimary</item>
+        <item name="actionMenuTextColor">@android:color/primary_text_dark</item>
+        <item name="android:textColorPrimary">@android:color/primary_text_light</item>
+        <item name="android:textColorSecondary">@android:color/primary_text_light</item>
+        <item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
+        <item name="android:textColorTertiary">@android:color/primary_text_light</item>
+        <item name="android:textColorTertiaryInverse">@android:color/primary_text_dark</item>
+        <item name="titleTextColor">@android:color/primary_text_dark</item>
+        <item name="subtitleTextColor">@android:color/primary_text_dark</item>
+        <item name="android:colorBackground">@android:color/white</item>
+    </style>
+
     <style name="WulkanowyTheme.SplashTheme" parent="WulkanowyTheme">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
         <item name="android:windowBackground">@drawable/splash_background</item>
     </style>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b620e2990..46a4b94aa 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/pref_view_header">
         <ListPreference
-            android:defaultValue="2"
+            android:defaultValue="0"
             android:entries="@array/startup_tab_entries"
             android:entryValues="@array/startup_tab_value"
             android:key="startup_tab"