Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#102 hide subjects from untis #361

Open
wants to merge 23 commits into
base: develop
Choose a base branch
from
Open

#102 hide subjects from untis #361

wants to merge 23 commits into from

Conversation

lm41
Copy link
Collaborator

@lm41 lm41 commented Feb 18, 2023

No description provided.

@lm41 lm41 marked this pull request as draft February 18, 2023 18:01
@lm41 lm41 requested a review from SapuSeven February 18, 2023 19:38
@lm41 lm41 marked this pull request as ready for review February 18, 2023 19:38
@lm41 lm41 linked an issue Feb 19, 2023 that may be closed by this pull request
[Feature Request] Hiding certain classes #102
Open
@lm41
move subject selection to timetable settings;
2703278 
do not close after selecting all;
implement own SubjectElementPickerPreference and SubjectsElementDialog
@lm41
Merge branch 'develop' into 102-hide-subjects-from-untis
20c6126 
# Conflicts:
#	app/src/main/java/com/sapuseven/untis/preferences/DataStorePreferences.kt
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/strings.xml
@lm41
added strings
2675b68
@lm41 lm41 self-assigned this Feb 20, 2023
@lm41 lm41 added enhancement New feature or request open for suggestions Some third party suggestions are needed labels Feb 20, 2023
This was linked to issues Feb 20, 2023
[Bug Report] App crash due to too many subjects at the same time #191
Closed
[Feature Request] Filter by Subjects #157
Closed
@lm41 lm41 mentioned this pull request Feb 20, 2023
Open
@lm41
Copy link
Collaborator Author

lm41 commented Feb 23, 2023

Todo: Do not automute in hidden lessons.

@lm41
Copy link
Collaborator Author

lm41 commented Mar 7, 2023

This should be ready now @SapuSeven

@lm41 lm41 changed the title #102 hide subjects from untis [ENH] #102 hide subjects from untis Mar 7, 2023
@lm41 lm41 added the waiting for review This needs to be reviewed label Mar 9, 2023
@SapuSeven SapuSeven added this to the v4.1.0 milestone Jun 5, 2023
@H4K0N42
Copy link

H4K0N42 commented Aug 18, 2023

The artifact link has expired, can you please create an new one?

This was referenced Sep 2, 2023
Closed
Closed
SapuSeven
SapuSeven requested changes Nov 4, 2023
View reviewed changes
Copy link
Owner

@SapuSeven SapuSeven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your work. I left some suggestions in the review comments - feel free to discuss.

For the future, it would be best to omit refactoring of code not relevant to the PR and submit a separate PR for these changes instead - this helps the code review process.
It's better to have multiple smaller PRs that address specific issues instead of one big one.

app/src/main/java/com/sapuseven/untis/activities/SettingsActivity.kt Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/main/Drawer.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/ui/dialogs/ElementPickerDialog.kt Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/ui/preferences/ElementPickerPreference.kt Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/workers/NotificationSetupWorker.kt Outdated Show resolved Hide resolved
app/src/main/res/drawable/all_checkbox_checked.xml Outdated Show resolved Hide resolved
app/src/main/res/drawable/all_checkbox_unchecked.xml Outdated Show resolved Hide resolved
app/build.gradle Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/MainActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/MainActivity.kt Outdated Show resolved Hide resolved
@lm41 lm41 removed the waiting for review This needs to be reviewed label Nov 4, 2023
@lm41
Copy link
Collaborator Author

lm41 commented Nov 4, 2023

Thanks for your review. I will look into the suggested changes soon™.

I have now learned to do smaller PRs, as I once had to review such "monsters" myself. I won't be doing anything like that in the future. :p

@SapuSeven SapuSeven mentioned this pull request Nov 4, 2023
Closed
@SapuSeven SapuSeven changed the title [ENH] #102 hide subjects from untis #102 hide subjects from untis Nov 7, 2023
@brckd
Copy link

brckd commented Nov 11, 2023

+1 this is exactly what i was looking for!
however, my school summarizes multiple courses with the same subject as one class, so i can't hide these redundant courses.
therefore, it would be nice if one could also hide individual lessons :>

@lm41
switch back to ksp
b15aab6
@lm41
optimize imports
ec71e7d
@lm41
Delete SubjectsElementPicker and add the functionality to the Element…
a52e02d 
…PickerDialog
@lm41
Merge remote-tracking branch 'origin/102-hide-subjects-from-untis' in…
54fa20b 
…to 102-hide-subjects-from-untis

# Conflicts:
#	app/src/main/java/com/sapuseven/untis/activities/SettingsActivity.kt
#	app/src/main/java/com/sapuseven/untis/data/databases/LegacyUserDatabase.kt
@lm41
Copy link
Collaborator Author

lm41 commented Nov 14, 2023 •
edited
Loading

I finally had the time to apply the suggestions :). If there is more to do, please let me know

@lm41 lm41 requested a review from SapuSeven November 14, 2023 22:58
SapuSeven
SapuSeven requested changes Nov 15, 2023
View reviewed changes
Copy link
Owner

@SapuSeven SapuSeven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some minor things.
About unifying the single/multiple stored timetable values - I'll work on that myself.

app/src/main/java/com/sapuseven/untis/ui/dialogs/ElementPickerDialog.kt Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/ui/dialogs/ElementPickerDialog.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/ui/dialogs/ElementPickerDialog.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/ui/preferences/ElementPickerPreference.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/workers/AutoMuteSetupWorker.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/SettingsActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/SettingsActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/MainActivity.kt Outdated Show resolved Hide resolved
app/src/main/java/com/sapuseven/untis/activities/MainActivity.kt Outdated Show resolved Hide resolved
SapuSeven

This comment was marked as duplicate.

Sign in to view

@SapuSeven
Copy link
Owner

Also I removed the search field.
There's just too much going on in a small dialog for it and you usually only use this setting once or twice.

@lm41
Copy link
Collaborator Author

lm41 commented Nov 15, 2023

Also I removed the search field.
There's just too much going on in a small dialog for it and you usually only use this setting once or twice.

Fair :)

@lm41
Copy link
Collaborator Author

lm41 commented Nov 22, 2023

@SapuSeven can you make sure that you resolve the merge conflicts here? You are more familiar with the WeekView compose

@lm41 lm41 requested a review from SapuSeven November 22, 2023 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SapuSeven SapuSeven Awaiting requested review from SapuSeven

Requested changes must be addressed to merge this pull request.

Assignees

@lm41 lm41

Labels
enhancement New feature or request open for suggestions Some third party suggestions are needed
Projects
None yet
Milestone
v4.1.0
4 participants
@lm41 @H4K0N42 @brckd @SapuSeven