Project

General

Profile

« Previous | Next » 

Revision 0de39b8e

Added by Leszek Koltunski about 4 years ago

Swap two tutorials; fix resuming WebView.

View differences:

src/main/java/org/distorted/tutorial/TutorialActivity.java
189 189
      super.onPause();
190 190
      TutorialSurfaceView view = findViewById(R.id.tutorialSurfaceView);
191 191
      view.onPause();
192
      mWebView.onPause();
192

  
193
      if( mWebView!=null ) mWebView.onPause();
194

  
193 195
      DistortedLibrary.onPause(1);
194 196
      }
195 197

  
......
204 206
      view.onResume();
205 207
      view.initialize();
206 208

  
209
      if( mWebView!=null ) mWebView.onResume();
210

  
207 211
      if( mObjectOrdinal>=0 && mObjectOrdinal< ObjectList.NUM_OBJECTS )
208 212
        {
209 213
        ObjectList obj = ObjectList.getObject(mObjectOrdinal);
src/main/java/org/distorted/tutorial/TutorialList.java
30 30
                          {"gb","rJlh5p2wAKA","How to Solve a 2x2 Rubik's Cube","Z3"},
31 31
                          {"es","f85wqJTIDlw","Resolver cubo de Rubik 2X2","Cuby"},
32 32
                          {"ru","azC6P3VYFkc","КАК СОБРАТЬ КУБИК РУБИКА 2Х2","Евгений Бондаренко"},
33
                          {"fr","qMIB7dYOrHw","Comment résoudre le rubik's cube 2x2","Valentino Cube"},
33
                          {"fr","V1XS993AUuw","Résoudre le cube 2x2","Rachma Nikov"},
34 34
                          {"pl","haNWdAYWGsY","Jak ułożyć: 2x2x2 (podstawy)","DżoDżo"},
35 35
                         }
36 36
        ),
......
138 138
                          {"gb","I6132yshkeU","How to Solve the Skewb","Z3"},
139 139
                          {"es","wxQX3HhPgds","Resolver Skewb (Principiantes)","Cuby"},
140 140
                          {"ru","_HSKZLC17w4","Как собрать Скьюб?","Кубмаркет"},
141
                          {"fr","apIF6QHhVpY","Comment résoudre le Skewb","Valentino Cube"},
141
                          {"fr","lR-GuIroh4k","Comment réussir le skewb","Rachma Nikov"},
142 142
                          {"pl","ofRu1fByNpk","Jak ułożyć: Skewb","DżoDżo"},
143 143
                         }
144 144
        ),
src/main/java/org/distorted/tutorial/TutorialWebView.java
78 78
      mWebView.onPause();
79 79
      }
80 80

  
81
///////////////////////////////////////////////////////////////////////////////////////////////////
82

  
83
    public void onResume()
84
      {
85
      mWebView.onResume();
86
      }
87

  
81 88
///////////////////////////////////////////////////////////////////////////////////////////////////
82 89

  
83 90
    public void reload()

Also available in: Unified diff