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

Thesis: Add Survey dialog #140

Merged
merged 10 commits into from
Nov 29, 2024
Merged

Thesis: Add Survey dialog #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ffac374
Created package for ui
FelberMartin Nov 22, 2024
162da18
Add basics for survey hint
FelberMartin Nov 22, 2024
f4a9947
Fix BetaHint display only for beta builds
FelberMartin Nov 22, 2024
18fde4c
Extract betaDialog and courseList
FelberMartin Nov 22, 2024
6834065
Implement SurveyHint
FelberMartin Nov 22, 2024
8e19f24
Use string res
FelberMartin Nov 22, 2024
f56c25b
Merge branch 'develop' into general/survey-dialog
FelberMartin Nov 22, 2024
954d534
Add real survey link + dates
FelberMartin Nov 29, 2024
008782a
Merge remote-tracking branch 'origin/develop' into general/survey-dialog
FelberMartin Nov 29, 2024
50e301e
Fixed merge issues
FelberMartin Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/de/tum/informatics/www1/artemis/native_app/android/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.cou
import de.tum.informatics.www1.artemis.native_app.feature.courseregistration.navigateToCourseRegistration
import de.tum.informatics.www1.artemis.native_app.feature.courseview.ui.course_overview.course
import de.tum.informatics.www1.artemis.native_app.feature.courseview.ui.course_overview.navigateToCourse
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.DashboardScreen
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.dashboard
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.navigateToDashboard
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.ui.DashboardScreen
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.ui.dashboard
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.ui.navigateToDashboard
import de.tum.informatics.www1.artemis.native_app.feature.exerciseview.ExerciseViewDestination
import de.tum.informatics.www1.artemis.native_app.feature.exerciseview.ExerciseViewMode
import de.tum.informatics.www1.artemis.native_app.feature.exerciseview.ExerciseViewUi
Expand Down
2 changes: 2 additions & 0 deletions ...tlin/de/tum/informatics/www1/artemis/native_app/feature/dashboard/DashboardScreenshots.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import de.tum.informatics.www1.artemis.native_app.core.ui.LocalCourseImageProvid
import de.tum.informatics.www1.artemis.native_app.core.ui.PlayStoreScreenshots
import de.tum.informatics.www1.artemis.native_app.core.ui.ScreenshotFrame
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.service.DashboardService
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.ui.CourseOverviewViewModel
import de.tum.informatics.www1.artemis.native_app.feature.dashboard.ui.CoursesOverview

private const val IMAGE_MARS = "mars"
private const val IMAGE_SATURN_5 = "saturn5"
Expand Down
Loading
Loading