DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							da5fc6229e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
					 | 
					
						2025-02-20 10:26:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ab9cb2ca23
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
					 | 
					
						2025-02-20 10:26:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							2710e4199a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/res/layout/fragment_main.xml 
						
						
					 | 
					
						2025-02-20 10:21:52 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							36004a2ba4
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
					 | 
					
						2025-02-20 10:18:09 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d36278951a
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
					 | 
					
						2025-02-20 10:17:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							f437e8a120
							
						
					 | 
					
						
						
							
							code: работает сохранение
						
						
						
						
						
						
					 | 
					
						2025-02-20 10:14:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf80c6b493
							
						
					 | 
					
						
						
							
							code: Работает список, не работает сохранение (завтра починую)
						
						
						
						
						
						
					 | 
					
						2025-02-20 09:52:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3589120509
							
						
					 | 
					
						
						
							
							code: Modification Scan result screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:57:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3935a7bb14
							
						
					 | 
					
						
						
							
							code: Modification Administrator screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:41:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2346b18af1
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:39:00 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c8ff5e2795
							
						
					 | 
					
						
						
							
							code: Modification Main screen, Recycler View
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:38:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdc7db4065
							
						
					 | 
					
						
						
							
							code: Modification Main screen, Recycler View
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:35:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef7c0e9b3f
							
						
					 | 
					
						
						
							
							code: Modification Main screen, Recycler View
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:33:31 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7fded8dc3c
							
						
					 | 
					
						
						
							
							code: Modification Main screen, Recycler View
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:30:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f9b56f2c4
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:20:30 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e0a4a28f2
							
						
					 | 
					
						
						
							
							code: Modification Administrator screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:14:24 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d1dd5d55d
							
						
					 | 
					
						
						
							
							code: Modification Login screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 18:08:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d6cde18fc4
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
						
						Added lines for layouts 
						
						
					 | 
					
						2025-02-19 18:06:38 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							44b5831302
							
						
					 | 
					
						
						
							
							code: Modification Administrator screen (x)
						
						
						
						
						
						
						
						Modification Scan result screen 
						
						
					 | 
					
						2025-02-19 16:56:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c7100359d
							
						
					 | 
					
						
						
							
							code: Added Administrator screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 16:50:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bad551e6f6
							
						
					 | 
					
						
						
							
							code: Modification Scan result screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 16:38:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3077f3f15e
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
					 | 
					
						2025-02-19 15:59:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f6299ff016
							
						
					 | 
					
						
						
							
							code: Modification Login screen
						
						
						
						
						
						
						
						Added Icon 
						
						
					 | 
					
						2025-02-19 15:58:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							606c515bfa
							
						
					 | 
					
						
						
							
							code: Делаю
						
						
						
						
						
						
					 | 
					
						2025-02-19 14:07:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbfc4d2558
							
						
					 | 
					
						
						
							
							code: Changed theme to No Action Bar
						
						
						
						
						
						
					 | 
					
						2025-02-19 14:05:10 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92c2753592
							
						
					 | 
					
						
						
							
							code: Сделан экран администратора XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 14:02:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							a62ba9da82
							
						
					 | 
					
						
						
							
							code: Делаю
						
						
						
						
						
						
					 | 
					
						2025-02-19 12:55:52 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a1827a4db3
							
						
					 | 
					
						
						
							
							code: Modification fragment Login XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 12:19:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a5851476d
							
						
					 | 
					
						
						
							
							code: Modification Recycler View XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 11:52:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3a71d24a93
							
						
					 | 
					
						
						
							
							code: Modification Recycler View XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 11:47:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cef57b7a6b
							
						
					 | 
					
						
						
							
							code: Modification Recycler View XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 11:38:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f69619beee
							
						
					 | 
					
						
						
							
							code: Сделан главный экрна в XML
						
						
						
						
						
						
						
						Сделан Recycler View XML 
						
						
					 | 
					
						2025-02-19 11:30:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							d27973528d
							
						
					 | 
					
						
						
							
							code: Сделал BasicAuthInterceptor авторизацию (наверное)
						
						
						
						
						
						
					 | 
					
						2025-02-19 11:07:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d46891456
							
						
					 | 
					
						
						
							
							code: Вроде как сделал 3 экран
						
						
						
						
						
						
					 | 
					
						2025-02-19 10:33:08 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							486320b688
							
						
					 | 
					
						
						
							
							code: Исправлена видимость error на экране входа в XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 10:11:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a25830c24
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/res/values/strings.xml 
						
						
					 | 
					
						2025-02-19 09:58:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea8dd6f869
							
						
					 | 
					
						
						
							
							code: Сделан экран входа в XML
						
						
						
						
						
						
					 | 
					
						2025-02-19 09:57:17 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d44a17c2c
							
						
					 | 
					
						
						
							
							Почти сделал
						
						
						
						
						
						
					 | 
					
						2025-02-18 20:36:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							21fbedfdf0
							
						
					 | 
					
						
						
							
							code: Сделан экран результата в XML
						
						
						
						
						
						
					 | 
					
						2025-02-18 19:46:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9d89f1417d
							
						
					 | 
					
						
						
							
							code: Сделан экран результата в XML
						
						
						
						
						
						
					 | 
					
						2025-02-18 19:46:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a66280925
							
						
					 | 
					
						
						
							
							Перенос
						
						
						
						
						
						
					 | 
					
						2025-02-18 18:23:46 +03:00 | 
					
					
						
						
							
							
							
						
					 |