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 |
|
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 |
|
|
|
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 |
|
