Commits · bbb50eb49795876c92599effd5e562cf2d8efcab · Patrik Brosz / Sutralog

May 21, 2022
- Add take photo · bbb50eb4
  Michaela Greplova authored May 21, 2022
  
  bbb50eb4
- Add photo from gallery · 09eac758
  Michaela Greplova authored May 21, 2022
  
  09eac758
May 10, 2022
- Merge remote-tracking branch 'origin/main' · 0329967f
  xbrosz authored May 10, 2022
  
  0329967f
- Changing textviews into single line · 7e09ef34
  xbrosz authored May 10, 2022
  
  7e09ef34
May 09, 2022
- bigger database mock · ae692689
  Deutsch, Tomas authored May 09, 2022
  
  ae692689
- add todo file · 77370c58
  Deutsch, Tomas authored May 09, 2022
  
  77370c58
- Fixing recycler height · fb2e829d
  xbrosz authored May 09, 2022
  
  fb2e829d
- Removing deleteCategory method · f9352962
  xbrosz authored May 09, 2022
  
  f9352962
- Merge branch 'main' of https://gitlab.fi.muni.cz/xbrosz/sutralog · 9fa054b5
  Deutsch, Tomas authored May 09, 2022
  
  9fa054b5
- improve app consistency · 655f5342
  Deutsch, Tomas authored May 09, 2022
  
  655f5342
- Add locality and where to cardview · 9835ec0e
  Michaela Greplova authored May 09, 2022
  
  9835ec0e
- Fix nullable item¨ · 94dd2ee3
  Michaela Greplova authored May 09, 2022
  
  94dd2ee3
- edit navigation merge · 2cac6a8c
  Deutsch, Tomas authored May 09, 2022
  
  2cac6a8c
- rock edit style improvement · fdc9732d
  Deutsch, Tomas authored May 09, 2022
  
  fdc9732d
- rock edit style improvement · dd321eed
  Deutsch, Tomas authored May 09, 2022
  
  dd321eed
- fixing mock db · c2f51349
  xbrosz authored May 09, 2022
  
  c2f51349
- Changing version of db · 1bc0ebb0
  xbrosz authored May 09, 2022
  
  1bc0ebb0
- Fixing navigation to rock edit/create · fc644d25
  xbrosz authored May 09, 2022
  
  fc644d25
- Adding arguments for adding category/rock · c28b899e
  xbrosz authored May 09, 2022
  
  c28b899e
- Adding navigation to edit category · 99ceee23
  xbrosz authored May 09, 2022
  
  99ceee23
- Setting toolbar title according to editing or creating new category · d00112de
  xbrosz authored May 09, 2022
  
  d00112de
- Adding insert and save category methods · dbfb5cab
  xbrosz authored May 09, 2022
  
  dbfb5cab
- Merge branch 'main' of https://gitlab.fi.muni.cz/xbrosz/sutralog into main · a402f574
  Michaela Greplova authored May 09, 2022
  
  a402f574
- Change layout to correspond to rock list · e27dcd3b
  Michaela Greplova authored May 09, 2022
  
  e27dcd3b
- Fixing app name in toolbar · 9b9a3f2b
  xbrosz authored May 09, 2022
  
  9b9a3f2b
- Assigning rock id to rock id in layout · 65aca540
  xbrosz authored May 09, 2022
  
  65aca540
- Merge branch 'main' of https://gitlab.fi.muni.cz/xbrosz/sutralog · 5b424b68
  Deutsch, Tomas authored May 09, 2022
  
  5b424b68
- spinner color fix · e0df1113
  Deutsch, Tomas authored May 09, 2022
  
  e0df1113
- Merge branch 'CreateAndEditCategory' into 'main' · d26ff21e
  Michaela Greplová authored May 09, 2022
```
Create and edit category

See merge request !14
```
  d26ff21e
- Merge branch 'main' into 'CreateAndEditCategory' · d3391d08
  Michaela Greplová authored May 09, 2022
```
# Conflicts:
#   app/src/main/java/cz/muni/sutralog/ui/list/CategoryListFragment.kt
#   app/src/main/java/cz/muni/sutralog/ui/list/RockListFragment.kt
```
  d3391d08
- fragments · 8789d721
  Michaela Greplova authored May 09, 2022
  
  8789d721
- fix rock edittext and delete colors vol 2 · 0992f0dd
  Deutsch, Tomas authored May 09, 2022
  
  0992f0dd
- Adding remove category implementation · dc831ba5
  xbrosz authored May 09, 2022
  
  dc831ba5
- Refactoring · 693bdba0
  xbrosz authored May 09, 2022
  
  693bdba0
- Adding foreign key and cascade deleting · 9d7fd158
  xbrosz authored May 09, 2022
  
  9d7fd158
- Merge branch 'main' of https://gitlab.fi.muni.cz/xbrosz/sutralog · 4999726a
  Deutsch, Tomas authored May 09, 2022
  
  4999726a
- fix rock edittext and delete colors · 4c9b1486
  Deutsch, Tomas authored May 09, 2022
  
  4c9b1486
- Adding bottom sheet dialog on category card long press · eeb587c0
  xbrosz authored May 09, 2022
  
  eeb587c0
- Refactoring and optimizing loading, filtering and sorting rocks · df455a37
  xbrosz authored May 09, 2022
  
  df455a37
- commit not complete · e41ffecd
  Michaela Greplova authored May 09, 2022
  
  e41ffecd