Commits · 7918a52c2a4e2a157b1fd901b728b209e7d2c796 · Patrik Brosz / Sutralog

May 07, 2022
- 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
- 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
- Fixing date picker colors · c70822ba
  xbrosz authored May 06, 2022
  
  c70822ba
May 05, 2022
- start rock edit · e16681ac
  Deutsch, Tomas authored May 04, 2022
  
  e16681ac
- connect rock detail to database · c239a152
  Deutsch, Tomas authored May 04, 2022
  
  c239a152
- Adding FilterColumns enum class, representing column used for filtering · a16f1a0f
  xbrosz authored May 05, 2022
  
  a16f1a0f
- Creating and implementing RockFilter class · a9cc7cc1
  xbrosz authored May 05, 2022
  
  a9cc7cc1
- Restyling filter sheet dialog · 646e5cbc
  xbrosz authored May 05, 2022
  
  646e5cbc
- Adding toolbar filter onClickListener · d9cfb4c7
  xbrosz authored May 05, 2022
  
  d9cfb4c7
- Adding nullable to category argument in rockListFragment · 481014d1
  xbrosz authored May 05, 2022
  
  481014d1
- Removing filtering from RockAdapter, filter function moved to RockListFragment · 555cef1d
  xbrosz authored May 05, 2022
  
  555cef1d
- Fixing fragment state after navigating up to RockListFragment + refactoring · 99d34155
  xbrosz authored May 05, 2022
  
  99d34155
- Changing mocked rocks for testing purposes · a3acad80
  xbrosz authored May 05, 2022
  
  a3acad80
May 04, 2022
- Removing livedata and adding onResume to list fragment · 6e1be40c
  xbrosz authored May 04, 2022
  
  6e1be40c
- connect rock detail to database · 4d1e049a
  Deutsch, Tomas authored May 04, 2022
  
  4d1e049a
May 03, 2022
- Merge branch 'navigation_args' into 'main' · 48171f8e
  Patrik Brosz authored May 03, 2022
```
Navigation args

See merge request !11
```
  48171f8e
- 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