Project

General

Profile

« Previous | Next » 

Revision 09207f2b

Added by Leszek Koltunski 10 months ago

change one of objlib's APIs from 'onReplaceModeUP/Down' (which only comes when TouchControl is in REPLACE mode) to 'onStickerTouched/Untouched' (which reports the same thing, but comes always)

View differences:

src/main/java/org/distorted/config/ConfigObjectLibInterface.java
141 141 

  		




  142
  142
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  143
  143
  
    

  		




  144
  
  
    
  public void onReplaceModeDown(int cubit, int face)


  		




  
  144
  
    
  public void onStickerTouched(int cubit, int face)


  		




  145
  145
  
    
    {


  		




  146
  146
  
    
    ConfigActivity act = mAct.get();


  		




  147
  147
  
    
    act.repaintPuzzleFace(cubit,face);


  		




  ......




  149
  149
  
    

  		




  150
  150
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  151
  151
  
    

  		




  152
  
  
    
  public void onReplaceModeUp()


  		




  
  152
  
    
  public void onStickerUntouched()


  		




  153
  153
  
    
    {


  		




  154
  154
  
    

  		




  155
  155
  
    
    }


  		












  

    
      src/main/java/org/distorted/info/InfoObjectLibInterface.java
    
  





  25
  25
  
    
  public void onBeginRotation() { }


  		




  26
  26
  
    
  public void onSolved() { }


  		




  27
  27
  
    
  public void onObjectCreated(long time) { }


  		




  28
  
  
    
  public void onReplaceModeDown(int cubit, int face) { }


  		




  29
  
  
    
  public void onReplaceModeUp() { }


  		




  
  28
  
    
  public void onStickerTouched(int cubit, int face) { }


  		




  
  29
  
    
  public void onStickerUntouched() { }


  		




  30
  30
  
    
  public void onRemoveRotation(int axis, int row, int angle) { }


  		




  31
  31
  
    
  public void failedToDrag() { }


  		




  32
  32
  
    
  public void reportJSONError(String error, int ordinal) { }


  		












  

    
      src/main/java/org/distorted/patterns/PatternObjectLibInterface.java
    
  





  30
  30
  
    
  public void onSolved() { }


  		




  31
  31
  
    
  public void onObjectCreated(long time) { }


  		




  32
  32
  
    
  public void onWinEffectFinished(long startTime, long endTime, String debug, int scrambleNum) { }


  		




  33
  
  
    
  public void onReplaceModeDown(int cubit, int face) { }


  		




  34
  
  
    
  public void onReplaceModeUp() { }


  		




  
  33
  
    
  public void onStickerTouched(int cubit, int face) { }


  		




  
  34
  
    
  public void onStickerUntouched() { }


  		




  35
  35
  
    

  		




  36
  36
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  37
  37
  
    

  		












  

    
      src/main/java/org/distorted/play/PlayLibInterface.java
    
  





  65
  65
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  66
  66
  
    

  		




  67
  67
  
    
  public void onObjectCreated(long time) { }


  		




  68
  
  
    
  public void onReplaceModeDown(int cubit, int face) { }


  		




  69
  
  
    
  public void onReplaceModeUp() { }


  		




  
  68
  
    
  public void onStickerTouched(int cubit, int face) { }


  		




  
  69
  
    
  public void onStickerUntouched() { }


  		




  70
  70
  
    

  		




  71
  71
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  72
  72
  
    

  		












  

    
      src/main/java/org/distorted/solvers/SolverObjectLibInterface.java
    
  





  167
  167
  
    

  		




  168
  168
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  169
  169
  
    

  		




  170
  
  
    
  public void onReplaceModeDown(int cubit, int face)


  		




  
  170
  
    
  public void onStickerTouched(int cubit, int face)


  		




  171
  171
  
    
    {


  		




  172
  172
  
    
    SolverActivity act = mAct.get();


  		




  173
  173
  
    
    ScreenSetupPosition solver = (ScreenSetupPosition) ScreenList.SVER.getScreenClass();


  		




  ......




  182
  182
  
    

  		




  183
  183
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  184
  184
  
    

  		




  185
  
  
    
  public void onReplaceModeUp()


  		




  
  185
  
    
  public void onStickerUntouched()


  		




  186
  186
  
    
    {


  		




  187
  187
  
    
    if( mLastCubitColor>=0 )


  		




  188
  188
  
    
      {


  		












  

    
      src/main/java/org/distorted/tutorials/TutorialObjectLibInterface.java
    
  





  38
  38
  
    
  public void onBeginRotation() { }


  		




  39
  39
  
    
  public void onSolved() { }


  		




  40
  40
  
    
  public void onObjectCreated(long time) { }


  		




  41
  
  
    
  public void onReplaceModeDown(int cubit, int face) { }


  		




  42
  
  
    
  public void onReplaceModeUp() { }


  		




  
  41
  
    
  public void onStickerTouched(int cubit, int face) { }


  		




  
  42
  
    
  public void onStickerUntouched() { }


  		




  43
  43
  
    
  public void reportJSONError(String error, int ordinal) { }


  		




  44
  44
  
    

  		




  45
  45
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff