Commits · 062c30304f7f6afe1891cac7e41432684a07e722 · Patrik Brosz / Sutralog

May 03, 2022
- Finish design¨ · 062c3030
  Michaela Greplova authored May 03, 2022
  
  062c3030
May 02, 2022
- 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
- Adding icons for toolbar menu · 104bac8c
  xbrosz authored Apr 28, 2022
  
  104bac8c
- Adding toolbar and restyling · a5f92efc
  xbrosz authored Apr 28, 2022
  
  a5f92efc
- Removing background color and adding styles for toolbar · bad60898
  xbrosz authored Apr 28, 2022
  
  bad60898
- Adding navigation fragments and actions · 1bbaef40
  xbrosz authored Apr 28, 2022
  
  1bbaef40
- Adding menu onclick listeners and navigateUp · 49b6c1a3
  xbrosz authored Apr 28, 2022
  
  49b6c1a3
Apr 27, 2022
- make project buildable · d88a783a
  Deutsch, Tomas authored Apr 27, 2022
  
  d88a783a
- improve rock detail layout · caea13fe
  Deutsch, Tomas authored Apr 27, 2022
```
add rock edit layout
add rock detail and edit fragment backend code
```
  caea13fe
Apr 13, 2022
- Merge branch 'rock_detail' into 'main' · fe77b2ce
  Tomáš Deutsch authored Apr 13, 2022
```
rock detail navrh

See merge request !6
```
  fe77b2ce
- Merge branch 'main' into 'rock_detail' · 714d2f90
  Tomáš Deutsch authored Apr 13, 2022
```
# Conflicts:
#   app/src/main/res/values/themes.xml
```
  714d2f90
- rock detail navrh · df446877
  Deutsch, Tomas authored Apr 13, 2022
  
  df446877
- Merge branch 'AddCategory' into 'main' · d535863e
  Michaela Greplová authored Apr 13, 2022
```
Add category and category list

See merge request !5
```
  d535863e
- Add category and category list · 93ab0ea7
  Michaela Greplová authored Apr 13, 2022
  
  93ab0ea7
Apr 12, 2022
- Merge branch 'ui_stuff' into 'main' · 43429983
  Tomáš Deutsch authored Apr 12, 2022
```
Ui stuff

See merge request !4
```
  43429983
- added high res pictures to test stuff · d295a1d7
  Deutsch, Tomas authored Apr 12, 2022
  
  d295a1d7
- added rock detail base · ca77096d
  Deutsch, Tomas authored Apr 12, 2022
  
  ca77096d
- removed dark theme, added app color pallete · 798b39df
  Deutsch, Tomas authored Apr 12, 2022
  
  798b39df
- Merge branch 'suter-list-Patrik-Brosz' into 'main' · 089bace3
  Patrik Brosz authored Apr 12, 2022
```
Creating main activity class

See merge request !3
```
  089bace3
- Creating main activity class · 33e83411
  xbrosz authored Apr 12, 2022
  
  33e83411
- Merge branch 'suter-list-Patrik-Brosz' into 'main' · 919bbd1b
  Patrik Brosz authored Apr 12, 2022
```
Suter list patrik brosz

See merge request !2
```
  919bbd1b
- Adding style to card · b6d739ae
  xbrosz authored Apr 12, 2022
  
  b6d739ae
- Adding card for rocks · 9734164c
  xbrosz authored Apr 12, 2022
  
  9734164c

Admin message