Project

General

Profile

« Previous | Next » 

Revision dd874ae8

Added by Leszek Koltunski over 2 years ago

Convert the theme to be a MaterialTheme and the TransparentImageButton to be a MaterialButton - the first forced by the second, and the second because a MaterialButton gives us control over the location of the icon in top of it. We need that because of the new 'solve/scramble' split-button in the lower right of the Play screen.

View differences:

src/main/java/org/distorted/main/RubikObjectLibInterface.java
216 216

  
217 217
  public void onScrambleEffectFinished()
218 218
    {
219
    RubikActivity act = mAct.get();
220
    RubikScores.getInstance().incrementNumPlays();
219
    RubikScreenPlay play = (RubikScreenPlay) ScreenList.PLAY.getScreenClass();
221 220

  
222
    act.runOnUiThread(new Runnable()
221
    if( play.shouldReactToEndOfScrambling() )
223 222
      {
224
      @Override
225
      public void run()
223
      RubikActivity act = mAct.get();
224
      RubikScores.getInstance().incrementNumPlays();
225

  
226
      act.runOnUiThread(new Runnable()
227
        {
228
        @Override
229
        public void run()
226 230
        {
227 231
        ScreenList.switchScreen( act, ScreenList.READ);
228 232
        }
229
      });
233
        });
234
      }
230 235
    }
231 236

  
232 237
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff