From 5fc9da2b3c207bf25f8d98a3b79c2de630e9f1e5 Mon Sep 17 00:00:00 2001
From: Shaleen Jain <shaleen@jain.sh>
Date: Thu, 16 Apr 2020 19:36:38 +0530
Subject: [PATCH 1/6] add missing tag name

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b5db6a13..d7aa7ed3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,6 +91,7 @@ jobs:
       id: create_release
       uses: actions/create-release@master
       with:
+        tag_name: ${{ github.ref }}
         release_name: Release ${{ github.ref }}
         body: ${{ steps.changelog.outputs.body }}
         draft: false

From 9fab5b1160ec85250555f43b48e0bd1f332ce09d Mon Sep 17 00:00:00 2001
From: Shaleen Jain <shaleen@jain.sh>
Date: Mon, 20 Apr 2020 00:00:53 +0530
Subject: [PATCH 2/6] update material components to 1.1.0

---
 app/build.gradle.kts                          |  2 +-
 .../ui/attendance/AttendanceListFragment.kt   |  2 +-
 .../ui/timetable/TimeTablePagerFragment.kt    | 47 +++++++------------
 .../main/res/layout-v21/include_toolbar.xml   |  4 +-
 app/src/main/res/layout/activity_login.xml    |  4 +-
 app/src/main/res/layout/drawer_header.xml     |  4 +-
 .../main/res/layout/include_drawer_list.xml   |  2 +-
 app/src/main/res/layout/include_toolbar.xml   |  4 +-
 app/src/main/res/values/hs_custom_theme.xml   |  6 ---
 app/src/main/res/values/styles.xml            |  7 +--
 10 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 60344bd7..8ff5a67a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -206,7 +206,7 @@ dependencies {
 //    implementation("com.github.shalzz:helpstack:1.4.1-debug")
 
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
-    implementation("com.google.android.material:material:1.0.0")
+    implementation("com.google.android.material:material:1.1.0")
 
     implementation("androidx.core:core:1.0.2")
     implementation("androidx.appcompat:appcompat:1.0.2")
diff --git a/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt
index efa17f37..79762f58 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt
@@ -158,7 +158,7 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
         (mActivity as MainActivity).setTitle(R.string.navigation_item_1)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, menuInflater: MenuInflater?) {
+    jjoverride fun onCreateOptionsMenu(menu: Menu?, menuInflater: MenuInflater?) {
         // Inflate the menu; this adds items to the action bar if it is present.
         menuInflater!!.inflate(R.menu.attendance, menu)
         val searchItem = menu!!.findItem(R.id.menu_search)
diff --git a/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt
index 784b3f02..07f0f034 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt
@@ -19,35 +19,27 @@
 
 package com.shalzz.attendance.ui.timetable
 
-import android.app.DatePickerDialog
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-
+import android.view.*
+import androidx.appcompat.app.ActionBar
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.ViewPager
 import com.bugsnag.android.Bugsnag
 import com.github.amlcurran.showcaseview.ShowcaseView
 import com.github.amlcurran.showcaseview.targets.Target
+import com.google.android.material.datepicker.MaterialDatePicker
+import com.google.android.material.datepicker.MaterialPickerOnPositiveButtonClickListener
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.shalzz.attendance.R
 import com.shalzz.attendance.ui.main.MainActivity
 import com.shalzz.attendance.utils.RxEventBus
 import com.shalzz.attendance.wrapper.DateHelper
-
-import java.util.Calendar
-import java.util.Date
-
+import kotlinx.android.synthetic.main.fragment_viewpager.view.*
+import java.util.*
 import javax.inject.Inject
 import javax.inject.Named
-import androidx.appcompat.app.ActionBar
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.viewpager.widget.ViewPager
-import kotlinx.android.synthetic.main.fragment_viewpager.view.*
 
 class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
 
@@ -147,10 +139,14 @@ class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
 
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         if (item!!.itemId == R.id.menu_date) {
-            val today = Calendar.getInstance()
-            today.time = Date()
-            val mDatePickerDialog = DatePickerDialog(mContext!!, onDateSetListener(), today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DAY_OF_MONTH))
-            mDatePickerDialog.show()
+            val today = MaterialDatePicker.thisMonthInUtcMilliseconds();
+            val datePickerBuilder = MaterialDatePicker.Builder.datePicker()
+            datePickerBuilder.setSelection(today)
+            val datePicker = datePickerBuilder.build()
+            datePicker.addOnPositiveButtonClickListener { selection: Long? ->
+                setDate(Date(selection!!))
+            }
+            datePicker.show(getFragmentManager()!!, datePickerBuilder.toString())
 
             val bundle = Bundle()
             bundle.putString(FirebaseAnalytics.Param.ITEM_ID, item.title.toString())
@@ -186,15 +182,6 @@ class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
         }
     }
 
