Commits · bbc10f64887c2759355461d00e8b2173e2e9ca70 · Patrik Brosz / Sutralog

May 03, 2022
- Resolving conflict with card id · bbc10f64
  xbrosz authored May 03, 2022
  
  bbc10f64
- Adding random color for UI testing · 332de3f7
  xbrosz authored May 03, 2022
  
  332de3f7
- Merge branch 'main' into navigation_args · 6f1c35e8
  xbrosz authored May 03, 2022
```
# Conflicts:
#	app/src/main/res/layout/rock_item_list.xml
#	app/src/main/res/values/themes.xml
```
  6f1c35e8
- Merge branch 'finishedDesign' into 'main' · 95335019
  Michaela Greplová authored May 03, 2022
```
Finish design

See merge request !10
```
  95335019
- Finish design¨ · 062c3030
  Michaela Greplova authored May 03, 2022
  
  062c3030
- removing stroke from RockCard · b8b16ef2
  xbrosz authored May 03, 2022
  
  b8b16ef2
- adding background card · 0a4f69c8
  xbrosz authored May 03, 2022
  
  0a4f69c8
- creating animations for bottom sheet dialog (slide in/out) · b66b44c1
  xbrosz authored May 03, 2022
  
  b66b44c1
- creating background shape for bottom sheet dialog · e392331f
  xbrosz authored May 03, 2022
  
  e392331f
- creating layout for bottom sheet options used in RockListFragment · 61b32d52
  xbrosz authored May 03, 2022
  
  61b32d52
- Creating bottom sheet for filter options · 0705cdfe
  xbrosz authored May 03, 2022
  
  0705cdfe
- Adding background color, DialogAnimation and DatePicker style · c01d92fd
  xbrosz authored May 03, 2022
  
  c01d92fd
- Adding onItemLongClick and card background color parsing · 9305cad0
  xbrosz authored May 03, 2022
  
  9305cad0
- Adding onItemLongClick into RockAdapter · 4f299485
  xbrosz authored May 03, 2022
  
  4f299485
- Adding livedata rocks, bottom sheet filter, card onItemLongClick listener + bottom sheet, · c9d55628
  xbrosz authored May 03, 2022
  
  c9d55628
- Getting rock from args · da36d523
  xbrosz authored May 03, 2022
  
  da36d523
- Adding livedata rock and toolbar remove icon listener into RockDetailFragment · 759dd5d9
  xbrosz authored May 03, 2022
  
  759dd5d9
- Adding new actions and argument into nav_graph · 1bb623eb
  xbrosz authored May 03, 2022
  
  1bb623eb
- Adding livedata categories into CategoryListFragment · 45abf5f4
  xbrosz authored May 03, 2022
  
  45abf5f4
- Adding LiveData return type to dao and repository · ee7bd135
  xbrosz authored May 03, 2022
  
  ee7bd135
May 02, 2022
- Merge branch 'main' of https://gitlab.fi.muni.cz/xbrosz/sutralog · 14116470
  Deutsch, Tomas authored May 02, 2022
  
  14116470
- add database and mock some data in main activity · c45f65a7
  Deutsch, Tomas authored May 02, 2022
  
  c45f65a7
- Update category design · 94911174
  Michaela Greplova authored May 02, 2022
  
  94911174
- Change button color · 1d09abac
  Michaela Greplova authored May 02, 2022
  
  1d09abac
- Merge branch 'rockDetailNewDesign' into 'main' · 7477da16
  Michaela Greplová authored May 02, 2022
```
New rock detail design

See merge request !9
```
  7477da16
- Merge branch 'main' into 'rockDetailNewDesign' · 8ccfdbcd
  Michaela Greplová authored May 02, 2022
```
# Conflicts:
#   app/src/main/res/layout/rock_detail.xml
```
  8ccfdbcd
- New design · 213ed8d4
  Michaela Greplova authored May 02, 2022
  
  213ed8d4
- change detail buttons · 40a0c607
  Deutsch, Tomas authored May 02, 2022
  
  40a0c607
- change colors · 9a16285f
  Deutsch, Tomas authored May 02, 2022
  
  9a16285f
- Merge branch 'database' into 'main' · 0bb020ee
  Michaela Greplová authored May 02, 2022
```
Add database files

See merge request !8
```
  0bb020ee
- Merge branch 'navigation' into 'main' · 77af70e5
  Tomáš Deutsch authored May 02, 2022
```
Navigation

See merge request !7
```
  77af70e5
- Add database files · b8c96072
  Michaela Greplova authored May 02, 2022
  
  b8c96072
Apr 30, 2022
- Removing remove button from toolbar in edit rock view · e360a9bc
  xbrosz authored Apr 30, 2022
  
  e360a9bc
- Changing toolbar color · 42004b26
  xbrosz authored Apr 30, 2022
  
  42004b26
Apr 28, 2022
- Removing unnecessary code for toolbar finding · f3d59ebc
  xbrosz authored Apr 28, 2022
  
  f3d59ebc
- Restyling rock and category item list · 2f1352f2
  xbrosz authored Apr 28, 2022
  
  2f1352f2
- Uncommenting card onClickListener · 5b8ebf77
  xbrosz authored Apr 28, 2022
  
  5b8ebf77
- Implementing search view for rock list · 7f7492be
  xbrosz authored Apr 28, 2022
  
  7f7492be
- Implementing search view for category list · 6b053378
  xbrosz authored Apr 28, 2022
  
  6b053378
- Adding menus for toolbars · 3d92ac97
  xbrosz authored Apr 28, 2022
  
  3d92ac97