Revision b42c8399
Added by Leszek Koltunski 8 months ago
src/main/java/org/distorted/main/MainScrollGrid.java | ||
---|---|---|
9 | 9 |
|
10 | 10 |
package org.distorted.main; |
11 | 11 |
|
12 |
import android.app.Activity; |
|
13 |
import android.util.DisplayMetrics; |
|
12 | 14 |
import android.view.View; |
13 | 15 |
import android.widget.GridLayout; |
14 | 16 |
import android.widget.ImageButton; |
15 | 17 |
|
16 | 18 |
import org.distorted.helpers.PopupCreator; |
17 |
import org.distorted.main_old.RubikActivity; |
|
18 | 19 |
import org.distorted.objects.RubikObject; |
19 | 20 |
import org.distorted.objects.RubikObjectList; |
20 | 21 |
|
... | ... | |
22 | 23 |
|
23 | 24 |
public class MainScrollGrid |
24 | 25 |
{ |
25 |
public static final int NUM_COLUMNS = 5; |
|
26 |
public static final int NUM_COLUMNS = 5; |
|
27 |
public static final float POPUP_PADDING= 0.035f; |
|
28 |
public static final float POPUP_MARGIN = 0.024f; |
|
26 | 29 |
|
27 | 30 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
28 | 31 |
|
29 |
public void createGrid(final MainActivity act, int scrW, int scrH)
|
|
32 |
void createGrid(final Activity act, int windowWidth)
|
|
30 | 33 |
{ |
31 | 34 |
int numObjects = RubikObjectList.getNumObjects(); |
32 | 35 |
int rowCount = (numObjects + NUM_COLUMNS-1) / NUM_COLUMNS; |
33 | 36 |
int colCount = NUM_COLUMNS; |
34 |
int objectSize = scrW / NUM_COLUMNS;
|
|
35 |
int margin = (int)(scrH*RubikActivity.POPUP_MARGIN);
|
|
36 |
int padding = (int)(scrH*RubikActivity.POPUP_PADDING);
|
|
37 |
int objectSize = windowWidth / NUM_COLUMNS;
|
|
38 |
int margin = (int)(windowWidth*POPUP_MARGIN);
|
|
39 |
int padding = (int)(windowWidth*POPUP_PADDING);
|
|
37 | 40 |
int cubeSize = objectSize - 2*margin; |
38 | 41 |
|
39 | 42 |
GridLayout objectGrid = act.findViewById(R.id.objectGrid); |
43 |
objectGrid.removeAllViews(); |
|
44 |
|
|
40 | 45 |
PopupCreator.createObjectGrid(objectGrid,act,rowCount,colCount,numObjects,margin,cubeSize,padding); |
41 | 46 |
|
47 |
DisplayMetrics displaymetrics = new DisplayMetrics(); |
|
48 |
act.getWindowManager().getDefaultDisplay().getRealMetrics(displaymetrics); |
|
49 |
|
|
42 | 50 |
for(int child=0; child<numObjects; child++) |
43 | 51 |
{ |
44 | 52 |
final RubikObject obj = RubikObjectList.getObject(child); |
... | ... | |
51 | 59 |
@Override |
52 | 60 |
public void onClick(View v) |
53 | 61 |
{ |
54 |
android.util.Log.e("D", "object "+ordinal+" clicked!"); |
|
62 |
int w = displaymetrics.widthPixels; |
|
63 |
int h = displaymetrics.heightPixels; |
|
64 |
MainObjectPopup popup = new MainObjectPopup(act,ordinal,w,h); |
|
65 |
popup.show(v); |
|
55 | 66 |
} |
56 | 67 |
}); |
57 | 68 |
} |
... | ... | |
59 | 70 |
|
60 | 71 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
61 | 72 |
|
62 |
public void updateGrid(final MainActivity act, int scrW, int scrH)
|
|
73 |
void updateGrid(final Activity act, int scrW)
|
|
63 | 74 |
{ |
64 | 75 |
act.runOnUiThread(new Runnable() |
65 | 76 |
{ |
66 | 77 |
@Override |
67 | 78 |
public void run() |
68 | 79 |
{ |
69 |
createGrid(act,scrW,scrH);
|
|
80 |
createGrid(act,scrW); |
|
70 | 81 |
} |
71 | 82 |
}); |
72 | 83 |
} |
Also available in: Unified diff
Major progress with version 2.0.0.