| 
								
								
									 brreynie | 43838f5d6d | Merge commit ' 629137249e' | 2023-05-16 00:44:33 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 629137249e | test fixes | 2023-05-16 00:41:24 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | d9dd3bbb0a | Merge remote-tracking branch 'origin/uitesting' into uitesting | 2023-05-15 23:50:31 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 21c42cb693 | Update FireBaseSubjectDAO.kt | 2023-05-15 23:45:12 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 9bae6dbd23 | Update FireBaseSubjectDAO.kt | 2023-05-15 23:36:44 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | ba7559a142 | import statement vergeten | 2023-05-15 23:34:24 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 4244770f95 | Merge remote-tracking branch 'origin/development' into uitesting | 2023-05-15 23:30:07 +02:00 |  | 
				
					
						|  | 0bf15a1647 | Fixes SelectedProfileState | 2023-05-15 23:29:01 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 0a55771ece | all tests fixed | 2023-05-15 23:28:44 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 9bc210c3d0 | resolve conflicts | 2023-05-15 23:07:40 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 31e78856c0 | normal test fails | 2023-05-15 22:52:44 +02:00 |  | 
				
					
						|  | a814bd74d7 | QOL improvements & friendsSessionsDAOstuff | 2023-05-15 22:40:36 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 1f8e2d1fe3 | #67 create task from fab | 2023-05-15 22:23:14 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 860fb5fac1 | ui tests | 2023-05-15 21:53:04 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 924e136153 | resolve merge conflicts | 2023-05-15 21:47:28 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 61f6e2ac25 | solve merge issues | 2023-05-15 21:43:02 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 5ddd92a66f | 'merge' dots | 2023-05-15 20:58:37 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 654abb7690 | Merge branch 'development' into better_screens | 2023-05-15 20:55:20 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 9ea4f73187 | i18n improvement | 2023-05-15 20:54:47 +02:00 |  | 
				
					
						| 
								
								
									 brreynie | 53993bb2f0 | Merge branch 'development' into bugfixes | 2023-05-15 20:36:17 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 6554a92f83 | remove imports sessionroute | 2023-05-15 19:22:46 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 0487347c8f | cleanup sessionroute | 2023-05-15 19:18:47 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 9573a2eb5c | changed location of sessionscreens | 2023-05-15 19:09:14 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 346b24aabe | give soundplayer to visitor | 2023-05-15 19:05:43 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 53bdf7d215 | added callMediaPlayer call | 2023-05-15 19:02:55 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 8294d63e92 | added callmedia to session screen | 2023-05-15 19:02:23 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 4749108992 | soundplayer to screens instead of mediaplayer | 2023-05-15 19:01:06 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 1db5a4160e | refactor soundplayer location | 2023-05-15 19:00:36 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 4a04a703db | soundplayer wrapper to make mediaplayer easier to work with | 2023-05-15 18:58:46 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 4519bf2e30 | added soundplayer | 2023-05-15 18:57:24 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 4466f3646f | #118 gebruik nieuwe visitor om sessionScreen te instantieren | 2023-05-15 16:34:19 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 052ebb8c32 | #118 new visitor for session screen | 2023-05-15 16:31:36 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | b614f7d530 | Dots now returns an int | 2023-05-15 16:30:13 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 74526bc984 | proto error | 2023-05-15 15:58:59 +02:00 |  | 
				
					
						| 
								
								
									 Rune Dyselinck | 522ecae87a | fist test | 2023-05-15 15:11:50 +02:00 |  | 
				
					
						|  | 10c86c9bf0 | Add resources | 2023-05-15 14:16:30 +02:00 |  | 
				
					
						|  | 70f1be9b22 | Add friends button to home screen | 2023-05-15 14:16:11 +02:00 |  | 
				
					
						|  | b7ffc7d802 | Add searchfield composable | 2023-05-15 14:15:36 +02:00 |  | 
				
					
						|  | f03a06b245 | Update navigation | 2023-05-15 14:15:10 +02:00 |  | 
				
					
						|  | 74a6f77261 | Add friends search screen | 2023-05-15 14:14:49 +02:00 |  | 
				
					
						|  | 7c95e78b2a | More with UserDAO | 2023-05-15 14:14:26 +02:00 |  | 
				
					
						|  | 566102d5d4 | More with friendship | 2023-05-15 14:13:13 +02:00 |  | 
				
					
						|  | a6a5fb5e95 | Add public profile | 2023-05-15 14:11:55 +02:00 |  | 
				
					
						|  | bc7753fce5 | Move friends overview to new package and new stuff | 2023-05-15 14:11:28 +02:00 |  | 
				
					
						|  | 71b9550bd0 | Move profile edit screen to new package | 2023-05-15 14:08:54 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 492775565c | #118 integrated dots in composition | 2023-05-15 13:23:32 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 634328cd2a | merge development | 2023-05-15 13:13:59 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | fdd0429e32 | TimerComposable als apparte file | 2023-05-15 12:54:37 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 5073e5cb22 | #118 subclass of AbstractSessionScreen -> this file | 2023-05-15 12:54:07 +02:00 |  | 
				
					
						| 
								
								
									 lbarraga | 6938b3e868 | #118 AbstractSessionScreen -> this file | 2023-05-15 12:52:57 +02:00 |  |