Project

General

Profile

« Previous | Next » 

Revision 7bb30586

Added by Leszek Koltunski 7 months ago

Remove all old UI 1.0 classes

View differences:

src/main/java/org/distorted/config/ConfigScreen.java
23 23 
import org.distorted.helpers.PopupCreator;
24 24 

  		




  25
  25
  
    
import org.distorted.helpers.TransparentImageButton;


  		




  
  26
  
    
import org.distorted.main.MainActivity;


  		




  26
  27
  
    
import org.distorted.main.R;


  		




  27
  
  
    
import org.distorted.main_old.RubikActivity;


  		




  28
  28
  
    
import org.distorted.objects.RubikObject;


  		




  29
  29
  
    
import org.distorted.objects.RubikObjectList;


  		




  30
  30
  
    

  		




  ......




  39
  39
  
    
  private static final float MARGIN    = 0.0024f;


  		




  40
  40
  
    
  private static final int NUM_COLUMNS = 5;


  		




  41
  41
  
    
  private static final int[] mLocation = new int[2];


  		




  
  42
  
    
  private static final float POPUP_PADDING = 0.028f;


  		




  
  43
  
    
  private static final float POPUP_MARGIN  = 0.016f;


  		




  42
  44
  
    

  		




  43
  45
  
    
  private TransparentImageButton mBackButton, mObjectButton, mPrevButton, mNextButton;


  		




  44
  46
  
    
  private TextView mMovesText;


  		




  ......




  59
  61
  
    
    mColCount = NUM_COLUMNS;


  		




  60
  62
  
    

  		




  61
  63
  
    
    int cubeSize  = (int)( (Math.min(width,(int)(height*0.7f))) / 9 );


  		




  62
  
  
    
    int margin    = (int)(height*RubikActivity.POPUP_MARGIN);


  		




  63
  
  
    
    int padding   = (int)(height*RubikActivity.POPUP_PADDING);


  		




  
  64
  
    
    int margin    = (int)(height*POPUP_MARGIN);


  		




  
  65
  
    
    int padding   = (int)(height*POPUP_PADDING);


  		




  64
  66
  
    
    mObjectSize   = (int)(cubeSize + 2*margin + 0.5f);


  		




  65
  67
  
    
    mMaxRowCount  = (int)((height-mBarHeight)/mObjectSize);


  		




  66
  68
  
    

  		




  ......




  136
  138
  
    

  		




  137
  139
  
    
        int rowCount = Math.min(mMaxRowCount,mRowCount);


  		




  138
  140
  
    
        View popupView = mObjectPopup.getContentView();


  		




  139
  
  
    
        popupView.setSystemUiVisibility(RubikActivity.FLAGS);


  		




  
  141
  
    
        popupView.setSystemUiVisibility(MainActivity.FLAGS);


  		




  140
  142
  
    
        displayPopup(act,view,mObjectPopup,mObjectSize*mColCount,mObjectSize*rowCount+5*margin,margin,margin);


  		




  141
  143
  
    
        }


  		




  142
  144
  
    
      });


  		












Also available in:  Unified diff