Project

General

Profile

« Previous | Next » 

Revision 1f6d1786

Added by Leszek Koltunski almost 2 years ago

Lots of progress with the main screen

View differences:

distorted-sokoban/src/main/java/org/distorted/sokoban/SokobanMenu.java
482 482
                                       SokobanCanvas.setState(SokobanCanvas.STATE_NAME);
483 483
                                       }
484 484
                                     break;
485
      case SokobanCanvas.STATE_HELP: if( SokobanDatabase.getNumRunnings()==0 )
485
      case SokobanCanvas.STATE_HELP: if( SokobanDatabase.getInstance().getNumRunnings()==0 )
486 486
                                       SokobanCanvas.setState(SokobanCanvas.STATE_MAIN);
487 487
                                     else
488 488
                                       SokobanCanvas.setState(SokobanCanvas.STATE_MENU);
......
680 680
    mPaint.setColor(SokobanCanvas.COLOR_BLACK);
681 681
    mPaint.setTextSize(mFontH);
682 682
    mPaint.setTextAlign(Align.CENTER);
683
    
684
    c.drawText( "'"+SokobanDatabase.getName()+"'", scrWidth/2, scrHeight/2 -   mFontH/2, mPaint);
685
    c.drawText( strIAT                           , scrWidth/2, scrHeight/2 +   mFontH/2, mPaint);
686
    c.drawText( strTagain                        , scrWidth/2, scrHeight/2 + 3*mFontH/2, mPaint);
683

  
684
    SokobanDatabase db = SokobanDatabase.getInstance();
685

  
686
    c.drawText( "'"+db.getName()+"'", scrWidth/2, scrHeight/2 -   mFontH/2, mPaint);
687
    c.drawText( strIAT              , scrWidth/2, scrHeight/2 +   mFontH/2, mPaint);
688
    c.drawText( strTagain           , scrWidth/2, scrHeight/2 + 3*mFontH/2, mPaint);
687 689
    }
688 690

  
689 691
///////////////////////////////////////////////////////////////////////////////////////////////////
......
1228 1230
	  tkb.setMinSize(1);
1229 1231
	  }
1230 1232

  
1231
	tkb.setText(SokobanDatabase.getName());
1233

  
1234

  
1235
	tkb.setText(SokobanDatabase.getInstance().getName());
1232 1236
	mCanvas.getActivity().setContentView(tkb);
1233 1237
    }
1234 1238

  
......
1236 1240

  
1237 1241
  public void okPressed(String text)
1238 1242
    { 
1239
    SokobanDatabase.setName(text);
1243
    SokobanDatabase.getInstance().setName(text);
1240 1244
    SokobanLevels.getInstance().updateMyRecords(text);
1241 1245
    mCanvas.getActivity().setContentView(mCanvas);
1242 1246
    SokobanCanvas.setRepaint();

Also available in: Unified diff