Commits · 498c3e97bccaad56471a97d868d02079d1a9b9d4 · Patrik Brosz / Sutralog

May 08, 2022
- Create and edti category · 498c3e97
  Michaela Greplova authored May 08, 2022
  
  498c3e97
May 07, 2022
- Merge branch 'rock_filtering' into 'main' · e66a9a28
  Patrik Brosz authored May 07, 2022
```
Rock filtering

See merge request !13
```
  e66a9a28
- Removing second reset button from filter dialog · d346ed45
  xbrosz authored May 07, 2022
  
  d346ed45
- Fixing calendar, setting date from date filter + code reformatting · b993049f
  xbrosz authored May 07, 2022
  
  b993049f
- Adding reset button to filter dialog · 34da5330
  xbrosz authored May 07, 2022
  
  34da5330
- Setting new menu if all rocks are displayed and also · 6a9d28bb
  xbrosz authored May 07, 2022
  
  6a9d28bb
- Hiding add button by default · 4661b5a0
  xbrosz authored May 07, 2022
  
  4661b5a0
- Adding menu for RockListFragment when all rocks are displayed · ec01f06b
  xbrosz authored May 07, 2022
  
  ec01f06b
- Resolving another conflicts · d204060c
  xbrosz authored May 07, 2022
  
  d204060c
- Merge branch 'main' into rock_filtering · 4b227f22
  xbrosz authored May 07, 2022
```
# Conflicts:
#	app/src/main/java/cz/muni/sutralog/data/RockPresentableListItem.kt
#	app/src/main/java/cz/muni/sutralog/ui/list/RockListFragment.kt
```
  4b227f22
- Removing .idea file, commited it by mistake · 10d84a6c
  xbrosz authored May 07, 2022
  
  10d84a6c
- Changing categories toolbar menu · 9089efed
  xbrosz authored May 07, 2022
  
  9089efed
- Changing toolbar menu · bb04ba52
  xbrosz authored May 07, 2022
  
  bb04ba52
- Changing toolbar menu in RockListFragment · 4b8cfcf7
  xbrosz authored May 07, 2022
  
  4b8cfcf7
- Adding popup menu background in toolbar · 7918a52c
  xbrosz authored May 07, 2022
  
  7918a52c
- Creating spinner item layout · 90be2c74
  xbrosz authored May 07, 2022
  
  90be2c74
- Changing spinner layout to fix colors · e80a33cd
  xbrosz authored May 07, 2022
  
  e80a33cd
- Reformatting code · cc5857d0
  xbrosz authored May 07, 2022
  
  cc5857d0
- Adding new sort columns · 6e12b8d0
  xbrosz authored May 07, 2022
  
  6e12b8d0
- Renaming sort_dialog to sort_bs_dialog · 65ae439e
  xbrosz authored May 07, 2022
  
  65ae439e
- Renaming bottom_sheet_filter to filter_bs_dialog · 7f4356a8
  xbrosz authored May 07, 2022
  
  7f4356a8
- Move filter columns from RockFilter to RockPresentableListItem and refactoring RockFilter · 2665ccc4
  xbrosz authored May 07, 2022
  
  2665ccc4
- Adding new column to FilterColumns · c0edc765
  xbrosz authored May 07, 2022
  
  c0edc765
May 06, 2022
- add dialog when deleting rock · 03dd22f8
  Deutsch, Tomas authored May 06, 2022
  
  03dd22f8
- add rock creation · 6f9d4b2e
  Deutsch, Tomas authored May 06, 2022
  
  6f9d4b2e
- Merge branch 'main' into rock_filtering · a2f42f24
  xbrosz authored May 06, 2022
```
# Conflicts:
#	app/src/main/java/cz/muni/sutralog/MainActivity.kt
```
  a2f42f24
- Removing chip group implementation and adding radio group implementation · 5ca45b88
  xbrosz authored May 06, 2022
  
  5ca45b88
- Creating RockSorter class for sorting list of rocks, SortColumns enum and SortOrder enum · 104fadb9
  xbrosz authored May 06, 2022
  
  104fadb9
- Changing chip to radiobutton · 1fa954c0
  xbrosz authored May 06, 2022
  
  1fa954c0
- Removing list sorting from RockFilter · 62620fea
  xbrosz authored May 06, 2022
  
  62620fea
- Initializing sort dialog · 20b67df5
  xbrosz authored May 06, 2022
  
  20b67df5
- Adding sort item to toolbar · f4bcbcd7
  xbrosz authored May 06, 2022
  
  f4bcbcd7
- Creating sort dialog layout · 20959ab2
  xbrosz authored May 06, 2022
  
  20959ab2
- Adding sort icon · d91a4669
  xbrosz authored May 06, 2022
  
  d91a4669
- Adding text primary color to icons · f3b95003
  xbrosz authored May 06, 2022
  
  f3b95003
- Merge branch 'connect_rock_fragments_to_db' into 'main' · 96c9143b
  Tomáš Deutsch authored May 06, 2022
```
Connect rock fragments to db

See merge request !12
```
  96c9143b
- resolve conflicts · 16999315
  Deutsch, Tomas authored May 06, 2022
  
  16999315
- rock edit done, kindof · dd12cfdb
  Deutsch, Tomas authored May 06, 2022
  
  dd12cfdb
- Merge branch 'main' into rock_filtering · b9b4b1e8
  xbrosz authored May 06, 2022
  
  b9b4b1e8
- Fixing date picker background color · f11ade07
  xbrosz authored May 06, 2022
  
  f11ade07