github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 10:54:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UI/Timetable] Show subject-based lesson colors. (#141)

Browse Source 
* [UI/Timetable] Add timetable config dialog and implement UI options.

* [UI/Timetable] Fix reloading timetable after changing config.

* [UI/Timetable] Fix calculating lesson range boundaries.

* [UI/Timetable] Add coloring subject names.
This commit is contained in:
Kuba Szczodrzyński 2022-10-16 12:47:54 +02:00 committed by GitHub
parent 55369eaa8b
commit e2fd714070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/pl/szczodrzynski/edziennik/config/ProfileConfigUI.kt
View File

@ -84,4 +84,9 @@ class ProfileConfigUI(private val config: ProfileConfig) {
var timetableTrimHourRange: Boolean
get() { mTimetableTrimHourRange = mTimetableTrimHourRange ?: config.values.get("timetableTrimHourRange", false); return mTimetableTrimHourRange ?: false }
set(value) { config.set("timetableTrimHourRange", value); mTimetableTrimHourRange = value }
private var mTimetableColorSubjectName: Boolean? = null
var timetableColorSubjectName: Boolean
get() { mTimetableColorSubjectName = mTimetableColorSubjectName ?: config.values.get("timetableColorSubjectName", false); return mTimetableColorSubjectName ?: false }
set(value) { config.set("timetableColorSubjectName", value); mTimetableColorSubjectName = value }
}

31
app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
View File

@ -4,6 +4,7 @@
package pl.szczodrzynski.edziennik.ui.timetable
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
@ -12,6 +13,7 @@ import android.widget.FrameLayout
import android.widget.LinearLayout
import android.widget.TextView
import androidx.asynclayoutinflater.view.AsyncLayoutInflater
import androidx.core.graphics.ColorUtils
import androidx.core.view.*
import com.linkedin.android.tachyon.DayView
import com.linkedin.android.tachyon.DayViewConfig
@ -33,6 +35,7 @@ import pl.szczodrzynski.edziennik.ext.*
import pl.szczodrzynski.edziennik.ui.base.lazypager.LazyFragment
import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment.Companion.DEFAULT_END_HOUR
import pl.szczodrzynski.edziennik.ui.timetable.TimetableFragment.Companion.DEFAULT_START_HOUR
import pl.szczodrzynski.edziennik.utils.Colors
import pl.szczodrzynski.edziennik.utils.managers.NoteManager
import pl.szczodrzynski.edziennik.utils.models.Date
import pl.szczodrzynski.edziennik.utils.models.Time
@ -309,13 +312,36 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
lesson.classroom?.let { add(it) }
}.concat(arrowRight)
lb.annotationVisible = manager.getAnnotation(activity, lesson, lb.annotation)
lb.lessonNumber = lesson.displayLessonNumber
val lessonText =
lesson.getNoteSubstituteText(showNotes = true) ?: lesson.displaySubjectName
val (subjectTextPrimary, subjectTextSecondary) = if (profileConfig.timetableColorSubjectName) {
val subjectColor = Colors.stringToMaterialColorCRC(lessonText?.toString() ?: "")
if (lb.annotationVisible) {
lb.subjectContainer.background = ColorDrawable(subjectColor)
} else {
lb.subjectContainer.setBackgroundResource(R.drawable.timetable_subject_color_rounded)
lb.subjectContainer.background.setTintColor(subjectColor)
}
when (ColorUtils.calculateLuminance(subjectColor) > 0.5) {
true -> /* light */ 0xFF000000 to 0xFF666666
false -> /* dark */ 0xFFFFFFFF to 0xFFAAAAAA
}
} else {
lb.subjectContainer.background = null
null to colorSecondary
}
lb.lessonNumber = lesson.displayLessonNumber
if (subjectTextPrimary != null)
lb.lessonNumberText.setTextColor(subjectTextPrimary.toInt())
lb.subjectName.text = lessonText?.let {
if (lesson.type == Lesson.TYPE_CANCELLED || lesson.type == Lesson.TYPE_SHIFTED_SOURCE)
it.asStrikethroughSpannable().asColoredSpannable(colorSecondary)
it.asStrikethroughSpannable().asColoredSpannable(subjectTextSecondary.toInt())
else if (subjectTextPrimary != null)
it.asColoredSpannable(subjectTextPrimary.toInt())
else
it
}
@ -342,7 +368,6 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
}
//lb.subjectName.typeface = Typeface.create("sans-serif-light", Typeface.BOLD)
lb.annotationVisible = manager.getAnnotation(activity, lesson, lb.annotation)
val lessonNumberMargin =
if (lb.annotationVisible) (-8).dp
else 0

