Skip to content

Commit 7f31d80

Browse files
mattvb91mattvb91
committed
more refactoring to query
1 parent 7092fe7 commit 7f31d80

File tree

4 files changed

+33
-73
lines changed

4 files changed

+33
-73
lines changed

‎app/src/main/java/mavonie/subterminal/ExitTabs.java‎

Lines changed: 17 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package mavonie.subterminal;
22

3-
import android.content.Context;
43
import android.os.Bundle;
4+
import android.support.annotation.NonNull;
55
import android.support.v7.widget.LinearLayoutManager;
66
import android.support.v7.widget.RecyclerView;
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;
1010

11-
import java.util.HashMap;
12-
1311
import mavonie.subterminal.Models.Model;
1412
import mavonie.subterminal.Models.Synchronizable;
1513
import mavonie.subterminal.Utils.BaseFragment;
14+
import mavonie.subterminal.Utils.DB.Query;
1615
import mavonie.subterminal.ViewAdapters.ExitRecycler;
1716

1817
/**
@@ -25,47 +24,32 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
2524
Bundle savedInstanceState) {
2625
View view = inflater.inflate(R.layout.fragment_exit_list, container, false);
2726

28-
// Set the adapter
29-
if (view instanceof RecyclerView) {
30-
Context context = view.getContext();
31-
32-
RecyclerView recyclerView = (RecyclerView) view;
33-
recyclerView.setLayoutManager(new LinearLayoutManager(context));
34-
35-
HashMap<String, Object> params = new HashMap<>();
36-
37-
params.put(Model.FILTER_ORDER_DIR, Model.FILTER_ORDER_DIR_ASC);
38-
params.put(Model.FILTER_ORDER_FIELD, mavonie.subterminal.Models.Exit.COLUMN_NAME_NAME);
39-
40-
HashMap<String, Object> whereNotDeleted = new HashMap<>();
41-
whereNotDeleted.put(Model.FILTER_WHERE_FIELD, Synchronizable.COLUMN_DELETED);
42-
whereNotDeleted.put(Model.FILTER_WHERE_VALUE, Synchronizable.DELETED_FALSE.toString());
43-
44-
HashMap<Integer, HashMap> wheres = new HashMap<>();
45-
wheres.put(wheres.size(), whereNotDeleted);
27+
RecyclerView recyclerView = (RecyclerView) view;
28+
recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
29+
recyclerView.setAdapter(new ExitRecycler(new mavonie.subterminal.Models.Exit().getItems(getQuery().getParams()), getmListener()));
4630

47-
params.put(Model.FILTER_WHERE, wheres);
48-
49-
if (getArguments() != null && getArguments().getInt(Exit.TAB) == Exit.TAB_MY_EXITS) {
50-
51-
HashMap<String, Object> whereGlobalIdNull = new HashMap<>();
52-
whereGlobalIdNull.put(Model.FILTER_WHERE_FIELD, mavonie.subterminal.Models.Exit.COLUMN_NAME_GLOBAL_ID);
53-
whereGlobalIdNull.put(Model.FILTER_WHERE_VALUE, null);
31+
return view;
32+
}
5433

55-
wheres.put(wheres.size(), whereGlobalIdNull);
56-
}
34+
@NonNull
35+
private Query getQuery() {
36+
Query query = new Query();
37+
query.orderDir(mavonie.subterminal.Models.Exit.COLUMN_NAME_NAME, Model.FILTER_ORDER_DIR_ASC);
38+
query.getParams().putAll(Synchronizable.getActiveParams());
5739

58-
recyclerView.setAdapter(new ExitRecycler(new mavonie.subterminal.Models.Exit().getItems(params), getmListener()));
40+
if (getArguments() != null && getArguments().getInt(Exit.TAB) == Exit.TAB_MY_EXITS) {
41+
query.addWhere(mavonie.subterminal.Models.Exit.COLUMN_NAME_GLOBAL_ID, null);
5942
}
60-
return view;
43+
44+
return query;
6145
}
6246

6347
@Override
6448
public void onResume() {
6549
super.onResume();
6650

6751
// Set title
68-
String title = getString(R.string.title_exit) + " (" + new mavonie.subterminal.Models.Exit().count(Synchronizable.getActiveParams()) + ")";
52+
String title = getString(R.string.title_exit) + " (" + new mavonie.subterminal.Models.Exit().count(getQuery().getParams()) + ")";
6953
MainActivity.getActivity().setTitle(title);
7054
}
7155

‎app/src/main/java/mavonie/subterminal/GearTabs.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@
88
import android.view.View;
99
import android.view.ViewGroup;
1010

11-
import java.util.HashMap;
12-
1311
import mavonie.subterminal.Forms.GearForm;
1412
import mavonie.subterminal.Forms.SuitForm;
15-
import mavonie.subterminal.Models.Model;
1613
import mavonie.subterminal.Models.Suit;
1714
import mavonie.subterminal.Models.Synchronizable;
1815
import mavonie.subterminal.Utils.BaseFragment;
16+
import mavonie.subterminal.Utils.DB.Query;
1917
import mavonie.subterminal.Utils.UIHelper;
2018
import mavonie.subterminal.ViewAdapters.GearRecycler;
2119
import mavonie.subterminal.ViewAdapters.SuitRecycler;
@@ -28,24 +26,19 @@ public class GearTabs extends BaseFragment {
2826
@Override
2927
public View onCreateView(LayoutInflater inflater, ViewGroup container,
3028
Bundle savedInstanceState) {
31-
RecyclerView.Adapter adapter;
32-
33-
HashMap<String, Object> whereNotDeleted = new HashMap<>();
34-
whereNotDeleted.put(Model.FILTER_WHERE_FIELD, Synchronizable.COLUMN_DELETED);
35-
whereNotDeleted.put(Model.FILTER_WHERE_VALUE, Synchronizable.DELETED_FALSE.toString());
3629

30+
RecyclerView.Adapter adapter;
3731
RecyclerView view;
3832

39-
if (getArguments() != null && getArguments().getInt(Gear.TAB) == Gear.TAB_RIGS) {
40-
mavonie.subterminal.Models.Gear gear = new mavonie.subterminal.Models.Gear();
33+
Query query = new Query();
34+
query.getParams().putAll(Synchronizable.getActiveParams());
4135

36+
if (getArguments() != null && getArguments().getInt(Gear.TAB) == Gear.TAB_RIGS) {
4237
view = (RecyclerView) inflater.inflate(R.layout.fragment_gear_list, container, false);
43-
adapter = new GearRecycler(gear.getItems(whereNotDeleted), getmListener());
38+
adapter = new GearRecycler(new mavonie.subterminal.Models.Gear().getItems(query.getParams()), getmListener());
4439
} else {
45-
Suit suit = new Suit();
46-
4740
view = (RecyclerView) inflater.inflate(R.layout.fragment_suit_list, container, false);
48-
adapter = new SuitRecycler(suit.getItems(whereNotDeleted), getmListener());
41+
adapter = new SuitRecycler(new Suit().getItems(query.getParams()), getmListener());
4942
}
5043

5144
view.setLayoutManager(new LinearLayoutManager(view.getContext()));

‎app/src/main/java/mavonie/subterminal/Skydive/Dropzone.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package mavonie.subterminal.Skydive;
22

3-
import android.content.Context;
43
import android.os.Bundle;
54
import android.support.v4.app.Fragment;
65
import android.support.v7.widget.LinearLayoutManager;
@@ -34,14 +33,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
3433
Bundle savedInstanceState) {
3534
View view = inflater.inflate(R.layout.fragment_dropzone_list, container, false);
3635

37-
// Set the adapter
38-
if (view instanceof RecyclerView) {
39-
Context context = view.getContext();
40-
RecyclerView recyclerView = (RecyclerView) view;
41-
recyclerView.setLayoutManager(new LinearLayoutManager(context));
42-
43-
recyclerView.setAdapter(new DropzoneRecycler(new mavonie.subterminal.Models.Skydive.Dropzone().getItems(buildFilterParams()), this.getmListener()));
44-
}
36+
RecyclerView recyclerView = (RecyclerView) view;
37+
recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
38+
recyclerView.setAdapter(new DropzoneRecycler(new mavonie.subterminal.Models.Skydive.Dropzone().getItems(buildFilterParams()), this.getmListener()));
4539

4640
return view;
4741
}

‎app/src/main/java/mavonie/subterminal/Skydive/GearTabs.java‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@
88
import android.view.View;
99
import android.view.ViewGroup;
1010

11-
import java.util.HashMap;
12-
1311
import mavonie.subterminal.Forms.SuitForm;
1412
import mavonie.subterminal.Gear;
1513
import mavonie.subterminal.MainActivity;
16-
import mavonie.subterminal.Models.Model;
1714
import mavonie.subterminal.Models.Skydive.Rig;
1815
import mavonie.subterminal.Models.Suit;
1916
import mavonie.subterminal.Models.Synchronizable;
2017
import mavonie.subterminal.R;
2118
import mavonie.subterminal.Skydive.ViewAdapters.RigRecycler;
2219
import mavonie.subterminal.Utils.BaseFragment;
20+
import mavonie.subterminal.Utils.DB.Query;
2321
import mavonie.subterminal.Utils.UIHelper;
2422
import mavonie.subterminal.ViewAdapters.SuitRecycler;
2523

@@ -32,23 +30,17 @@ public class GearTabs extends BaseFragment {
3230
public View onCreateView(LayoutInflater inflater, ViewGroup container,
3331
Bundle savedInstanceState) {
3432
RecyclerView.Adapter adapter;
35-
36-
HashMap<String, Object> whereNotDeleted = new HashMap<>();
37-
whereNotDeleted.put(Model.FILTER_WHERE_FIELD, Synchronizable.COLUMN_DELETED);
38-
whereNotDeleted.put(Model.FILTER_WHERE_VALUE, Synchronizable.DELETED_FALSE.toString());
39-
4033
RecyclerView view;
4134

42-
if (getArguments() != null && getArguments().getInt(Gear.TAB) == Gear.TAB_RIGS) {
43-
Rig rig = new Rig();
35+
Query query = new Query();
36+
query.getParams().putAll(Synchronizable.getActiveParams());
4437

38+
if (getArguments() != null && getArguments().getInt(Gear.TAB) == Gear.TAB_RIGS) {
4539
view = (RecyclerView) inflater.inflate(R.layout.fragment_gear_list, container, false);
46-
adapter = new RigRecycler(rig.getItems(whereNotDeleted), getmListener());
40+
adapter = new RigRecycler(new Rig().getItems(query.getParams()), getmListener());
4741
} else {
48-
Suit suit = new Suit();
49-
5042
view = (RecyclerView) inflater.inflate(R.layout.fragment_suit_list, container, false);
51-
adapter = new SuitRecycler(suit.getItems(whereNotDeleted), getmListener());
43+
adapter = new SuitRecycler(new Suit().getItems(query.getParams()), getmListener());
5244
}
5345

5446
view.setLayoutManager(new LinearLayoutManager(view.getContext()));
@@ -70,7 +62,6 @@ public void onPause() {
7062
if (UIHelper.getArcMenu().isMenuOpened()) {
7163
UIHelper.getArcMenu().toggleMenu();
7264
}
73-
7465
}
7566

7667
@Override
@@ -81,7 +72,6 @@ public void onResume() {
8172

8273
//We want to replace the add button with our arc menu
8374
UIHelper.getAddButton().hide();
84-
8575
UIHelper.getArcMenu().setVisibility(View.VISIBLE);
8676

8777
FloatingActionButton rig = (FloatingActionButton) MainActivity.getActivity().findViewById(R.id.gear_menu_rig);
@@ -101,6 +91,5 @@ public void onClick(View view) {
10191
UIHelper.getArcMenu().toggleMenu();
10292
}
10393
});
104-
10594
}
10695
}

0 commit comments

Comments
 (0)