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/tutorials/TutorialActivity.java
75 75 
      {
76 76 
      super.onCreate(savedState);
77 77 
      DistortedLibrary.onCreate(1);
78 
      setTheme(R.style.CustomActivityThemeNoActionBar);
78 
      setTheme(R.style.MaterialThemeNoActionBar);
79 79 
      setContentView(R.layout.tutorial);
80 80 

  		




  81
  81
  
    
      Bundle b = getIntent().getExtras();


  		




  ......




  139
  139
  
    

  		




  140
  140
  
    
      if( mState==null ) mState = new TutorialScreen();


  		




  141
  141
  
    

  		




  142
  
  
    
      mState.createRightPane(this,width);


  		




  
  142
  
    
      mState.createRightPane(this);


  		




  143
  143
  
    

  		




  144
  144
  
    
      WebView videoView = findViewById(R.id.tutorialVideoView);


  		




  145
  145
  
    
      mWebView = new TutorialWebView(videoView);


  		












Also available in:  Unified diff