Milestone 2

Author: linuxct

app/build.gradle

@@ -40,7 +40,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.preference:preference:1.1.0-rc01'
+    implementation 'androidx.preference:preference:1.1.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -53,4 +53,6 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:2.8.1"
     implementation "com.squareup.retrofit2:converter-gson:2.8.1"
     implementation 'com.google.code.gson:gson:2.8.6'
+
+    implementation 'com.github.prolificinteractive:material-calendarview:2.0.1'
 }

app/src/main/AndroidManifest.xml

@@ -13,18 +13,20 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".Views.Settings"></activity>
-        <activity
-            android:name=".Views.SettingsActivity"
-            android:label="@string/title_activity_settings" />
         <activity
             android:name=".Views.WelcomeActivity"
             tools:ignore="InnerclassSeparator" />
+        <activity
+            android:name=".Views.ReadActivity"
+            tools:ignore="InnerclassSeparator" />
         <activity
             android:name=".Views.CongratulationsActivity"
             tools:ignore="InnerclassSeparator" />
         <activity
-            android:name=".Views.ReadActivity"
+            android:name=".Views.ProfileActivity"
+            tools:ignore="InnerclassSeparator" />
+        <activity
+            android:name=".Views.SettingsActivity"
             tools:ignore="InnerclassSeparator" />
         <activity
             android:name=".Views.MainActivity"
@@ -33,7 +35,6 @@
             tools:ignore="InnerclassSeparator,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/it/androidclient/Line/LineAdapter.kt

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView
 import it.androidclient.R
 import it.androidclient.UserCtx.AchievementsModel
 import it.androidclient.UserCtx.UserDataDto
+import it.androidclient.Views.ProfileActivity
 import it.androidclient.Views.ReadActivity
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
@@ -40,6 +41,7 @@ class LineAdapter(model: ArrayList<LineModel>?) : RecyclerView.Adapter<LineHolde
             3 -> R.color.applicationList4
             4 -> R.color.applicationList5
             5 -> R.color.applicationList6
+            6 -> R.color.applicationList7
             else -> R.color.applicationList1
         }
 
@@ -57,7 +59,8 @@ class LineAdapter(model: ArrayList<LineModel>?) : RecyclerView.Adapter<LineHolde
             3 -> concentrationListener
             4 -> praxiasListener
             5 -> perceptionListener
-            else -> readListener
+            6 -> profileListener
+            else -> profileListener
         }
         holder.itemView.setBackgroundColor(ContextCompat.getColor(holder.itemView.context.applicationContext, color))
         holder.itemView.setOnClickListener(listener)
@@ -195,6 +198,13 @@ class LineAdapter(model: ArrayList<LineModel>?) : RecyclerView.Adapter<LineHolde
             notifyDataSetChanged()
         }
 
+    private val profileListener =
+        View.OnClickListener { v ->
+            val intent = Intent(v.context.applicationContext, ProfileActivity::class.java)
+            intent.flags += Intent.FLAG_ACTIVITY_NEW_TASK
+            v.context.applicationContext.startActivity(intent)
+        }
+
     //endregion
 
     init {

app/src/main/java/it/androidclient/UserCtx/Preferences.kt

@@ -10,20 +10,6 @@ import java.time.LocalDateTime
 import java.time.ZonedDateTime
 import kotlin.reflect.KProperty
 
-
-/**
- * Represents a single [SharedPreferences] file.
- *
- * Usage:
- *
- * ```kotlin
- * class UserPreferences(ctx: Context) : Preferences(ctx) {
- *   var emailAccount by stringPref()
- *   var showSystemAppsPreference by booleanPref()
- * }
- * ```
- */
-
 @Suppress("UNCHECKED_CAST", "unused")
 abstract class Preferences(private var context: Context, private val name: String? = null) {
     private val prefs: SharedPreferences by lazy {

app/src/main/java/it/androidclient/Util/AchievementCounterHelper.kt

@@ -0,0 +1,68 @@
+package it.androidclient.Util
+
+import it.androidclient.UserCtx.AchievementsModel
+import it.androidclient.UserCtx.UserDataDto
+import java.time.LocalDateTime
+import java.time.temporal.ChronoUnit
+
+class AchievementCounterHelper {
+    fun countTodaysAchievements(userDataDto: UserDataDto, localDate: LocalDateTime): Int{
+        val userAchievements = safeStuff(userDataDto, localDate)
+        var count = 0
+        AchievementsModel.DailyMilestonesAchieved (
+            achievedAbstractThinking = userAchievements.achievedAbstractThinking.also { achievedAbstractThinking->
+                if (achievedAbstractThinking){
+                    count += 1
+                }
+            },
+            achievedConcentration = userAchievements.achievedConcentration.also { achievedConcentration ->
+                if (achievedConcentration){
+                    count += 1
+                }
+            },
+            achievedLanguage = userAchievements.achievedLanguage.also { achievedLanguage ->
+                if (achievedLanguage){
+                    count += 1
+                }
+            },
+            achievedPraxias = userAchievements.achievedPraxias.also { achievedPraxias ->
+                if (achievedPraxias){
+                    count += 1
+                }
+            },
+            achievedReading = userAchievements.achievedReading.also { achievedReading ->
+                if (achievedReading){
+                    count += 1
+                }
+            },
+            achievedSensorial = userAchievements.achievedSensorial.also { achievedSensorial ->
+                if (achievedSensorial){
+                    count += 1
+                }
+            }
+        )
+
+        return count
+    }
+
+    private fun safeStuff(userDataDto: UserDataDto, parsedDate: LocalDateTime): AchievementsModel.DailyMilestonesAchieved {
+        if (userDataDto.userAchievements == null){
+            userDataDto.userAchievements = AchievementsModel.UserCalendarModel(hashMapOf())
+        }
+
+        val currentAchievements = userDataDto.userAchievements as AchievementsModel.UserCalendarModel
+        if (currentAchievements.achievementList[parsedDate] == null) {
+            currentAchievements.achievementList[parsedDate] =
+                AchievementsModel.DailyMilestonesAchieved(
+                    achievedReading = false,
+                    achievedLanguage = false,
+                    achievedAbstractThinking = false,
+                    achievedConcentration = false,
+                    achievedPraxias = false,
+                    achievedSensorial = false
+                )
+        }
+        return currentAchievements.achievementList[parsedDate.truncatedTo(ChronoUnit.DAYS)] as AchievementsModel.DailyMilestonesAchieved
+    }
+
+}

app/src/main/java/it/androidclient/Util/DateHas0ActivityDecorator.kt

@@ -0,0 +1,33 @@
+package it.androidclient.Util
+
+
+import android.app.Activity
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import com.prolificinteractive.materialcalendarview.CalendarDay
+import com.prolificinteractive.materialcalendarview.DayViewDecorator
+import com.prolificinteractive.materialcalendarview.DayViewFacade
+import it.androidclient.R
+import it.androidclient.UserCtx.UserDataDto
+import java.time.LocalDateTime
+
+class DateHas0ActivityDecorator(context: Activity?, private val achievementCounterHelper: AchievementCounterHelper) : DayViewDecorator {
+    private val drawable: Drawable?
+    private val ctx = context as Activity
+    override fun shouldDecorate(day: CalendarDay): Boolean {
+        val userDataDto = UserDataDto(ctx.applicationContext)
+        val localDate = LocalDateTime.of(day.year, day.month, day.day, 0, 0, 0)
+        val count: Int = achievementCounterHelper.countTodaysAchievements(userDataDto, localDate)
+
+        return count == 0
+    }
+
+    override fun decorate(view: DayViewFacade) {
+        view.setSelectionDrawable(drawable!!)
+    }
+
+    init {
+        // You can set background for Decorator via drawable here
+        drawable = ContextCompat.getDrawable(context!!, R.drawable.day_decorator_0)
+    }
+}

app/src/main/java/it/androidclient/Util/DateHas1ActivityDecorator.kt

@@ -0,0 +1,33 @@
+package it.androidclient.Util
+
+
+import android.app.Activity
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import com.prolificinteractive.materialcalendarview.CalendarDay
+import com.prolificinteractive.materialcalendarview.DayViewDecorator
+import com.prolificinteractive.materialcalendarview.DayViewFacade
+import it.androidclient.R
+import it.androidclient.UserCtx.UserDataDto
+import java.time.LocalDateTime
+
+class DateHas1ActivityDecorator(context: Activity?, private val achievementCounterHelper: AchievementCounterHelper) : DayViewDecorator {
+    private val drawable: Drawable?
+    private val ctx = context as Activity
+    override fun shouldDecorate(day: CalendarDay): Boolean {
+        val userDataDto = UserDataDto(ctx.applicationContext)
+        val localDate = LocalDateTime.of(day.year, day.month, day.day, 0, 0, 0)
+        val count: Int = achievementCounterHelper.countTodaysAchievements(userDataDto, localDate)
+
+        return count == 1
+    }
+
+    override fun decorate(view: DayViewFacade) {
+        view.setSelectionDrawable(drawable!!)
+    }
+
+    init {
+        // You can set background for Decorator via drawable here
+        drawable = ContextCompat.getDrawable(context!!, R.drawable.day_decorator_1)
+    }
+}

app/src/main/java/it/androidclient/Util/DateHas2ActivityDecorator.kt

@@ -0,0 +1,32 @@
+package it.androidclient.Util
+
+import android.app.Activity
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import com.prolificinteractive.materialcalendarview.CalendarDay
+import com.prolificinteractive.materialcalendarview.DayViewDecorator
+import com.prolificinteractive.materialcalendarview.DayViewFacade
+import it.androidclient.R
+import it.androidclient.UserCtx.UserDataDto
+import java.time.LocalDateTime
+
+class DateHas2ActivityDecorator(context: Activity?, private val achievementCounterHelper: AchievementCounterHelper) : DayViewDecorator {
+    private val drawable: Drawable?
+    private val ctx = context as Activity
+    override fun shouldDecorate(day: CalendarDay): Boolean {
+        val userDataDto = UserDataDto(ctx.applicationContext)
+        val localDate = LocalDateTime.of(day.year, day.month, day.day, 0, 0, 0)
+        val count: Int = achievementCounterHelper.countTodaysAchievements(userDataDto, localDate)
+
+        return count == 2
+    }
+
+    override fun decorate(view: DayViewFacade) {
+        view.setSelectionDrawable(drawable!!)
+    }
+
+    init {
+        // You can set background for Decorator via drawable here
+        drawable = ContextCompat.getDrawable(context!!, R.drawable.day_decorator_2)
+    }
+}

app/src/main/java/it/androidclient/Util/DateHas3ActivityDecorator.kt

@@ -0,0 +1,32 @@
+package it.androidclient.Util
+
+import android.app.Activity
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import com.prolificinteractive.materialcalendarview.CalendarDay
+import com.prolificinteractive.materialcalendarview.DayViewDecorator
+import com.prolificinteractive.materialcalendarview.DayViewFacade
+import it.androidclient.R
+import it.androidclient.UserCtx.UserDataDto
+import java.time.LocalDateTime
+
+class DateHas3ActivityDecorator(context: Activity?, private val achievementCounterHelper: AchievementCounterHelper) : DayViewDecorator {
+    private val drawable: Drawable?
+    private val ctx = context as Activity
+    override fun shouldDecorate(day: CalendarDay): Boolean {
+        val userDataDto = UserDataDto(ctx.applicationContext)
+        val localDate = LocalDateTime.of(day.year, day.month, day.day, 0, 0, 0)
+        val count: Int = achievementCounterHelper.countTodaysAchievements(userDataDto, localDate)
+
+        return count == 3
+    }
+
+    override fun decorate(view: DayViewFacade) {
+        view.setSelectionDrawable(drawable!!)
+    }
+
+    init {
+        // You can set background for Decorator via drawable here
+        drawable = ContextCompat.getDrawable(context!!, R.drawable.day_decorator_3)
+    }
+}

app/src/main/java/it/androidclient/Util/DateHas4ActivityDecorator.kt

@@ -0,0 +1,32 @@
+package it.androidclient.Util
+
+import android.app.Activity
+import android.graphics.drawable.Drawable
+import androidx.core.content.ContextCompat
+import com.prolificinteractive.materialcalendarview.CalendarDay
+import com.prolificinteractive.materialcalendarview.DayViewDecorator
+import com.prolificinteractive.materialcalendarview.DayViewFacade
+import it.androidclient.R
+import it.androidclient.UserCtx.UserDataDto
+import java.time.LocalDateTime
+
+class DateHas4ActivityDecorator(context: Activity?, private val achievementCounterHelper: AchievementCounterHelper) : DayViewDecorator {
+    private val drawable: Drawable?
+    private val ctx = context as Activity
+    override fun shouldDecorate(day: CalendarDay): Boolean {
+        val userDataDto = UserDataDto(ctx.applicationContext)
+        val localDate = LocalDateTime.of(day.year, day.month, day.day, 0, 0, 0)
+        val count: Int = achievementCounterHelper.countTodaysAchievements(userDataDto, localDate)
+
+        return count == 4
+    }
+
+    override fun decorate(view: DayViewFacade) {
+        view.setSelectionDrawable(drawable!!)
+    }
+
+    init {
+        // You can set background for Decorator via drawable here
+        drawable = ContextCompat.getDrawable(context!!, R.drawable.day_decorator_4)
+    }
+}