Revision c28cb4d4
Added by Leszek Koltunski over 2 years ago
src/main/java/org/distorted/objects/RubikObjectList.java | ||
---|---|---|
29 | 29 |
import org.distorted.main.RubikActivity; |
30 | 30 |
import org.distorted.objectlib.main.ObjectSignatures; |
31 | 31 |
import org.distorted.objectlib.main.ObjectType; |
32 |
import org.distorted.screens.RubikScreenPlay; |
|
33 |
import org.distorted.screens.ScreenList; |
|
34 | 32 |
|
35 | 33 |
import static org.distorted.objectlib.main.TwistyObject.MESH_NICE; |
36 | 34 |
import static org.distorted.objectlib.main.ObjectType.NUM_OBJECTS; |
src/main/java/org/distorted/screens/RubikScreenPlay.java | ||
---|---|---|
93 | 93 |
void enterScreen(final RubikActivity act) |
94 | 94 |
{ |
95 | 95 |
mWeakAct = new WeakReference<>(act); |
96 |
int numObjects = RubikObjectList.getNumObjects(); |
|
97 | 96 |
mScreenWidth = act.getScreenWidthInPixels(); |
98 | 97 |
mUpperBarHeight = act.getHeightUpperBar(); |
99 | 98 |
|
100 | 99 |
mMenuButtonHeight = (int)(mScreenWidth*RubikActivity.MENU_BUTTON_HEIGHT); |
101 | 100 |
mMenuTextSize = (int)(mScreenWidth*RubikActivity.MENU_MAIN_TEXT_SIZE); |
102 | 101 |
|
103 |
mRowCount = (numObjects + NUM_COLUMNS-1) / NUM_COLUMNS; |
|
104 |
mColCount = NUM_COLUMNS; |
|
102 |
recreatePopup(); |
|
105 | 103 |
|
106 | 104 |
// TOP //////////////////////////// |
107 | 105 |
LinearLayout layoutTop = act.findViewById(R.id.upperBar); |
... | ... | |
621 | 619 |
{ |
622 | 620 |
mObjectPopup = null; |
623 | 621 |
|
624 |
int numObjects = RubikObjectList.getNumObjects(); |
|
622 |
MainEntryList list = MainEntryList.getInstance(); |
|
623 |
int numObjects = list.getNumOfEntries(); |
|
625 | 624 |
mRowCount = (numObjects + NUM_COLUMNS-1) / NUM_COLUMNS; |
626 | 625 |
mColCount = NUM_COLUMNS; |
627 | 626 |
} |
Also available in: Unified diff
Bugfix for downloading new objects.