Merge branch 'androidapka'

app/src/main/assets/dyktando.html

@@ -39,9 +39,7 @@
         <span id="blank-progress" class="play-progress"></span>
       </header>
 
-      <div class="play-progress-bar">
-        <div id="dyk-progress-bar-inner" class="play-progress-bar-inner"></div>
-      </div>
+  <div id="progressbar-placeholder"></div>
 
       <div class="play-body">
         <div class="play-scroll-area" id="dyk-scroll">
@@ -71,6 +69,9 @@
       }).then(html => {
         document.getElementById('header-placeholder').outerHTML = html;
       });
+      loadComponent('components/progress-bar.html', {'{PROGRESS_ID}': 'dyk-progress-bar-inner'}).then(html => {
+        document.getElementById('progressbar-placeholder').outerHTML = html;
+      });
       loadComponent('components/footer.html').then(html => {
         document.getElementById('footer-placeholder').outerHTML = html;
       });

app/src/main/assets/dzielenie.html

@@ -51,9 +51,7 @@
           <span id="progress-label" class="progress-text">0/20</span>
         </div>
       </header>
-      <div class="read-progress-bar">
-        <div id="progress-inner" class="read-progress-bar-inner"></div>
-      </div>
+  <div id="progressbar-placeholder"></div>
 
       <div class="play-body">
         <div class="problem-display">
@@ -107,6 +105,9 @@
     }).then(html => {
       document.getElementById('header-placeholder').outerHTML = html;
     });
+    loadComponent('components/progress-bar.html', {'{PROGRESS_ID}': 'progress-inner'}).then(html => {
+      document.getElementById('progressbar-placeholder').outerHTML = html;
+    });
     loadComponent('components/footer.html').then(html => {
       document.getElementById('footer-placeholder').outerHTML = html;
     });

app/src/main/assets/mnozenie.html

@@ -51,9 +51,7 @@
           <span id="progress-label" class="progress-text">0/20</span>
         </div>
       </header>
-      <div class="read-progress-bar">
-        <div id="progress-inner" class="read-progress-bar-inner"></div>
-      </div>
+  <div id="progressbar-placeholder"></div>
 
       <div class="play-body">
         <div class="problem-display">
@@ -107,6 +105,9 @@
     }).then(html => {
       document.getElementById('header-placeholder').outerHTML = html;
     });
+    loadComponent('components/progress-bar.html', {'{PROGRESS_ID}': 'progress-inner'}).then(html => {
+      document.getElementById('progressbar-placeholder').outerHTML = html;
+    });
     loadComponent('components/footer.html').then(html => {
       document.getElementById('footer-placeholder').outerHTML = html;
     });

app/src/main/assets/testy.html

@@ -100,9 +100,7 @@
         <div id="status" class="play-status">Trening</div>
         <div id="score" class="play-score">0</div>
       </header>
-      <div class="play-progress-bar">
-        <div id="progress_inner" class="play-progress-bar-inner"></div>
-      </div>
+  <div id="progressbar-placeholder"></div>
 
       <div class="play-body">
         <div class="problem-display">
@@ -161,6 +159,9 @@
     }).then(html => {
       document.getElementById('header-placeholder').outerHTML = html;
     });
+    loadComponent('components/progress-bar.html', {'{PROGRESS_ID}': 'progress_inner'}).then(html => {
+      document.getElementById('progressbar-placeholder').outerHTML = html;
+    });
     loadComponent('components/footer.html').then(html => {
       document.getElementById('footer-placeholder').outerHTML = html;
     });