-    private fun onDateSetListener(): DatePickerDialog.OnDateSetListener {
-        return DatePickerDialog.OnDateSetListener{
-            _, year, monthOfYear, dayOfMonth ->
-                val date = Calendar.getInstance()
-                date.set(year, monthOfYear, dayOfMonth)
-                setDate(date.time)
-        }
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         mTimeTablePresenter.detachView()
diff --git a/app/src/main/res/layout-v21/include_toolbar.xml b/app/src/main/res/layout-v21/include_toolbar.xml
index 1c207b6a..9ef01403 100644
--- a/app/src/main/res/layout-v21/include_toolbar.xml
+++ b/app/src/main/res/layout-v21/include_toolbar.xml
@@ -37,8 +37,8 @@
                 android:background="?attr/colorPrimary"
                 app:elevation="@dimen/toolbar_elevation"
                 android:subtitleTextAppearance="@style/MyActionBarSubTitleText"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+                android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
+                app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
     </com.google.android.material.appbar.AppBarLayout>
 
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1fd45d9d..ddfa731c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -35,8 +35,8 @@
         android:minHeight="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         android:subtitleTextAppearance="@style/MyActionBarSubTitleText"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+        android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
 
     <fragment
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index d61f0f1b..161fee42 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -28,7 +28,7 @@
                 android:layout_marginRight="@dimen/activity_vertical_margin"
                 android:layout_marginEnd="@dimen/activity_vertical_margin"
                 android:paddingBottom="5dp"
-                android:theme="@style/ThemeOverlay.AppCompat.Dark"
+                android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
                 tools:background="#ff303030"
                 android:gravity="bottom">
 
@@ -40,7 +40,7 @@
         android:paddingTop="5dp"
         android:text="Name"
         android:textColor="@color/list_item_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
+        android:textAppearance="?attr/textAppearanceHeadline6"
         android:textSize="18sp" />
 
     <TextView
diff --git a/app/src/main/res/layout/include_drawer_list.xml b/app/src/main/res/layout/include_drawer_list.xml
index 8bd28b35..42d2fd2b 100644
--- a/app/src/main/res/layout/include_drawer_list.xml
+++ b/app/src/main/res/layout/include_drawer_list.xml
@@ -25,7 +25,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
-    android:theme="@style/Theme.AppCompat.NoActionBar"
+    android:theme="@style/Theme.MaterialComponents.NoActionBar"
     android:soundEffectsEnabled="true"
     android:hapticFeedbackEnabled="true"
     android:fitsSystemWindows="true"
diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
index aec8bbb8..bc691b89 100644
--- a/app/src/main/res/layout/include_toolbar.xml
+++ b/app/src/main/res/layout/include_toolbar.xml
@@ -31,8 +31,8 @@
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             android:subtitleTextAppearance="@style/MyActionBarSubTitleText"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.MaterialComponents.Light" />
 
     <View
             android:id="@+id/drop_shadow"
diff --git a/app/src/main/res/values/hs_custom_theme.xml b/app/src/main/res/values/hs_custom_theme.xml
index cafee207..abcc8d57 100644
--- a/app/src/main/res/values/hs_custom_theme.xml
+++ b/app/src/main/res/values/hs_custom_theme.xml
@@ -20,12 +20,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-<!--    <style name="HSAppBaseTheme" parent="Theme.AppCompat.Light">-->
-<!--        <item name="colorPrimary">@color/primary</item>-->
-<!--        <item name="colorPrimaryDark">@color/primary_dark</item>-->
-<!--        <item name="colorAccent">@color/accent</item>-->
-<!--    </style>-->
-
     <!-- Primary color -->
     <color name="hs_path_primaryColor">#E33124</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 12899d8d..2e89f003 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -40,14 +40,15 @@
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
 
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
+        <item name="colorPrimaryVariant">@color/primary_dark</item>
+        <item name="colorSecondary">@color/accent</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <!-- OSS License theme. -->
-    <style name="OSSLicenseTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="OSSLicenseTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>

From 126a07358e1ef1bf1cad15d903516c2cb87b9ca7 Mon Sep 17 00:00:00 2001
From: Shaleen Jain <shaleen@jain.sh>
Date: Mon, 20 Apr 2020 11:46:35 +0530
Subject: [PATCH 3/6] update deps and androidx.fragments

---
 app/build.gradle.kts                          | 45 ++++++++++---------
 .../ui/attendance/AttendanceListFragment.kt   | 34 ++++++--------
 .../shalzz/attendance/ui/day/DayFragment.kt   | 16 +++----
 .../ui/login/CaptchaDialogFragment.kt         | 12 ++---
 .../attendance/ui/login/LoginFragment.kt      |  6 +--
 .../ui/timetable/TimeTablePagerFragment.kt    | 30 ++++++-------
 app/src/main/res/layout/fragment_login.xml    |  4 +-
 build.gradle.kts                              |  4 +-
 8 files changed, 69 insertions(+), 82 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8ff5a67a..3eead235 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import com.lordcodes.turtle.shellRun
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 
 plugins {
     id("com.android.application")
@@ -182,38 +181,40 @@ kapt {
 dependencies {
     val DAGGER_VERSION = "2.24"
     val ESPRESSO_VERSION = "3.1.0"
-    val RETROFIT_VERSION = "2.6.2"
-    val MOSHI_VERSION = "1.8.0"
-    val ROOM_VERSION = "2.2.1"
+    val RETROFIT_VERSION = "2.8.1"
+    val MOSHI_VERSION = "1.9.2"
+    val ROOM_VERSION = "2.2.5"
     val NAV_VERSION = "1.0.0"
 
     // TODO: re-evaluate when RxJava is completely replaced with kotlin co-routines
     implementation("androidx.multidex:multidex:2.0.1")
 
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.4")
-    implementation(kotlin("stdlib-jdk7", KotlinCompilerVersion.VERSION))
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.5")
+    implementation(kotlin("stdlib-jdk7"))
+    implementation(kotlin("stdlib-jdk8"))
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5")
 
-    implementation("androidx.core:core-ktx:1.1.0")
+    implementation("androidx.core:core-ktx:1.2.0")
     implementation("android.arch.navigation:navigation-fragment-ktx:$NAV_VERSION")
     implementation("android.arch.navigation:navigation-ui-ktx:$NAV_VERSION")
 
-    implementation("com.google.firebase:firebase-core:17.2.1")
-    implementation("com.google.firebase:firebase-analytics:17.2.1")
+    implementation("com.google.firebase:firebase-core:17.3.0")
+    implementation("com.google.firebase:firebase-analytics:17.3.0")
     implementation("com.github.shalzz:helpstack-android:1.4.6")
 //    implementation("com.github.shalzz:helpstack:1.4.1-debug")
 
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
     implementation("com.google.android.material:material:1.1.0")
 
-    implementation("androidx.core:core:1.0.2")
-    implementation("androidx.appcompat:appcompat:1.0.2")
-    implementation("androidx.fragment:fragment:1.0.0")
-    implementation("androidx.recyclerview:recyclerview:1.0.0")
-    implementation("androidx.preference:preference:1.0.0")
-    implementation("androidx.annotation:annotation:1.0.2")
+    implementation("androidx.core:core:1.2.0")
+    implementation("androidx.appcompat:appcompat:1.1.0")
+    implementation("androidx.fragment:fragment:1.2.4")
+    implementation("androidx.fragment:fragment-ktx:1.2.4")
+    implementation("androidx.recyclerview:recyclerview:1.1.0")
+    implementation("androidx.preference:preference:1.1.1")
+    implementation("androidx.annotation:annotation:1.1.0")
     implementation("androidx.constraintlayout:constraintlayout:1.1.3")
     implementation("androidx.constraintlayout:constraintlayout-solver:1.1.3")
 
@@ -228,8 +229,8 @@ dependencies {
 
     implementation("com.jakewharton.timber:timber:4.7.1")
 
-    implementation("io.reactivex.rxjava2:rxandroid:2.0.2")
-    implementation("io.reactivex.rxjava2:rxjava:2.1.14")
+    implementation("io.reactivex.rxjava2:rxandroid:2.1.1")
+    implementation("io.reactivex.rxjava2:rxjava:2.2.19")
 
     implementation("com.squareup.retrofit2:retrofit:$RETROFIT_VERSION")
     implementation("com.squareup.retrofit2:converter-moshi:$RETROFIT_VERSION")
@@ -255,9 +256,9 @@ dependencies {
     testImplementation("androidx.room:room-testing:$ROOM_VERSION")
     androidTestImplementation("androidx.room:room-testing:$ROOM_VERSION")
 
-    val jUnit = "androidx.test.ext:junit:1.0.0"
+    val jUnit = "androidx.test.ext:junit:1.1.1"
     val truth = "androidx.test.ext:truth:1.0.0"
-    val mockito = "org.mockito:mockito-core:3.1.0"
+    val mockito = "org.mockito:mockito-core:3.3.3"
 
     // Unit tests dependencies
     testImplementation(jUnit)
@@ -265,7 +266,7 @@ dependencies {
     testImplementation(mockito)
     testImplementation("androidx.test:core:1.2.0")
     testImplementation("org.robolectric:robolectric:4.3.1")
-    testImplementation("org.robolectric:shadows-multidex:4.0")
+    testImplementation("org.robolectric:shadows-multidex:4.3.1")
 
     // Instrumentation test dependencies
     androidTestImplementation(jUnit)
diff --git a/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt
index 79762f58..308ba817 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/attendance/AttendanceListFragment.kt
@@ -25,13 +25,7 @@ import android.animation.ValueAnimator
 import android.app.Activity
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.view.ViewTreeObserver
+import android.view.*
 import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
@@ -59,6 +53,8 @@ import kotlinx.android.synthetic.main.fragment_attendance.*
 import kotlinx.android.synthetic.main.fragment_attendance.view.*
 import javax.inject.Inject
 import javax.inject.Named
+import kotlin.math.abs
+import kotlin.math.min
 
 class AttendanceListFragment : Fragment(), AttendanceMvpView,
     ExpandableListAdapter.SubjectItemExpandedListener {
@@ -102,7 +98,7 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
         useGridLayout = resources.getBoolean(R.bool.use_grid_layout)
         mExpandCollapseDuration = resources.getInteger(R.integer.expand_collapse_duration)
 
-        mActivity = activity!!
+        mActivity = requireActivity()
         (mActivity as MainActivity).activityComponent().inject(this)
         mPresenter.attachView(this)
         setHasOptionsMenu(true)
@@ -158,10 +154,10 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
         (mActivity as MainActivity).setTitle(R.string.navigation_item_1)
     }
 
-    jjoverride fun onCreateOptionsMenu(menu: Menu?, menuInflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater!!.inflate(R.menu.attendance, menu)
-        val searchItem = menu!!.findItem(R.id.menu_search)
+        inflater.inflate(R.menu.attendance, menu)
+        val searchItem = menu.findItem(R.id.menu_search)
 
         val searchView = searchItem.actionView as SearchView
         searchView.queryHint = resources.getString(R.string.hint_search)
@@ -184,8 +180,8 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
         })
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        if (item!!.itemId == R.id.menu_refresh) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.menu_refresh) {
             // We make sure that the SwipeRefreshLayout is displaying it's refreshing indicator
             if (!layoutSwipeRefresh.isRefreshing) {
                 layoutSwipeRefresh.isRefreshing = true
@@ -197,7 +193,7 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
             bundle.putString(FirebaseAnalytics.Param.ITEM_ID, item.title.toString())
             bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, "Search")
             bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, "menu")
-            mTracker.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle)
+            mTracker.logEvent(FirebaseAnalytics.Event.SELECT_ITEM, bundle)
         }
         return super.onOptionsItemSelected(item)
     }
@@ -217,8 +213,8 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
                 }
                 // Calculate some values to help with the animation.
                 val endingHeight = view.height
-                val distance = Math.abs(endingHeight - startingHeight)
-                val baseHeight = Math.min(endingHeight, startingHeight)
+                val distance = abs(endingHeight - startingHeight)
+                val baseHeight = min(endingHeight, startingHeight)
                 val isExpanded = endingHeight > startingHeight
 
                 // Set the views back to the start state of the animation
@@ -267,7 +263,6 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
 
     override fun getViewForCallId(callId: Long): View? {
         if (!useGridLayout) {
-            assert(mLinearLayoutManager != null)
             val firstPosition = mLinearLayoutManager!!.findFirstVisibleItemPosition()
             val lastPosition = mLinearLayoutManager!!.findLastVisibleItemPosition()
 
@@ -284,7 +279,6 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
         } else {
             val firstPosition = intArrayOf(0, 0)
             val lastPosition = intArrayOf(0, 0)
-            assert(mGridLayoutManager != null)
             mGridLayoutManager!!.findFirstVisibleItemPositions(firstPosition)
             mGridLayoutManager!!.findLastVisibleItemPositions(lastPosition)
 
@@ -329,7 +323,7 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
         if (recyclerView.getChildAt(2) != null) {
             val target = ViewTarget(recyclerView.getChildAt(2))
 
-            ShowcaseView.Builder(activity!!)
+            ShowcaseView.Builder(mActivity)
                 .setStyle(R.style.ShowcaseTheme)
                 .setTarget(target)
                 .singleShot(2222)
@@ -358,7 +352,7 @@ class AttendanceListFragment : Fragment(), AttendanceMvpView,
     override fun showRetryError(message: String) {
         stopRefreshing()
         Snackbar.make(recyclerView, message, Snackbar.LENGTH_LONG)
-            .setAction("Retry") { v -> mPresenter.syncAttendance() }
+            .setAction("Retry") { mPresenter.syncAttendance() }
             .show()
     }
 
diff --git a/app/src/main/java/com/shalzz/attendance/ui/day/DayFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/day/DayFragment.kt
index 1b693d99..6840c02b 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/day/DayFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/day/DayFragment.kt
@@ -76,8 +76,8 @@ class DayFragment : Fragment(), DayMvpView {
      * The [androidx.swiperefreshlayout.widget.SwipeRefreshLayout] that detects swipe gestures and
      * triggers callbacks in the app.
      */
-    var mSwipeRefreshLayout: MultiSwipeRefreshLayout? = null
-    var mRecyclerView: RecyclerView? = null
+    private var mSwipeRefreshLayout: MultiSwipeRefreshLayout? = null
+    private var mRecyclerView: RecyclerView? = null
     private lateinit var mDate: Date
     private lateinit var mEmptyView: EmptyView
 
@@ -93,8 +93,8 @@ class DayFragment : Fragment(), DayMvpView {
         setHasOptionsMenu(true)
         mDayPresenter.attachView(this)
 
-        mDate = if (arguments!!.getSerializable(ARG_DATE) != null)
-            arguments!!.getSerializable(ARG_DATE) as Date
+        mDate = if (arguments?.getSerializable(ARG_DATE) != null)
+            requireArguments().getSerializable(ARG_DATE) as Date
         else
             Date()
 
@@ -124,12 +124,12 @@ class DayFragment : Fragment(), DayMvpView {
         return mView
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater!!.inflate(R.menu.day, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.day, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        if (item!!.itemId == R.id.menu_refresh) {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.menu_refresh) {
             // We make sure that the SwipeRefreshLayout is displaying it's refreshing indicator
             if (!mSwipeRefreshLayout!!.isRefreshing) {
                 mSwipeRefreshLayout!!.isRefreshing = true
diff --git a/app/src/main/java/com/shalzz/attendance/ui/login/CaptchaDialogFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/login/CaptchaDialogFragment.kt
index baa58e1f..506688e2 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/login/CaptchaDialogFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/login/CaptchaDialogFragment.kt
@@ -61,16 +61,12 @@ class CaptchaDialogFragment(listener: CaptchaDialogListener, dataAPI: DataAPI, c
         fun onDialogPositiveClick(dialog: MaterialDialog, captcha: String, cookie: String)
     }
 
-    override fun onAttach(context: Context?) {
-        super.onAttach(context)
-        mContext = context!!
-    }
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val inflater = activity!!.layoutInflater
+        val inflater = requireActivity().layoutInflater
         val mView = inflater.inflate(R.layout.captcha_dialog, null)
 
-        return MaterialDialog.Builder(context!!)
+        mContext = requireContext()
+        return MaterialDialog.Builder(mContext)
                 .positiveText(R.string.login_button)
                 .negativeText(android.R.string.cancel)
                 .customView(mView, false)
@@ -103,7 +99,7 @@ class CaptchaDialogFragment(listener: CaptchaDialogListener, dataAPI: DataAPI, c
 
         // logs in when user press done on keyboard.
         materialDialog.captchaEditText.setOnEditorActionListener(
-                TextView.OnEditorActionListener { view, actionId, event ->
+                TextView.OnEditorActionListener { _, actionId, _ ->
                     if (actionId == EditorInfo.IME_ACTION_DONE) {
                         positiveButton.performClick()
                         return@OnEditorActionListener true
diff --git a/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt
index d28669ff..4e133049 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt
@@ -23,7 +23,6 @@ import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
@@ -32,7 +31,6 @@ import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import com.afollestad.materialdialogs.MaterialDialog
 import com.bugsnag.android.Bugsnag
-import com.github.amlcurran.showcaseview.OnShowcaseEventListener
 import com.github.amlcurran.showcaseview.ShowcaseView
 import com.github.amlcurran.showcaseview.targets.ViewTarget
 import com.google.android.gms.common.ConnectionResult
@@ -43,10 +41,8 @@ import com.shalzz.attendance.data.local.PreferencesHelper
 import com.shalzz.attendance.data.model.College
 import com.shalzz.attendance.data.model.entity.User
 import com.shalzz.attendance.data.remote.DataAPI
-import com.shalzz.attendance.ui.attendance.AttendanceListFragment
 import com.shalzz.attendance.utils.Utils
 import com.shalzz.attendance.utils.Utils.Analytics
-import kotlinx.android.synthetic.main.drawer.*
 import kotlinx.android.synthetic.main.fragment_login.*
 import kotlinx.android.synthetic.main.fragment_login.view.*
 import timber.log.Timber
@@ -262,7 +258,7 @@ class LoginFragment : Fragment(), LoginMvpView, AdapterView.OnItemSelectedListen
     override fun showCaptchaDialog() {
         dismissProgressDialog()
         val dialog = CaptchaDialogFragment(this, mDataApi, college!!.id)
-        dialog.show(fragmentManager, "captcha-dialog")
+        dialog.show(parentFragmentManager, "captcha-dialog")
     }
 
     override fun updateCollegeList(data: List<College>) {
diff --git a/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt
index 07f0f034..85c7b66a 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/timetable/TimeTablePagerFragment.kt
@@ -30,7 +30,6 @@ import com.bugsnag.android.Bugsnag
 import com.github.amlcurran.showcaseview.ShowcaseView
 import com.github.amlcurran.showcaseview.targets.Target
 import com.google.android.material.datepicker.MaterialDatePicker
-import com.google.android.material.datepicker.MaterialPickerOnPositiveButtonClickListener
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.shalzz.attendance.R
 import com.shalzz.attendance.ui.main.MainActivity
@@ -115,8 +114,8 @@ class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
         showcaseView()
     }
 
-    fun showcaseView() {
-        val sv = ShowcaseView.Builder(activity!!)
+    private fun showcaseView() {
+        val sv = ShowcaseView.Builder(requireActivity())
                 .setStyle(R.style.ShowcaseTheme)
                 .setTarget(Target.NONE)
                 .singleShot(3333)
@@ -125,34 +124,35 @@ class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
                 .setContentText(getString(R.string.sv_timetable_content))
                 .build()
 
-        sv.overrideButtonClick { v -> sv.hide() }
+        sv.overrideButtonClick { sv.hide() }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, menuInflater: MenuInflater?) {
-        menuInflater!!.inflate(R.menu.time_table, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.time_table, menu)
     }
 
     /* Called whenever we call invalidateOptionsMenu() */
-    override fun onPrepareOptionsMenu(menu: Menu?) {
+    override fun onPrepareOptionsMenu(menu: Menu) {
         updateTitle(-1)
+        super.onPrepareOptionsMenu(menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        if (item!!.itemId == R.id.menu_date) {
-            val today = MaterialDatePicker.thisMonthInUtcMilliseconds();
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.menu_date) {
+            val today = Date()
             val datePickerBuilder = MaterialDatePicker.Builder.datePicker()
-            datePickerBuilder.setSelection(today)
+            datePickerBuilder.setSelection(today.time)
             val datePicker = datePickerBuilder.build()
             datePicker.addOnPositiveButtonClickListener { selection: Long? ->
                 setDate(Date(selection!!))
             }
-            datePicker.show(getFragmentManager()!!, datePickerBuilder.toString())
+            datePicker.show(getParentFragmentManager(), datePickerBuilder.toString())
 
             val bundle = Bundle()
             bundle.putString(FirebaseAnalytics.Param.ITEM_ID, item.title.toString())
             bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, "Scroll to Date")
             bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, "menu")
-            mTracker.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle)
+            mTracker.logEvent(FirebaseAnalytics.Event.SELECT_ITEM, bundle)
             return true
         } else if (item.itemId == R.id.menu_today) {
             setDate(Date())
@@ -161,7 +161,7 @@ class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
             bundle.putString(FirebaseAnalytics.Param.ITEM_ID, item.title.toString())
             bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, "Scroll to Today")
             bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, "menu")
-            mTracker.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle)
+            mTracker.logEvent(FirebaseAnalytics.Event.SELECT_ITEM, bundle)
             return true
         }
         return super.onOptionsItemSelected(item)
@@ -172,7 +172,7 @@ class TimeTablePagerFragment : Fragment(), TimeTableMvpView {
      *
      * @param position to update for, -1 for current page
      */
-    fun updateTitle(position: Int) {
+    private fun updateTitle(position: Int) {
         if (position != -1)
             mPreviousPosition = position
         val mDate = mAdapter!!.getDateForPosition(mPreviousPosition)
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 13939624..380ca4c5 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -86,7 +86,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:autofillHints="username"
                 android:ellipsize="end"
                 android:hint="@string/hint_userid"
@@ -118,7 +118,7 @@
 
             <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
+                android:layout_height="wrap_content"
                 android:autofillHints="textPassword"
                 android:ellipsize="end"
                 android:ems="10"
diff --git a/build.gradle.kts b/build.gradle.kts
index 6ef01872..4a87d5df 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,7 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    val kotlinVersion = "1.3.60-eap-25"
+    val kotlinVersion = "1.3.71"
     repositories {
         google()
         jcenter()
@@ -32,7 +32,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:4.0.0-beta04")
         classpath("com.google.gms:google-services:4.3.2")
 
-        classpath("com.google.android.gms:oss-licenses-plugin:0.10.0")
+        classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")
 
         //noinspection GradleDynamicVersion
         classpath("com.bugsnag:bugsnag-android-gradle-plugin:4.+")

From 29b80df5f479a320ccca1b7f8105e7440319a360 Mon Sep 17 00:00:00 2001
From: Shaleen Jain <shaleen@jain.sh>
Date: Mon, 20 Apr 2020 11:46:58 +0530
Subject: [PATCH 4/6] use FragmentContainerView

---
 .../main/java/com/shalzz/attendance/ui/main/MainActivity.kt  | 5 ++++-
 app/src/main/res/layout/include_drawer_main_content.xml      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt b/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
index 2eedf8da..8d77b435 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
@@ -38,6 +38,7 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.Navigation
+import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
 import androidx.recyclerview.widget.RecyclerView
@@ -120,7 +121,9 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
         isTabletLayout = resources.getBoolean(R.bool.tablet_layout)
 
         setSupportActionBar(toolbar)
-        navController = Navigation.findNavController(this, R.id.nav_main_host_fragment)
+        val navHostFragment = supportFragmentManager
+                .findFragmentById(R.id.nav_main_host_fragment) as NavHostFragment
+        navController = navHostFragment.navController
         setupWithNavController(mNavigationView, navController)
 
         if (!isTabletLayout) {
diff --git a/app/src/main/res/layout/include_drawer_main_content.xml b/app/src/main/res/layout/include_drawer_main_content.xml
index 19ff9e9a..b0ee272e 100644
--- a/app/src/main/res/layout/include_drawer_main_content.xml
+++ b/app/src/main/res/layout/include_drawer_main_content.xml
@@ -27,7 +27,7 @@
 
     <include layout="@layout/include_toolbar"/>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
             android:id="@+id/nav_main_host_fragment"
             android:name="androidx.navigation.fragment.NavHostFragment"
             android:layout_width="match_parent"

From 0c04c3242c9504569e1c937c958b93cf87bc7035 Mon Sep 17 00:00:00 2001
From: Shaleen Jain <shaleen@jain.sh>
Date: Mon, 20 Apr 2020 14:17:04 +0530
Subject: [PATCH 5/6] Update NavigationView

---
 app/build.gradle.kts                          | 10 +++++--
 .../data/local/PreferencesHelper.kt           |  1 -
 .../shalzz/attendance/ui/main/MainActivity.kt | 28 ++++++-------------
 .../ui/settings/SettingsFragment.java         | 12 ++++----
 .../res/drawable-xxhdpi/ic_event_note_24.xml  | 10 +++++++
 .../res/drawable-xxhdpi/ic_settings_24.xml    | 10 +++++++
 .../main/res/layout-v21/include_toolbar.xml   |  2 +-
 app/src/main/res/layout/drawer_header.xml     | 26 ++++++++---------
 .../main/res/layout/include_drawer_list.xml   |  2 --
 app/src/main/res/layout/include_toolbar.xml   |  2 +-
 app/src/main/res/menu/drawer.xml              | 18 +++++++-----
 11 files changed, 65 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_event_note_24.xml
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_24.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3eead235..8c791a77 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -137,6 +137,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
     sourceSets {
         val commonTestDir = "src/commonTest/java"
 
@@ -184,7 +188,7 @@ dependencies {
     val RETROFIT_VERSION = "2.8.1"
     val MOSHI_VERSION = "1.9.2"
     val ROOM_VERSION = "2.2.5"
-    val NAV_VERSION = "1.0.0"
+    val NAV_VERSION = "2.2.0"
 
     // TODO: re-evaluate when RxJava is completely replaced with kotlin co-routines
     implementation("androidx.multidex:multidex:2.0.1")
@@ -197,8 +201,8 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5")
 
     implementation("androidx.core:core-ktx:1.2.0")
-    implementation("android.arch.navigation:navigation-fragment-ktx:$NAV_VERSION")
-    implementation("android.arch.navigation:navigation-ui-ktx:$NAV_VERSION")
+    implementation("androidx.navigation:navigation-fragment-ktx:$NAV_VERSION")
+    implementation("androidx.navigation:navigation-ui-ktx:$NAV_VERSION")
 
     implementation("com.google.firebase:firebase-core:17.3.0")
     implementation("com.google.firebase:firebase-analytics:17.3.0")
diff --git a/app/src/main/java/com/shalzz/attendance/data/local/PreferencesHelper.kt b/app/src/main/java/com/shalzz/attendance/data/local/PreferencesHelper.kt
index b6149d85..f338b0f4 100644
--- a/app/src/main/java/com/shalzz/attendance/data/local/PreferencesHelper.kt
+++ b/app/src/main/java/com/shalzz/attendance/data/local/PreferencesHelper.kt
@@ -92,7 +92,6 @@ constructor(@ApplicationContext context: Context) {
      */
     fun removeUser() {
         val editor = mPref.edit()
-        editor.remove(MainActivity.PREFERENCE_ACTIVATED_FRAGMENT)
         editor.putBoolean("LOGGEDIN", false)
         editor.remove("USERNAME")
         editor.remove("TOKEN")
diff --git a/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt b/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
index 8d77b435..bad3d65f 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/main/MainActivity.kt
@@ -37,7 +37,6 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
-import androidx.navigation.Navigation
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.NavigationUI
@@ -92,15 +91,6 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
     private var mBillingManager: BillingManager? = null
     private lateinit var navController: NavController
 
-    /**
-     * Reference to fragment positions
-     */
-    enum class Fragments(val value: Int) {
-        ATTENDANCE(1),
-        TIMETABLE(2),
-        SETTINGS(3)
-    }
-
     class DrawerHeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val tvName: TextView = itemView.drawer_header_name
         val tvCourse: TextView = itemView.drawer_header_course
@@ -119,11 +109,12 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
         mNavigationView = list_slidermenu
         mToolbar = toolbar
         isTabletLayout = resources.getBoolean(R.bool.tablet_layout)
-
         setSupportActionBar(toolbar)
+
         val navHostFragment = supportFragmentManager
                 .findFragmentById(R.id.nav_main_host_fragment) as NavHostFragment
         navController = navHostFragment.navController
+
         setupWithNavController(mNavigationView, navController)
 
         if (!isTabletLayout) {
@@ -181,14 +172,15 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
                 } else
                     NavigationUI.onNavDestinationSelected(item, navController)
             }
-            val parent = navigationView.parent
-            (parent as DrawerLayout).closeDrawer(navigationView)
+            if (!isTabletLayout) {
+                val parent = navigationView.parent
+                (parent as DrawerLayout).closeDrawer(navigationView)
+            }
             true
         }
         val weakReference = WeakReference(navigationView)
         navController.addOnDestinationChangedListener(object : NavController.OnDestinationChangedListener {
 
-
             override fun onDestinationChanged(controller: NavController,
                                               destination: NavDestination,
                                               arguments: Bundle?) {
@@ -276,6 +268,7 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
             finish()
         else
             navController.navigate(R.id.attendanceListFragment)
+        super.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun setTitle(title: CharSequence) {
@@ -349,11 +342,6 @@ class MainActivity : BaseActivity(), MainMvpView, BillingProvider {
          */
         var LOGGED_OUT = false
 
-        /**
-         * Remember the position of the selected item.
-         */
-        val PREFERENCE_ACTIVATED_FRAGMENT = "ACTIVATED_FRAGMENT2.2"
-
-        val ACTIVITY_RESULT_CODE_AUTHENTICATION = 1;
+        const val ACTIVITY_RESULT_CODE_AUTHENTICATION = 1
     }
 }
diff --git a/app/src/main/java/com/shalzz/attendance/ui/settings/SettingsFragment.java b/app/src/main/java/com/shalzz/attendance/ui/settings/SettingsFragment.java
index a6dd95b9..e874d433 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/com/shalzz/attendance/ui/settings/SettingsFragment.java
@@ -38,9 +38,9 @@
 import com.shalzz.attendance.injection.ActivityContext;
 import com.shalzz.attendance.sync.MyAccountManager;
 import com.shalzz.attendance.ui.main.MainActivity;
-import com.shalzz.attendance.utils.Utils.Analytics;
 import com.shalzz.attendance.utils.RxEventBus;
 import com.shalzz.attendance.utils.RxUtil;
+import com.shalzz.attendance.utils.Utils.Analytics;
 import com.shalzz.attendance.wrapper.ProModeListPreference;
 
 import javax.inject.Inject;
@@ -93,13 +93,13 @@ public void onCreatePreferences(Bundle bundle, String s) {
         addPreferencesFromResource(R.xml.preferences);
 
         key_sync_interval = getString(R.string.pref_key_sync_interval);
-        ListPreference synclistPref = (ListPreference) findPreference(key_sync_interval);
+        ListPreference synclistPref = findPreference(key_sync_interval);
         synclistPref.setSummary(synclistPref.getEntry());
 
-        syncPref = (SwitchPreferenceCompat) findPreference(getString(R.string.pref_key_sync));
-        proThemePref = (ProModeListPreference) findPreference(getString(R.string.pref_key_day_night));
-        weekendsPref = (SwitchPreferenceCompat) findPreference(getString(R.string.pref_key_hide_weekends));
-        proModePref = (SwitchPreferenceCompat) findPreference(getString(R.string.pref_key_pro_mode));
+        syncPref = findPreference(getString(R.string.pref_key_sync));
+        proThemePref = findPreference(getString(R.string.pref_key_day_night));
+        weekendsPref = findPreference(getString(R.string.pref_key_hide_weekends));
+        proModePref = findPreference(getString(R.string.pref_key_pro_mode));
     }
 
     @Override
diff --git a/app/src/main/res/drawable-xxhdpi/ic_event_note_24.xml b/app/src/main/res/drawable-xxhdpi/ic_event_note_24.xml
new file mode 100644
index 00000000..bb5a86b2
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_event_note_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16,10L8,10c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h8c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM19,3h-1L18,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L8,3L8,2c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v1L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM18,19L6,19c-0.55,0 -1,-0.45 -1,-1L5,8h14v10c0,0.55 -0.45,1 -1,1zM13,14L8,14c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h5c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_24.xml b/app/src/main/res/drawable-xxhdpi/ic_settings_24.xml
new file mode 100644
index 00000000..6da10fa3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_settings_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/layout-v21/include_toolbar.xml b/app/src/main/res/layout-v21/include_toolbar.xml
index 9ef01403..cc1ce69b 100644
--- a/app/src/main/res/layout-v21/include_toolbar.xml
+++ b/app/src/main/res/layout-v21/include_toolbar.xml
@@ -29,7 +29,7 @@
             android:layout_width="match_parent"
     >
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 161fee42..134f9380 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -19,18 +19,17 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="96dp"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_marginLeft="@dimen/activity_vertical_margin"
-                android:layout_marginStart="@dimen/activity_vertical_margin"
-                android:layout_marginRight="@dimen/activity_vertical_margin"
-                android:layout_marginEnd="@dimen/activity_vertical_margin"
-                android:paddingBottom="5dp"
-                android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
-                tools:background="#ff303030"
-                android:gravity="bottom">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="96dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_marginLeft="@dimen/activity_vertical_margin"
+    android:layout_marginStart="@dimen/activity_vertical_margin"
+    android:layout_marginRight="@dimen/activity_vertical_margin"
+    android:layout_marginEnd="@dimen/activity_vertical_margin"
+    android:layout_marginTop="15dp"
+    android:paddingBottom="5dp"
+    android:gravity="bottom">
 
     <TextView
         android:id="@+id/drawer_header_name"
@@ -39,7 +38,6 @@
         android:layout_marginTop="28dp"
         android:paddingTop="5dp"
         android:text="Name"
-        android:textColor="@color/list_item_title"
         android:textAppearance="?attr/textAppearanceHeadline6"
         android:textSize="18sp" />
 
@@ -49,7 +47,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/drawer_header_name"
         android:text="Course"
-        android:textColor="@android:color/darker_gray"
         android:textSize="13sp" />
 
     <TextView
@@ -60,7 +57,6 @@
         android:gravity="end"
         android:paddingTop="3dp"
         android:text="Last refreshed 0 minutes ago"
-        android:textColor="@android:color/darker_gray"
         android:visibility="gone"
         android:textSize="13sp"/>
 
diff --git a/app/src/main/res/layout/include_drawer_list.xml b/app/src/main/res/layout/include_drawer_list.xml
index 42d2fd2b..597df55f 100644
--- a/app/src/main/res/layout/include_drawer_list.xml
+++ b/app/src/main/res/layout/include_drawer_list.xml
@@ -25,10 +25,8 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
-    android:theme="@style/Theme.MaterialComponents.NoActionBar"
     android:soundEffectsEnabled="true"
     android:hapticFeedbackEnabled="true"
     android:fitsSystemWindows="true"
-    app:itemTextColor="@color/list_text"
     app:menu="@menu/drawer"
     app:headerLayout="@layout/drawer_header"/>
diff --git a/app/src/main/res/layout/include_toolbar.xml b/app/src/main/res/layout/include_toolbar.xml
index bc691b89..26251df6 100644
--- a/app/src/main/res/layout/include_toolbar.xml
+++ b/app/src/main/res/layout/include_toolbar.xml
@@ -24,7 +24,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         tools:ignore="UnusedAttribute">
 
-    <androidx.appcompat.widget.Toolbar
+    <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index 67bc2a09..e552abfd 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -22,21 +22,25 @@
     <group android:checkableBehavior="single">
         <item
             android:id="@+id/attendanceListFragment"
+            android:icon="@drawable/ic_stat_human"
             android:checked="true"
-            android:orderInCategory="1"
             android:title="@string/navigation_item_1"/>
         <item
             android:id="@+id/timeTablePagerFragment"
-            android:orderInCategory="2"
+            android:icon="@drawable/ic_event_note_24"
             android:title="@string/navigation_item_2"/>
         <item
             android:id="@+id/settingsFragment"
-            android:orderInCategory="4"
+            android:icon="@drawable/ic_settings_24"
             android:title="@string/navigation_item_3"/>
-        <item
-            android:id="@+id/helpNSupport"
-            android:orderInCategory="3"
-            android:title="@string/navigation_item_4"/>
     </group>
 
+    <item android:title="Other">
+        <menu>
+            <item
+                android:id="@+id/helpNSupport"
+                android:title="@string/navigation_item_4"/>
+        </menu>
+    </item>
+
 </menu>
\ No newline at end of file

From a9efdfc79c63fbe3239dea4076a62207ff4e4b85 Mon Sep 17 00:00:00 2001
From: Shaleen Jain <shaleen@jain.sh>
Date: Mon, 20 Apr 2020 15:29:50 +0530
Subject: [PATCH 6/6] login: use constant id for showcase view singleshot

---
 .../main/java/com/shalzz/attendance/ui/login/LoginFragment.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt b/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt
index 4e133049..fd5a63e3 100644
--- a/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/shalzz/attendance/ui/login/LoginFragment.kt
@@ -127,7 +127,7 @@ class LoginFragment : Fragment(), LoginMvpView, AdapterView.OnItemSelectedListen
         val sv = ShowcaseView.Builder(mActivity)
                 .setStyle(R.style.ShowcaseTheme)
                 .setTarget(target)
-                .singleShot(R.id.menu_help.toLong())
+                .singleShot(4444)
                 .blockAllTouches()
                 .setContentTitle(getString(R.string.sv_login_activity_faq))
                 .setContentText(getString(R.string.sv_login_activity_faq_content))
@@ -140,7 +140,7 @@ class LoginFragment : Fragment(), LoginMvpView, AdapterView.OnItemSelectedListen
             ShowcaseView.Builder(mActivity)
                     .setStyle(R.style.ShowcaseTheme)
                     .setTarget(secondTarget)
-                    .singleShot(R.id.spCollege.toLong())
+                    .singleShot(5555)
                     .setContentTitle(getString(R.string.sv_login_activity_spinner))
                     .setContentText(getString(R.string.sv_login_activity_spinner_content))
                     .build()