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 |
|
|
|
36fad4b09a
|
code: Modification Admin screen
|
2025-02-20 11:28:38 +03:00 |
|
|
|
4b56041a23
|
code: Modification Drawable Resource files
|
2025-02-20 11:12:11 +03:00 |
|
|
|
3ac24b61ca
|
code: Added Link to Figma in README.md
|
2025-02-20 11:07:55 +03:00 |
|
|
|
36df710912
|
code: Modification Colors
|
2025-02-20 10:55:32 +03:00 |
|
|
|
03d38640ab
|
code: Modification Main screen
|
2025-02-20 10:51:38 +03:00 |
|
|
|
fb0a2de183
|
code: Modification Admin screen
Modification Scan Result screen
|
2025-02-20 10:45:23 +03:00 |
|
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 |
|
