Fixes

README.md

@@ -14,7 +14,7 @@
 
 ## Installation
 
-Downloadable form Google Apps to devicues running at least Android API level 29.
+Downloadable form Google Apps to devices running at least Android API level 29.
 >TBD 
 
 ## User guide

app/build.gradle

@@ -68,7 +68,7 @@ dependencies {
 
     implementation "com.github.bumptech.glide:glide:4.11.0"
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 
     debugImplementation 'com.facebook.flipper:flipper:0.110.0'
     debugImplementation 'com.facebook.soloader:soloader:0.10.1'

app/src/main/AndroidManifest.xml

@@ -3,8 +3,9 @@
     package="com.shuffleus.app">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <application
+    <application android:requestLegacyExternalStorage="true"
         android:name=".App"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
@@ -30,6 +31,14 @@
                 android:value=".settings.SettingsActivity"/>
         </activity>
 
+        <activity
+            android:name=".schedule.ScheduleActivity"
+            android:parentActivityName=".main.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".schedule.ScheduleActivity"/>
+        </activity>
+
         <receiver
             android:name="com.shuffleus.app.utils.TimerExpiredReceiver"
             android:enabled="true"

app/src/main/java/com/shuffleus/app/App.kt

@@ -3,7 +3,6 @@ package com.shuffleus.app
 import android.app.Application
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.os.Build
 import androidx.core.app.NotificationManagerCompat
 
 class App: Application() {
@@ -14,16 +13,14 @@ class App: Application() {
     }
 
     private fun createNotificationChannel() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val channel = NotificationChannel(
-                NOTIFICATION_CHANNEL_MAIN_ID,
-                NOTIFICATION_CHANNEL_MAIN_DESCRIPTION,
-                NotificationManager.IMPORTANCE_HIGH
-            ).apply {
-                description = NOTIFICATION_CHANNEL_MAIN_DESCRIPTION
-            }
-            NotificationManagerCompat.from(this).createNotificationChannel(channel)
+        val channel = NotificationChannel(
+            NOTIFICATION_CHANNEL_MAIN_ID,
+            NOTIFICATION_CHANNEL_MAIN_DESCRIPTION,
+            NotificationManager.IMPORTANCE_HIGH
+        ).apply {
+            description = NOTIFICATION_CHANNEL_MAIN_DESCRIPTION
         }
+        NotificationManagerCompat.from(this).createNotificationChannel(channel)
     }
 
     companion object {

app/src/main/java/com/shuffleus/app/AppSettings.kt

@@ -5,9 +5,9 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.shuffleus.app.AppSettings.Companion.APP_PREFERENCES
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 
@@ -18,32 +18,96 @@ class AppSettings(private val context: Context) {
 
     companion object {
         const val APP_PREFERENCES = "shuffleus_client"
-        private val KEY_APP_LAUNCH_COUNT = intPreferencesKey("app_launches")
         private val KEY_GROUPNAMES_IDX = intPreferencesKey("groupnames")
         private val KEY_OLD_GROUPNAMES_IDX = intPreferencesKey("old_groupnames")
         private val KEY_GROUPSIZE = intPreferencesKey("groupsize")
         private val KEY_OLD_GROUPSIZE = intPreferencesKey("old_groupsize")
         private val KEY_SEED = intPreferencesKey("seed")
         private val KEY_OLD_SEED = intPreferencesKey("old_seed")
         private val KEY_TIMER_IDX = intPreferencesKey("timer_idx")
+        private val KEY_TIMER_LENGTH = intPreferencesKey("timer_length")
+        private val KEY_TIMER_PREVIOUS_LENGTH = longPreferencesKey("timer_previous_length")
+        private val KEY_TIMER_STATE = intPreferencesKey("timer_state")
+        private val KEY_SECONDS_REMAINING = longPreferencesKey("seconds_remaining")
+        private val KEY_ALARM_TIME = longPreferencesKey("alarm_time")
+    }
+
+
+    /**
+     * Read timer state
+     */
+    suspend fun getAlarmSetTime(): Long = context.dataStore.data.map { preferences ->
+        preferences[KEY_ALARM_TIME] ?: 0
+    }.first()
 
+    /**
+     * Set timer state
+     */
+    suspend fun setAlarmSetTime(value: Long) {
+        context.dataStore.edit { preferences ->
+            preferences[KEY_ALARM_TIME] = value
+        }
     }
+    /**
+     * Read remaining seconds
+     */
+    suspend fun getSecondsRemaining(): Long = context.dataStore.data.map { preferences ->
+        preferences[KEY_SECONDS_REMAINING] ?: 1
+    }.first()
 
+    /**
+     * Set remaining seconds
+     */
+    suspend fun setSecondsRemaining(value: Long) {
+        context.dataStore.edit { preferences ->
+            preferences[KEY_SECONDS_REMAINING] = value
+        }
+    }
+    /**
+     * Read timer state
+     */
+    suspend fun getTimerState(): Int = context.dataStore.data.map { preferences ->
+        preferences[KEY_TIMER_STATE] ?: 1
+    }.first()
+
+    /**
+     * Set timer state
+     */
+    suspend fun setTimerState(value: Int) {
+        context.dataStore.edit { preferences ->
+            preferences[KEY_TIMER_STATE] = value
+        }
+    }
+
+    /**
+     * Read timer length
+     */
+    suspend fun getTimerLength(): Int = context.dataStore.data.map { preferences ->
+        preferences[KEY_TIMER_LENGTH] ?: 1
+    }.first()
+
+    /**
+     * Set timer length
+     */
+    suspend fun setTimerLength(value: Int) {
+        context.dataStore.edit { preferences ->
+            preferences[KEY_TIMER_LENGTH] = value
+        }
+    }
 
     /**
-     * Get how many times the application was launched.
+     * Read timer previous length
      */
-    suspend fun getAppLaunchesCount() = context.dataStore.data.map { preferences ->
-        preferences[KEY_APP_LAUNCH_COUNT] ?: 0
+    suspend fun getPreviousTimerLengthSeconds(): Long = context.dataStore.data.map { preferences ->
+        preferences[KEY_TIMER_PREVIOUS_LENGTH] ?: 1
     }.first()
 
     /**
-     * Increase app launched counter.
+     * Set timer previous length
      */
-    suspend fun increaseAppLaunchesCount() {
+    suspend fun setPreviousTimerLengthSeconds(value: Long) {
         context.dataStore.edit { preferences ->
-            val appLaunchCount = preferences[KEY_APP_LAUNCH_COUNT] ?: 0
-            preferences[KEY_APP_LAUNCH_COUNT] = appLaunchCount + 1
+            preferences[KEY_TIMER_PREVIOUS_LENGTH] = value
         }
     }
 
@@ -117,7 +181,7 @@ class AppSettings(private val context: Context) {
     /**
      * Get seed
      */
-    suspend fun getSeed() = context.dataStore.data.map { preferences ->
+    private suspend fun getSeed() = context.dataStore.data.map { preferences ->
         preferences[KEY_SEED] ?: 1
     }.first()
 

app/src/main/java/com/shuffleus/app/data/GroupNames.kt

@@ -1,6 +1,5 @@
 package com.shuffleus.app.data
 
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 

app/src/main/java/com/shuffleus/app/data/Lecture.kt

@@ -0,0 +1,19 @@
+package com.shuffleus.app.data
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class Lecture(
+var day : Int,
+var startTime : Int,
+var endTime : Int,
+var subject : String,
+var lecturer : String,
+var lection : Boolean,
+var room : String,
+var code : String)
+{
+    @PrimaryKey(autoGenerate = true)
+    var lectureId: Long = 0
+}

app/src/main/java/com/shuffleus/app/data/User.kt

@@ -1,6 +1,5 @@
 package com.shuffleus.app.data
 
-import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 

app/src/main/java/com/shuffleus/app/data/UserGroup.kt

@@ -1,8 +0,0 @@
-package com.shuffleus.app.data
-
-import androidx.room.Entity
-
-@Entity(primaryKeys = ["groupId", "userId"])
-data class UserGroups(
-    val groupId: Long,
-    val userId: Long)

app/src/main/java/com/shuffleus/app/di/DatabaseModule.kt

@@ -4,6 +4,7 @@ package com.shuffleus.app.di
 import android.content.Context
 import com.shuffleus.app.repository.room.AppDatabase
 import com.shuffleus.app.repository.room.GroupNamesDao
+import com.shuffleus.app.repository.room.LectureDao
 import com.shuffleus.app.repository.room.UserDao
 
 import dagger.Module
@@ -28,6 +29,11 @@ class DatabaseModule {
         return appDatabase.userDao()
     }
 
+    @Provides
+    fun provideLectureDao(appDatabase: AppDatabase): LectureDao {
+        return appDatabase.lectureDao()
+    }
+
     @Provides
     fun provideGroupNamesDao(appDatabase: AppDatabase): GroupNamesDao {
         return appDatabase.groupNamesDao()

app/src/main/java/com/shuffleus/app/main/GroupsAdapter.kt

@@ -3,14 +3,13 @@ package com.shuffleus.app.main
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.shuffleus.app.R
 import com.shuffleus.app.data.RailsItem
 import com.shuffleus.app.utils.inflate
 
-class GroupsAdapter() : RecyclerView.Adapter<BaseRailsViewHolder<RailsItem>>(){
+class GroupsAdapter : RecyclerView.Adapter<BaseRailsViewHolder<RailsItem>>(){
 
     var groups:List<RailsItem> = emptyList()
         set(value) {
@@ -43,13 +42,11 @@ class RailsGroupNameViewHolder(view: View) :BaseRailsViewHolder<RailsItem.RailsG
     }
 }
 
-class RailsPeopleViewHolder(view: View) :BaseRailsViewHolder<RailsItem.RailsPeople>(view){
-    private val view = view
-
+class RailsPeopleViewHolder(private val view: View) :BaseRailsViewHolder<RailsItem.RailsPeople>(view){
     private val rvPeople by lazy { view.findViewById<RecyclerView>(R.id.rv_group)}
 
     override fun bind(item: RailsItem.RailsPeople) {
-        var adapter = UsersAdapter()
+        val adapter = UsersAdapter()
 
         rvPeople.adapter = adapter
         rvPeople.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)