| 
						
					 | 
					
						
						
						
						
							
						
						
							70bcbe6892
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				Merge core/template-android-project to this repo / merge-if-needed (push) Has been cancelled 
				
			 
		
		
	 
 
	 
						
						
							
 0.0.1
 0.0.11
						
					 | 
					
						2025-02-20 16:56:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							58c4411844
							
						
					 | 
					
						
						
							
							code: Modification Recycler View
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:39:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							879926b569
							
						
					 | 
					
						
						
							
							code: Modification Login screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:31:14 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b72ae0bf2e
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:29:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							84720023d8
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:17:52 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							72bc847570
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:10:18 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							efd651bd6d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:08:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31cc087e52
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 16:08:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c706ed505
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:56:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							42355b8e22
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:53:13 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0770e8d9ec
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:45:32 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							363d3bd7c0
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:45:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f94e5a26ef
							
						
					 | 
					
						
						
							
							code: Modification Main screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:43:05 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e1240177b
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:38:49 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2101453caf
							
						
					 | 
					
						
						
							
							code: Modification Scan Result screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:33:58 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							130e67dfb7
							
						
					 | 
					
						
						
							
							code: Modification Scan Result screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:32:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							0bb77d3104
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:28:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e3accb2caf
							
						
					 | 
					
						
						
							
							code: Modification for Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:21:59 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							998ac8dec2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:21:38 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a2651bff0
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:21:16 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d80f8aa57f
							
						
					 | 
					
						
						
							
							code: Modification Login Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:20:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cd9f2173d7
							
						
					 | 
					
						
						
							
							code: Modification Main Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:17:34 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							281491f880
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/res/layout/fragment_main.xml 
						
						
							
						
					 | 
					
						2025-02-20 15:14:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddd7dd1d18
							
						
					 | 
					
						
						
							
							code: Modification Main Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:13:55 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							600f21498c
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:09:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							133d01ff7e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:06:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							65ad9a73ec
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:05:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							230546da9c
							
						
					 | 
					
						
						
							
							code: Modification Scan result Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:01:57 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d62f621b6
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 15:00:06 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff6901a00d
							
						
					 | 
					
						
						
							
							code: Modification Login Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:58:03 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7b18f9db3a
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:57:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbef42dc05
							
						
					 | 
					
						
						
							
							code: Modification Main Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:57:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a36ef4812a
							
						
					 | 
					
						
						
							
							code: Modification Login Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:49:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e7da703af
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:46:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ba5c22ffb
							
						
					 | 
					
						
						
							
							code: Modification Login Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:38:56 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d6c6fbe96
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:26:54 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							add9651561
							
						
					 | 
					
						
						
							
							code: Сделал api админа и его VM (вроде как)
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:26:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1010fa32b3
							
						
					 | 
					
						
						
							
							code: Modification for Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:26:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a8d56e56d
							
						
					 | 
					
						
						
							
							code: Modification for Login Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:18:48 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e71db2e013
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:14:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2102fba304
							
						
					 | 
					
						
						
							
							code: Modification Admin Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:12:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dcfec695d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/res/layout/fragment_admin.xml 
						
						
							
						
					 | 
					
						2025-02-20 14:12:27 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2dab5d5449
							
						
					 | 
					
						
						
							
							code: Modification Login Screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 14:12:26 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							9372266f4f
							
						
					 | 
					
						
						
							
							code: Сделал api админа
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 12:54:44 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							02ba28cf5e
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 12:15:12 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e3fde6347
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/res/layout/fragment_admin.xml 
						
						
							
						
					 | 
					
						2025-02-20 12:12:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c16fe170c
							
						
					 | 
					
						
						
							
							code: Modification Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 12:11:46 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3da7fc0075
							
						
					 | 
					
						
						
							
							code: Modification Login screen, Admin screen
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 12:04:29 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DKaverznev
							
						 
					 | 
					
						
						
						
						
							
						
						
							310976e7d4
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/main'
						
						
						
						
						
						
						
						# Conflicts:
#	app/src/main/res/drawable/button_beigestroke_whitefill.xml
#	app/src/main/res/drawable/res_success.xml
#	app/src/main/res/layout/fragment_admin.xml
#	app/src/main/res/layout/fragment_main.xml
#	app/src/main/res/layout/fragment_scan_result.xml 
						
						
							
						
					 | 
					
						2025-02-20 11:50:25 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ba4a7a6f49
							
						
					 | 
					
						
						
							
							code: Modification icon
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-20 11:50:09 +03:00 | 
					
					
						
						
							
							
							
						
					 |