35
app/src/main/java/pl/szczodrzynski/edziennik/utils/Colors.java
View File

@ -15,6 +15,7 @@ import androidx.core.graphics.ColorUtils;
import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
import java.util.zip.CRC32;
import pl.szczodrzynski.edziennik.data.db.entity.Grade;
@ -84,6 +85,28 @@ public class Colors {
0xFF6D4C41
};
public static final int[] materialColorsBasic = {
0xFFE53935, 0xFFD81B60, 0xFF8E24AA, 0xFF5E35B1,
0xFF3949AB, 0xFF1E88E5, 0xFF039BE5, 0xFF00ACC1,
0xFF00897B, 0xFF43A047, 0xFF7CB342, 0xFFC0CA33,
0xFFFDD835, 0xFFFFB300, 0xFFFB8C00, 0xFFF4511E,
0xFF6D4C41, 0xFF757575, 0xFF546E7A, 0xFF00E676,
0xFFEF9A9A, 0xFFF48FB1, 0xFFCE93D8, 0xFFB39DDB,
0xFF9FA8DA, 0xFF90CAF9, 0xFF81D4FA, 0xFF80DEEA,
0xFF80CBC4, 0xFFA5D6A7, 0xFFC5E1A5, 0xFFE6EE9C,
0xFFFFF59D, 0xFFFFE082, 0xFFFFCC80, 0xFFFFAB91,
0xFFBCAAA4, 0xFFEEEEEE, 0xFFB0BEC5, 0xFFCCFF90,
};
public static final int[] metroColors = {
0xFF76FF03, 0xFF60A917, 0xFF00C853, 0xFF00ABA9,
0xFF1BA1E2, 0xFF0050EF, 0xFF6A00FF, 0xFFAA00FF,
0xFFF472D0, 0xFFD80073, 0xFFA20025, 0xFFE51400,
0xFFFA6800, 0xFFF0A30A, 0xFFE3C800, 0xFF795548,
0xFF6D8764, 0xFF647687, 0xFF76608A, 0xFFA0522D,
};
/**
* Used for teacher's images (e.g. in messages or announcements).
* @param s teacher's fullName
@ -115,6 +138,18 @@ public class Colors {
return materialColors[getRandomNumberInRange(0, materialColors.length-1, seed)];
}
public static int stringToMaterialColorCRC(String s) {
long seed;
try {
CRC32 crc = new CRC32();
crc.update(s.getBytes());
seed = crc.getValue();
} catch (Exception e) {
seed = 1234;
}
return metroColors[(int) (seed % metroColors.length)];
}
public static int gradeToColor(Grade grade)
{
if (grade.getType() == Grade.TYPE_POINT_SUM) {

8
app/src/main/res/layout/timetable_config_dialog.xml
View File

@ -44,6 +44,14 @@
android:minHeight="32dp"
android:text="@string/timetable_config_show_attendance" />
<com.google.android.material.checkbox.MaterialCheckBox
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:checked="@={config.timetableColorSubjectName}"
android:minHeight="32dp"
android:text="@string/timetable_config_color_subject_name" />
<com.google.android.material.checkbox.MaterialCheckBox
android:layout_width="match_parent"
android:layout_height="wrap_content"

5
app/src/main/res/layout/timetable_lesson.xml
View File

@ -45,14 +45,15 @@
tools:visibility="gone" />
<LinearLayout
android:id="@+id/subjectContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:baselineAligned="false"
android:orientation="horizontal"
android:paddingHorizontal="8dp"
android:paddingVertical="4dp">
<!--tools:background="@drawable/timetable_subject_color_rounded"-->
android:paddingVertical="4dp"
tools:background="@drawable/timetable_subject_color_rounded">
<com.mikepenz.iconics.view.IconicsTextView
android:id="@+id/subjectName"

1
app/src/main/res/values/strings.xml
View File

@ -1540,5 +1540,6 @@
<string name="menu_timetable_config">Ustawienia planu lekcji</string>
<string name="timetable_config_show_events">Pokazuj wydarzenia przy lekcjach</string>
<string name="timetable_config_show_attendance">Pokazuj rodzaj obecności na lekcji</string>
<string name="timetable_config_color_subject_name">Koloruj nazwę przedmiotu</string>
<string name="timetable_config_trim_hour_range">Nie pokazuj godzin bez lekcji</string>
</resources>