Revision 83018ac4
Added by Leszek Koltunski almost 2 years ago
| src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java | ||
|---|---|---|
| 40 | 40 |
|
| 41 | 41 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 42 | 42 |
|
| 43 |
private void addSection(int tab, int level, int lastLevel, final RubikDialogScoresView view, final String[] country, final String[] name, final float[] time)
|
|
| 43 |
private void addSection(int tab, int level, final RubikDialogScoresView view, final String[] country, final String[] name, final float[] time) |
|
| 44 | 44 |
{
|
| 45 |
String title = level==lastLevel-1 ? |
|
| 45 |
if( level>RubikScreenPlay.LEVELS_SHOWN ) level=RubikScreenPlay.LEVELS_SHOWN; |
|
| 46 |
|
|
| 47 |
String title = level==RubikScreenPlay.LEVELS_SHOWN ? |
|
| 46 | 48 |
mAct.getString(R.string.levelM) : |
| 47 | 49 |
mAct.getString(R.string.lv_placeholder,level+1); |
| 48 | 50 |
|
| ... | ... | |
| 69 | 71 |
|
| 70 | 72 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 71 | 73 |
|
| 72 |
private void getNext(int currentTab, int[] toDoTab, int[] maxTab, int[] lastTab)
|
|
| 74 |
private void getNext(int currentTab, int[] toDoTab, int[] lastTab) |
|
| 73 | 75 |
{
|
| 74 |
if( toDoTab[currentTab]<maxTab[currentTab] ) |
|
| 76 |
int MAX = RubikScreenPlay.LEVELS_SHOWN+1; |
|
| 77 |
|
|
| 78 |
if( toDoTab[currentTab]<MAX ) |
|
| 75 | 79 |
{
|
| 76 | 80 |
mToDoTab = currentTab; |
| 77 |
mToDoLvl = toDoTab[currentTab]<maxTab[currentTab]-1 ? toDoTab[currentTab] : lastTab[currentTab]-1;
|
|
| 81 |
mToDoLvl = toDoTab[currentTab]<MAX-1 ? toDoTab[currentTab] : lastTab[currentTab]-1;
|
|
| 78 | 82 |
toDoTab[currentTab]++; |
| 79 | 83 |
} |
| 80 | 84 |
else |
| 81 | 85 |
{
|
| 82 | 86 |
for(int tab=0; tab<mNumTabs; tab++) |
| 83 | 87 |
{
|
| 84 |
if( toDoTab[tab]<maxTab[tab] )
|
|
| 88 |
if( toDoTab[tab]<MAX )
|
|
| 85 | 89 |
{
|
| 86 | 90 |
mToDoTab = tab; |
| 87 |
mToDoLvl = toDoTab[tab]<maxTab[tab]-1 ? toDoTab[tab] : lastTab[tab]-1;
|
|
| 91 |
mToDoLvl = toDoTab[tab]<MAX-1 ? toDoTab[tab] : lastTab[tab]-1;
|
|
| 88 | 92 |
toDoTab[tab]++; |
| 89 | 93 |
break; |
| 90 | 94 |
} |
| ... | ... | |
| 98 | 102 |
{
|
| 99 | 103 |
prepareView(); |
| 100 | 104 |
|
| 101 |
int MAX = RubikScreenPlay.LEVELS_SHOWN+1; |
|
| 102 | 105 |
int toDo=0; |
| 103 | 106 |
int[] toDoTab = new int[mNumTabs]; |
| 104 |
int[] maxTab = new int[mNumTabs]; |
|
| 105 | 107 |
int[] lastTab = new int[mNumTabs]; |
| 106 | 108 |
|
| 107 | 109 |
for(int i=0; i<mNumTabs; i++) |
| 108 | 110 |
{
|
| 109 | 111 |
lastTab[i]= RubikObjectList.getDBLevel(i); |
| 110 |
maxTab[i] = Math.min(lastTab[i],MAX); |
|
| 111 | 112 |
toDoTab[i]= 0; |
| 112 |
|
|
| 113 |
toDo += maxTab[i]; |
|
| 113 |
toDo += (RubikScreenPlay.LEVELS_SHOWN+1); |
|
| 114 | 114 |
} |
| 115 | 115 |
|
| 116 | 116 |
while( toDo>0 ) |
| 117 | 117 |
{
|
| 118 | 118 |
toDo--; |
| 119 |
getNext(mViewPager.getCurrentItem(),toDoTab,maxTab,lastTab); |
|
| 120 |
addSection( mToDoTab,mToDoLvl, lastTab[mToDoTab], mViews[mToDoTab], |
|
| 121 |
country[mToDoTab][mToDoLvl],name[mToDoTab][mToDoLvl],time[mToDoTab][mToDoLvl]); |
|
| 119 |
getNext(mViewPager.getCurrentItem(), toDoTab, lastTab); |
|
| 120 |
addSection( mToDoTab, mToDoLvl, mViews[mToDoTab], country[mToDoTab][mToDoLvl], name[mToDoTab][mToDoLvl], time[mToDoTab][mToDoLvl]); |
|
| 122 | 121 |
} |
| 123 | 122 |
} |
| 124 | 123 |
|
Also available in: Unified diff
Correct the MAX level in the leaderboard.