Revision 034c66e2
Added by Leszek Koltunski 8 days ago
| src/main/java/org/distorted/solvers/ScreenSolutionMultiphased.java | ||
|---|---|---|
| 237 | 237 |
|
| 238 | 238 |
mBackButton.setOnClickListener( new View.OnClickListener() |
| 239 | 239 |
{
|
| 240 |
@Override |
|
| 241 |
public void onClick(View v) |
|
| 242 |
{
|
|
| 243 |
ScreenList.goBack(act); |
|
| 244 |
} |
|
| 240 |
@Override public void onClick(View v) { ScreenList.goBack(act); }
|
|
| 245 | 241 |
}); |
| 246 | 242 |
} |
| 247 | 243 |
|
| ... | ... | |
| 340 | 336 |
@Override |
| 341 | 337 |
public void run() |
| 342 | 338 |
{
|
| 343 |
mMovesPhase.setText(mPhaseNames[mCurrPhase]+" "+mCurrMove+"/"+mNumMoves);
|
|
| 344 |
mMovesText.setText(cMove+"/"+tMove);
|
|
| 339 |
mMovesPhase.setText(act.getString(R.string.ph_placeholder,mPhaseNames[mCurrPhase],mCurrMove,mNumMoves));
|
|
| 340 |
mMovesText.setText(act.getString(R.string.mo_placeholder,cMove,tMove));
|
|
| 345 | 341 |
} |
| 346 | 342 |
}); |
| 347 | 343 |
} |
| src/main/java/org/distorted/solvers/ScreenSolutionSinglephased.java | ||
|---|---|---|
| 191 | 191 |
else |
| 192 | 192 |
{
|
| 193 | 193 |
int axis = mMoves[mCurrMove-1][0]; |
| 194 |
int rowBitmap = mMoves[mCurrMove-1][1]; |
|
| 195 |
int bareAngle = mMoves[mCurrMove-1][2]; |
|
| 194 |
int rowBitmap = mMoves[mCurrMove-1][1];
|
|
| 195 |
int bareAngle = mMoves[mCurrMove-1][2];
|
|
| 196 | 196 |
|
| 197 | 197 |
if( bareAngle!=0 ) |
| 198 | 198 |
{
|
| ... | ... | |
| 227 | 227 |
else |
| 228 | 228 |
{
|
| 229 | 229 |
int axis = mMoves[mCurrMove][0]; |
| 230 |
int rowBitmap = mMoves[mCurrMove][1]; |
|
| 231 |
int bareAngle = mMoves[mCurrMove][2]; |
|
| 230 |
int rowBitmap = mMoves[mCurrMove][1];
|
|
| 231 |
int bareAngle = mMoves[mCurrMove][2];
|
|
| 232 | 232 |
|
| 233 | 233 |
if( bareAngle!=0 ) |
| 234 | 234 |
{
|
| src/main/res/values/strings.xml | ||
|---|---|---|
| 244 | 244 |
<string name="ns_placeholder" translatable="false">+%1$d</string> |
| 245 | 245 |
<string name="sq_placeholder" translatable="false">%1$2d.</string> |
| 246 | 246 |
<string name="mo_placeholder" translatable="false">%1$d/%2$d</string> |
| 247 |
<string name="ph_placeholder" translatable="false">%1$s %2$d/%3$d</string> |
|
| 247 | 248 |
<string name="tm_placeholder" translatable="false">%1$02d:%2$02d</string> |
| 248 | 249 |
<string name="ap_placeholder" translatable="false">%1$s %2$s</string> |
| 249 | 250 |
|
Also available in: Unified diff
minor