Revision 8c4e4bf4
Added by Leszek Koltunski 25 days ago
src/main/java/org/distorted/main/MainScrollGrid.java | ||
---|---|---|
31 | 31 |
|
32 | 32 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
33 | 33 |
|
34 |
void createGrid(final MainActivity act, int windowWidth, int sortMode, int color)
|
|
34 |
void createGrid(final MainActivity act, int windowWidth, int sortMode, int darkC, int passedC)
|
|
35 | 35 |
{ |
36 | 36 |
if( mCreator==null ) mCreator = new ObjectGridCreator(windowWidth); |
37 | 37 |
|
... | ... | |
41 | 41 |
ScrollView scrollView = act.findViewById(R.id.objectScroll); |
42 | 42 |
scrollView.removeAllViews(); |
43 | 43 |
|
44 |
mCreator.createObjectGrid(act,scrollView,sortMode,color);
|
|
44 |
mCreator.createObjectGrid(act,scrollView,sortMode,darkC);
|
|
45 | 45 |
|
46 | 46 |
DisplayMetrics displaymetrics = new DisplayMetrics(); |
47 | 47 |
act.getWindowManager().getDefaultDisplay().getRealMetrics(displaymetrics); |
... | ... | |
61 | 61 |
act.setCurrentObject(ordinal); |
62 | 62 |
int w = displaymetrics.widthPixels; |
63 | 63 |
int h = displaymetrics.heightPixels; |
64 |
MainObjectPopup popup = new MainObjectPopup(act,ordinal,w,h); |
|
64 |
MainObjectPopup popup = new MainObjectPopup(act,ordinal,w,h,darkC,passedC);
|
|
65 | 65 |
popup.show(v); |
66 | 66 |
} |
67 | 67 |
}); |
... | ... | |
70 | 70 |
|
71 | 71 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
72 | 72 |
|
73 |
void updateGrid(final MainActivity act, int scrW, int color)
|
|
73 |
void updateGrid(final MainActivity act, int scrW, int darkC, int passedC)
|
|
74 | 74 |
{ |
75 | 75 |
act.runOnUiThread(new Runnable() |
76 | 76 |
{ |
... | ... | |
78 | 78 |
public void run() |
79 | 79 |
{ |
80 | 80 |
if( mSortMode<0 ) mSortMode = MainSettingsPopup.SORT_DEFAULT; |
81 |
createGrid(act,scrW,mSortMode,color);
|
|
81 |
createGrid(act,scrW,mSortMode,darkC,passedC);
|
|
82 | 82 |
} |
83 | 83 |
}); |
84 | 84 |
} |
Also available in: Unified diff
progress with colors in styles