Strona główna Odkrywaj Pomoc
Zaloguj się
GasteizkoMargolariak
/
GMAndroid
2
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

Merge branch 'SettingsActivity'

Step 2 of 3 of merging all the open branches back into master.
seavenois 9 lat temu
rodzic
4465590acc b5f4364b47
commit
da2029e46d
36 zmienionych plików z 2938 dodań i 862 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 1 3
      app/src/main/AndroidManifest.xml
  2. 415 0
      app/src/main/assets/changelog_en.html
  3. 415 0
      app/src/main/assets/changelog_es.html
  4. 415 0
      app/src/main/assets/changelog_eu.html
  5. 21 15
      app/src/main/java/com/ivalentin/margolariak/AlarmReceiver.java
  6. 52 7
      app/src/main/java/com/ivalentin/margolariak/GM.java
  7. 10 17
      app/src/main/java/com/ivalentin/margolariak/HomeLayout.java
  8. 2 1
      app/src/main/java/com/ivalentin/margolariak/HomeSectionLocation.java
  9. 3 2
      app/src/main/java/com/ivalentin/margolariak/LocationLayout.java
  10. 154 161
      app/src/main/java/com/ivalentin/margolariak/MainActivity.java
  11. 2 2
      app/src/main/java/com/ivalentin/margolariak/PostComment.java
  12. 250 78
      app/src/main/java/com/ivalentin/margolariak/SettingsActivity.java
  13. 6 6
      app/src/main/java/com/ivalentin/margolariak/SettingsLayout.java
  14. 3 2
      app/src/main/java/com/ivalentin/margolariak/Sync.java
  15. 9 1
      app/src/main/res/drawable/entry.xml
  16. 13 0
      app/src/main/res/drawable/gradient_v_white.xml
  17. 15 0
      app/src/main/res/drawable/row_home_image.xml
  18. 14 5
      app/src/main/res/drawable/section.xml
  19. 16 0
      app/src/main/res/drawable/section_title.xml
  20. 22 12
      app/src/main/res/layout/activity_main.xml
  21. 339 0
      app/src/main/res/layout/activity_settings.xml
  22. 69 0
      app/src/main/res/layout/dialog_changelog.xml
  23. 1 1
      app/src/main/res/layout/dialog_sync.xml
  24. 185 137
      app/src/main/res/layout/fragment_layout_home.xml
  25. 62 37
      app/src/main/res/layout/row_home_activities.xml
  26. 44 21
      app/src/main/res/layout/row_home_blog.xml
  27. 2 3
      app/src/main/res/layout/row_home_schedule.xml
  28. 17 16
      app/src/main/res/values-en/strings.xml
  29. 18 17
      app/src/main/res/values-eu-rES/strings.xml
  30. 10 0
      app/src/main/res/values-v21/styles.xml
  31. 12 8
      app/src/main/res/values/color.xml
  32. 16 15
      app/src/main/res/values/strings.xml
  33. 7 0
      app/src/main/res/values/styles.xml
  34. 0 4
      app/src/main/res/xml/preferences.xml
  35. 1 1
      build.gradle
  36. 317 290
      build/intermediates/dex-cache/cache.xml

+ 1 - 3
app/src/main/AndroidManifest.xml
Wyświetl plik 

@@ -24,7 +24,7 @@
 
         android:allowBackup="true"
 
         android:icon="@drawable/ic_launcher"
 
         android:label="@string/app_name"
 
-        android:theme="@style/AppTheme"
 
+        android:theme="@style/Theme.AppBaseTheme"
 
         android:supportsRtl="true"
 
         android:isGame="false"
 
         android:fullBackupContent="@xml/backup"
 
@@ -43,7 +43,6 @@
 
         
         <activity
 
             android:name="com.ivalentin.margolariak.MainActivity"
 
-            android:theme="@style/Theme.NoTitle"
 
             android:windowSoftInputMode="stateHidden|adjustResize"
 
             android:configChanges="orientation"
 
             android:screenOrientation="portrait"
 
@@ -57,7 +56,6 @@
 
 
         <activity
 
             android:name=".SettingsActivity"
 
-            android:theme="@style/Theme.NoTitle"
 
             android:windowSoftInputMode="stateHidden|adjustResize"
 
             android:configChanges="orientation"
 
             android:screenOrientation="portrait"

+ 415 - 0
app/src/main/assets/changelog_en.html
Wyświetl plik 

@@ -0,0 +1,415 @@
 
+<html>
 
+<head>
 
+    <style>
 
+        span.version {font-weight: bold; color: #0078ff; font-size: 110%;}
 
+        span.date {font-style: italic; font-size: 80%;}
 
+        ul.version {padding-left: 1em;}
 
+        li.version {margin-bottom: 3em;}
 
+        ul.change {padding-left: 2em;}
 
+        li.change {margin-top: 1em; margin-bottom: 0.3em;}
 
+    </style>
 
+</head>
 
+<body>
 
+<ul class="version">
 
+
 
+    <!-- ----- v3 ----- -->
 
+    <li class="version">
 
+            <span class="version">
 
+                v3
 
+            </span>
 
+            <span class="date">
 
+                &nbsp;(SID)
 
+            </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Redise&ntilde;o de la aplicaci&oacute;n.
 
+            </li>
 
+            <li class="change">
 
+                Sincronizaci&oacute;n inteligente: Menor consumo de bater&iacute;a y datos (hasta un 60&#37; menos).
 
+            </li>
 
+            <li class="change">
 
+                Desaparece el men&uacute; deslizable.
 
+            </li>
 
+            <li class="change">
 
+                Formato de la informaci&oacute; uniforme en toda la app.
 
+            </li>
 
+            <li class="change">
 
+                Desaparece la secci&oacute;n &#34;Cerca de m&iacute;&#34;. Se integra en &#34;La Blanca&#34;.
 
+            </li>
 
+            <li>
 
+                Carga de im&aacute;genes m&aacute;s r&aacute;pida.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.5 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.5
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-10-09)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Corregido un error potencial al descargar im&aacute;genes desde el servidor.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.4 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.4
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-08-26)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-08-01)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la vista de proximos eventos de Fiestas.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la secci&oacute;n de fiestas.
 
+            </li>
 
+            <li class="change">
 
+                El programa de Fiestas se abre en el d&iacute;a actual.
 
+            </li>
 
+            <li class="change">
 
+                Inicio de aplicaci&oacute;n m&aacute;s r&aacute;pido.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.2 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-20)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la sincronizaci&oacute;n con el servidor.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Prevenci&oacute; de errores potenciales.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.1 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-15)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Correccion de fechas erroneas.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la vista del programa.
 
+            </li>
 
+            <li class="change">
 
+                Prevenci&oacute; de errores potenciales.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-RC3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-11)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-RC2 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-10)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras para pantallas peque&ntilde;as.
 
+            </li>
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-RC1 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-10)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejora del rendimiento durante la sincronizaci&oacute;n.
 
+            </li>
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-alpha04 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha04
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-08)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la presentaci&oacute;n de los programas.
 
+            </li>
 
+            <li class="change">
 
+                Mejora del rendimiento durante la sincronizaci&oacute;n.
 
+            </li>
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-alpha03 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha03
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-28)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Integraci&oacute;n con el sitio web.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-alpha02 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha02
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-25)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Las imagenes importantes se cargan antes que las no importantes.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras visuales en la galer&iacute;a.
 
+            </li>
 
+            <li class="change">
 
+                Corregido un error potencial al iniciar la aplicaci&oacute;n.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-24)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Redise&ntilde;o de la aplicaci&oacute;n.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.5 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.5
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-08-03)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Corregido un error en los eventos margolaris.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.4 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.4
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-23)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en los mapas.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-19)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de bater&iacute;a.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.2 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-18)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de bater&iacute;a.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.1 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-16)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de bater&iacute;a.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.0 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.0
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-06-29)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Lanzamiento.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+</ul>
 
+</body>
 
+</html>
 
+
 
+<!--Template
 
+
 
+
 
+<ul class="version">
 
+            <li class="version">
 
+                <span class="version">
 
+                    v
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;()
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+        </ul>
 
+-->

+ 415 - 0
app/src/main/assets/changelog_es.html
Wyświetl plik 

@@ -0,0 +1,415 @@
 
+<html>
 
+    <head>
 
+        <style>
 
+            span.version {font-weight: bold; color: #0078ff; font-size: 110%;}
 
+            span.date {font-style: italic; font-size: 80%;}
 
+            ul.version {padding-left: 1em;}
 
+            li.version {margin-bottom: 3em;}
 
+            ul.change {padding-left: 2em;}
 
+            li.change {margin-top: 1em; margin-bottom: 0.3em;}
 
+        </style>
 
+    </head>
 
+    <body>
 
+        <ul class="version">
 
+
 
+            <!-- ----- v3 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(SID)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Redise&ntilde;o de la aplicaci&oacute;n.
 
+                    </li>
 
+                    <li class="change">
 
+                        Sincronizaci&oacute;n inteligente: Menor consumo de bater&iacute;a y datos (hasta un 60&#37; menos).
 
+                    </li>
 
+                    <li class="change">
 
+                        Desaparece el men&uacute; deslizable.
 
+                    </li>
 
+                    <li class="change">
 
+                        Formato de la informaci&oacute; uniforme en toda la app.
 
+                    </li>
 
+                    <li class="change">
 
+                        Desaparece la secci&oacute;n &#34;Cerca de m&iacute;&#34;. Se integra en &#34;La Blanca&#34;.
 
+                    </li>
 
+                    <li>
 
+                        Carga de im&aacute;genes m&aacute;s r&aacute;pida.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0.5 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0.5
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-10-09)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Corregido un error potencial al descargar im&aacute;genes desde el servidor.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0.4 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0.4
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-08-26)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                    <li class="change">
 
+                        Menor consumo de datos.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0.3 ----- -->
 
+           <li class="version">
 
+                <span class="version">
 
+                    v2.0.3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-08-01)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejoras en la vista de proximos eventos de Fiestas.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la secci&oacute;n de fiestas.
 
+                    </li>
 
+                    <li class="change">
 
+                        El programa de Fiestas se abre en el d&iacute;a actual.
 
+                    </li>
 
+                    <li class="change">
 
+                        Inicio de aplicaci&oacute;n m&aacute;s r&aacute;pido.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0.2 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0.2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-20)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejoras en la sincronizaci&oacute;n con el servidor.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                    <li class="change">
 
+                        Menor consumo de datos.
 
+                    </li>
 
+                    <li class="change">
 
+                        Prevenci&oacute; de errores potenciales.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0.1 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0.1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-15)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Correccion de fechas erroneas.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la vista del programa.
 
+                    </li>
 
+                    <li class="change">
 
+                        Prevenci&oacute; de errores potenciales.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0-RC3 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-11)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Correcciones menores.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0-RC2 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-10)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejoras para pantallas peque&ntilde;as.
 
+                    </li>
 
+                    <li class="change">
 
+                        Correcciones menores.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0-RC1 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-10)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejora del rendimiento durante la sincronizaci&oacute;n.
 
+                    </li>
 
+                    <li class="change">
 
+                        Correcciones menores.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0-alpha04 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha04
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-08)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la presentaci&oacute;n de los programas.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejora del rendimiento durante la sincronizaci&oacute;n.
 
+                    </li>
 
+                    <li class="change">
 
+                        Correcciones menores.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0-alpha03 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha03
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-28)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Menor consumo de datos.
 
+                    </li>
 
+                    <li class="change">
 
+                        Integraci&oacute;n con el sitio web.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0-alpha02 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha02
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-25)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Las imagenes importantes se cargan antes que las no importantes.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras visuales en la galer&iacute;a.
 
+                    </li>
 
+                    <li class="change">
 
+                        Corregido un error potencial al iniciar la aplicaci&oacute;n.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v2.0 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v2.0
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-24)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Redise&ntilde;o de la aplicaci&oacute;n.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v1.5 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v1.5
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-08-03)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Corregido un error en los eventos margolaris.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v1.4 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v1.4
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-23)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Mejoras en los mapas.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v1.3 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v1.3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-19)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Menor consumo de bater&iacute;a.
 
+                    </li>
 
+                    <li class="change">
 
+                        Menor consumo de datos.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v1.2 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v1.2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-18)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Menor consumo de bater&iacute;a.
 
+                    </li>
 
+                    <li class="change">
 
+                        Menor consumo de datos.
 
+                    </li>
 
+                    <li class="change">
 
+                        Mejoras en la interfaz.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v1.1 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v1.1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-16)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Menor consumo de bater&iacute;a.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+            <!-- ----- v1.0 ----- -->
 
+            <li class="version">
 
+                <span class="version">
 
+                    v1.0
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-06-29)
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+                        Lanzamiento.
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+
 
+        </ul>
 
+    </body>
 
+</html>
 
+
 
+<!--Template
 
+
 
+
 
+<ul class="version">
 
+            <li class="version">
 
+                <span class="version">
 
+                    v
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;()
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+        </ul>
 
+-->

+ 415 - 0
app/src/main/assets/changelog_eu.html
Wyświetl plik 

@@ -0,0 +1,415 @@
 
+<html>
 
+<head>
 
+    <style>
 
+        span.version {font-weight: bold; color: #0078ff; font-size: 110%;}
 
+        span.date {font-style: italic; font-size: 80%;}
 
+        ul.version {padding-left: 1em;}
 
+        li.version {margin-bottom: 3em;}
 
+        ul.change {padding-left: 2em;}
 
+        li.change {margin-top: 1em; margin-bottom: 0.3em;}
 
+    </style>
 
+</head>
 
+<body>
 
+<ul class="version">
 
+
 
+    <!-- ----- v3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(SID)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Redise&ntilde;o de la aplicaci&oacute;n.
 
+            </li>
 
+            <li class="change">
 
+                Sincronizaci&oacute;n inteligente: Menor consumo de bater&iacute;a y datos (hasta un 60&#37; menos).
 
+            </li>
 
+            <li class="change">
 
+                Desaparece el men&uacute; deslizable.
 
+            </li>
 
+            <li class="change">
 
+                Formato de la informaci&oacute; uniforme en toda la app.
 
+            </li>
 
+            <li class="change">
 
+                Desaparece la secci&oacute;n &#34;Cerca de m&iacute;&#34;. Se integra en &#34;La Blanca&#34;.
 
+            </li>
 
+            <li>
 
+                Carga de im&aacute;genes m&aacute;s r&aacute;pida.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.5 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.5
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-10-09)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Corregido un error potencial al descargar im&aacute;genes desde el servidor.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.4 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.4
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-08-26)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-08-01)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la vista de proximos eventos de Fiestas.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la secci&oacute;n de fiestas.
 
+            </li>
 
+            <li class="change">
 
+                El programa de Fiestas se abre en el d&iacute;a actual.
 
+            </li>
 
+            <li class="change">
 
+                Inicio de aplicaci&oacute;n m&aacute;s r&aacute;pido.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.2 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-20)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la sincronizaci&oacute;n con el servidor.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Prevenci&oacute; de errores potenciales.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0.1 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0.1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-15)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Correccion de fechas erroneas.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la vista del programa.
 
+            </li>
 
+            <li class="change">
 
+                Prevenci&oacute; de errores potenciales.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-RC3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-11)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-RC2 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-10)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras para pantallas peque&ntilde;as.
 
+            </li>
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-RC1 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-RC1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-10)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejora del rendimiento durante la sincronizaci&oacute;n.
 
+            </li>
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-alpha04 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha04
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-07-08)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la presentaci&oacute;n de los programas.
 
+            </li>
 
+            <li class="change">
 
+                Mejora del rendimiento durante la sincronizaci&oacute;n.
 
+            </li>
 
+            <li class="change">
 
+                Correcciones menores.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-alpha03 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha03
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-28)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Integraci&oacute;n con el sitio web.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0-alpha02 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0-alpha02
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-25)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Las imagenes importantes se cargan antes que las no importantes.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras visuales en la galer&iacute;a.
 
+            </li>
 
+            <li class="change">
 
+                Corregido un error potencial al iniciar la aplicaci&oacute;n.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v2.0 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v2.0
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2016-06-24)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Redise&ntilde;o de la aplicaci&oacute;n.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.5 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.5
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-08-03)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Corregido un error en los eventos margolaris.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.4 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.4
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-23)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Mejoras en los mapas.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.3 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.3
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-19)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de bater&iacute;a.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.2 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.2
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-18)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de bater&iacute;a.
 
+            </li>
 
+            <li class="change">
 
+                Menor consumo de datos.
 
+            </li>
 
+            <li class="change">
 
+                Mejoras en la interfaz.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.1 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.1
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-07-16)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Menor consumo de bater&iacute;a.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+    <!-- ----- v1.0 ----- -->
 
+    <li class="version">
 
+                <span class="version">
 
+                    v1.0
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;(2015-06-29)
 
+                </span>
 
+        <ul class="change">
 
+            <li class="change">
 
+                Lanzamiento.
 
+            </li>
 
+        </ul>
 
+    </li>
 
+
 
+</ul>
 
+</body>
 
+</html>
 
+
 
+<!--Template
 
+
 
+
 
+<ul class="version">
 
+            <li class="version">
 
+                <span class="version">
 
+                    v
 
+                </span>
 
+                <span class="date">
 
+                    &nbsp;()
 
+                </span>
 
+                <ul class="change">
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                    <li class="change">
 
+
 
+                    </li>
 
+                </ul>
 
+            </li>
 
+        </ul>
 
+-->

+ 21 - 15
app/src/main/java/com/ivalentin/margolariak/AlarmReceiver.java
Wyświetl plik 

@@ -41,12 +41,12 @@ public class AlarmReceiver extends BroadcastReceiver {
 
     	Log.d("Alarm", "Received");
 
 		    	
 		//Open the preferences to be available several times later.
 
-		SharedPreferences settings = context.getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+		SharedPreferences preferences = context.getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 		
 		FetchURL fu;
 
 		
 		//Check if the user wants to receive notifications
 
-		if (settings.getInt(GM.PREF_NOTIFICATION , GM.DEFAULT_PREF_NOTIFICATION) == 1){
 
+		if (preferences.getBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, GM.PREFERENCES.DEFAULT.NOTIFICATIONS)){
 
 
 			//Get the file
 
 			try{
 
@@ -63,7 +63,8 @@ public class AlarmReceiver extends BroadcastReceiver {
 
 					String action = notification.substring(notification.indexOf("<action>") + 8, notification.indexOf("</action>"));
 
 
 					//Is the notification seen already?
 
-					if(!settings.getBoolean(GM.NOTIFICATION_SEEN_ + id, false)){
 
+					//TODO: Create a db table for this
 
+					if(!preferences.getBoolean(GM.NOTIFICATION_SEEN_ + id, false)){
 
 
 						String lang = GM.getLang();
 
 						String title = notification.substring(notification.indexOf("<title_" + lang + ">") + 10, notification.indexOf("</title_" + lang + ">"));
 
@@ -111,7 +112,7 @@ public class AlarmReceiver extends BroadcastReceiver {
 
 						mNotificationManager.notify(Integer.parseInt(id), mBuilder.build());
 
 
 						//Mark as notified
 
-						SharedPreferences.Editor editor = settings.edit();
 
+						SharedPreferences.Editor editor = preferences.edit();
 
 						editor.putBoolean(GM.NOTIFICATION_SEEN_ + id, true);
 
 						editor.apply();
 
 					}
 
@@ -133,17 +134,22 @@ public class AlarmReceiver extends BroadcastReceiver {
 
      * @param context The context of the app
 
      */
 
     public void setAlarm(Context context) {
 
-        AlarmManager alarmMgr = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
 
-        Intent intent = new Intent(context, AlarmReceiver.class);
 
-        PendingIntent alarmIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
 
-        
-        //Set the alarm cycle.
 
-        alarmMgr.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, GM.PERIOD_SYNC, GM.PERIOD_SYNC, alarmIntent);
 
-        
-        // Enable SampleBootReceiver to automatically restart the alarm when the device is rebooted.
 
-        ComponentName receiver = new ComponentName(context, BootReceiver.class);
 
-        PackageManager pm = context.getPackageManager();
 
-        pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);           
+		//Only do this if the preference is enabled
 
+		SharedPreferences prefs = context.getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
+		if (prefs.getBoolean(GM.PREFERENCES.KEY.SYNC, GM.PREFERENCES.DEFAULT.SYNC)) {
 
+
 
+			AlarmManager alarmMgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
+			Intent intent = new Intent(context, AlarmReceiver.class);
 
+			PendingIntent alarmIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
 
+
 
+			//Set the alarm cycle.
 
+			alarmMgr.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, GM.PERIOD_SYNC, GM.PERIOD_SYNC, alarmIntent);
 
+
 
+			// Enable SampleBootReceiver to automatically restart the alarm when the device is rebooted.
 
+			ComponentName receiver = new ComponentName(context, BootReceiver.class);
 
+			PackageManager pm = context.getPackageManager();
 
+			pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
 
+		}
 
     }
 
 
 }

+ 52 - 7
app/src/main/java/com/ivalentin/margolariak/GM.java
Wyświetl plik 

@@ -142,6 +142,46 @@ final class GM {
 
 		}
 
 	}
 
 
+	static final class DATA {
 
+
 
+		static final String DATA = "data";
 
+
 
+		static final class KEY {
 
+
 
+			static final String USER = "user-id";
 
+			static final String PREVIOUS_APP_VERSION = "previous_app_version";
 
+			static final String LABLANCA = "lablanca";
 
+		}
 
+
 
+		static final class DEFAULT {
 
+
 
+			static final String USER = "";
 
+			static final int PREVIOUS_APP_VERSION = 0;
 
+			static final boolean LABLANCA = false;
 
+		}
 
+	}
 
+
 
+	static final class PREFERENCES {
 
+
 
+		static final String PREFERNCES = "preferences";
 
+
 
+		static final class KEY {
 
+
 
+			static final String SYNC = "performBackgroundSyncs";
 
+			static final String NOTIFICATIONS = "recieveNotificacions";
 
+		}
 
+
 
+		static final class DEFAULT {
 
+
 
+			static final boolean SYNC = true;
 
+			static final boolean NOTIFICATIONS = true;
 
+		}
 
+	}
 
+
 
+	static class URL {
 
+		static final String GITHUB = "https://github.com/GasteizkoMargolariak/GasteizkoMargolariakApp";
 
+	}
 
+
 
 	static final String CLIENT = "com.ivalentin.margolariak";
 
 
 	/**
 
@@ -277,37 +317,37 @@ final class GM {
 
 	/**
 
 	 * Name of the preference group for the app.
 
 	 */
 
-	static final String PREF = "gmpreferences";
 
+	//static final String PREF = "gmpreferences";
 
 	
 	/**
 
 	 * Name of the preference to store the database version with.
 
 	 */
 
-	static final String PREF_DB_VERSION = "prefDbVersion";
 
+	//static final String PREF_DB_VERSION = "prefDbVersion";
 
 
 	/**
 
 	 * Name of the preference to store the previous app version.
 
 	 */
 
-	static final String PREF_PREVIOUS_VERSION = "prefAppPreviousVersion";
 
+	//static final String PREF_PREVIOUS_VERSION = "prefAppPreviousVersion";
 
 
 	/**
 
 	 * Name of the preference to store the setting that allows user to upload comments.
 
 	 */
 
-	static final String PREF_DB_PHOTOS = "prefDbPhotos";
 
+	//static final String PREF_DB_PHOTOS = "prefDbPhotos";
 
 
 	/**
 
 	 * Name of the preference that indicates if we are on festivals.
 
 	 */
 
-	static final String PREF_DB_FESTIVALS = "prefDbFestivals";
 
+	//static final String PREF_DB_FESTIVALS = "prefDbFestivals";
 
 
 	/**
 
 	 * Name of the preference indicating if the user wants to to receive notifications intended for the general public.
 
 	 */
 
-	static final String PREF_NOTIFICATION = "prefNotification";
 
+	//static final String PREF_NOTIFICATION = "prefNotification";
 
 
 	/**
 
 	 * Default value of the preference indicating if the user wants to to receive notifications intended for the general public.
 
 	 */
 
-	static final int DEFAULT_PREF_NOTIFICATION = 1;
 
+	//static final int DEFAULT_PREF_NOTIFICATION = 1;
 
 
 	/**
 
 	 * Header of a preference to indicate received notifications.
 
@@ -420,6 +460,11 @@ final class GM {
 
 	static final int IMG_THUMB = 180;
 
 	static final int IMG_VIEW = 800;
 
 
+	/**
 
+	 *Programaticall loaded rows needs their margin to also be set programatically
 
+	 */
 
+	static final int ENTRY_MARGIN = 8;
 
+
 
 	/**
 
 	 * Gets the language code for sql queries.
 
 	 * Only three values can be returned: es, eu, en.

+ 10 - 17
app/src/main/java/com/ivalentin/margolariak/HomeLayout.java
Wyświetl plik 

@@ -160,8 +160,8 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 	private int setUpSchedule(int gm, View view) {
 
 		int count = 0;
 
 
-		SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
-		if (preferences.getInt(GM.PREF_DB_FESTIVALS, 0) == 0) {
 
+		SharedPreferences data = view.getContext().getSharedPreferences(GM.DATA.DATA, Context.MODE_PRIVATE);
 
+		if (!data.getBoolean(GM.DATA.KEY.LABLANCA, GM.DATA.DEFAULT.LABLANCA)) {
 
 			return count;
 
 		}
 
 
@@ -418,9 +418,9 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 	 */
 
 	@SuppressWarnings("ResultOfMethodCallIgnored")
 
 	private boolean setUpLablanca(View view) {
 
-		SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+		SharedPreferences preferences = view.getContext().getSharedPreferences(GM.DATA.DATA, Context.MODE_PRIVATE);
 
 		Boolean set = false;
 
-		if (preferences.getInt(GM.PREF_DB_FESTIVALS, 0) == 1) {
 
+		if (preferences.getBoolean(GM.DATA.KEY.LABLANCA, GM.DATA.DEFAULT.LABLANCA)) {
 
 			LinearLayout llSection = (LinearLayout) view.findViewById(R.id.ll_home_section_lablanca);
 
 			TextView tvText = (TextView) view.findViewById(R.id.tv_home_section_lablanca_text);
 
 			ImageView ivImage = (ImageView) view.findViewById(R.id.iv_home_section_lablanca_image);
 
@@ -496,7 +496,8 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 	 * @return True if the section has been shown, false otherwise.
 
 	 */
 
 	private boolean setUpLocation(Location location, View view) {
 
-		SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+		SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
+		//Do this from db
 
 		if (!preferences.getString(GM.PREF_GM_LOCATION, GM.DEFAULT_PREF_GM_LOCATION).equals(GM.DEFAULT_PREF_GM_LOCATION)) {
 
 			try {
 
 				Double lat = Double.longBitsToDouble(preferences.getLong(GM.PREF_GM_LATITUDE, 0));
 
@@ -650,7 +651,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 
 			//Set margins
 
 			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 
-			layoutParams.setMargins(10, 10, 10, 25);
 
+			layoutParams.setMargins(GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN);
 
 			entry.setLayoutParams(layoutParams);
 
 
 			//Set title
 
@@ -673,9 +674,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 			} else {
 
 				text = Html.fromHtml(cursor.getString(6)).toString();
 
 			}
 
-			if (text.length() > 100) {
 
-				text = text.substring(0, 100) + "...";
 
-			}
 
+
 
 			TextView tvText = (TextView) entry.findViewById(R.id.tv_row_home_activity_text);
 
 			tvText.setText(text);
 
 
@@ -790,7 +789,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 
 				//Set margins
 
 				LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 
-				layoutParams.setMargins(10, 10, 10, 25);
 
+				layoutParams.setMargins(GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN);
 
 				entry.setLayoutParams(layoutParams);
 
 
 				//Set title
 
@@ -807,9 +806,6 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 
 				//Set text
 
 				String text = Html.fromHtml(cursor.getString(4)).toString();
 
-				if (text.length() > 100) {
 
-					text = text.substring(0, 100) + "...";
 
-				}
 
 				TextView tvText = (TextView) entry.findViewById(R.id.tv_row_home_activity_text);
 
 				tvText.setText(text);
 
 
@@ -920,7 +916,7 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 
 			//Set margins
 
 			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 
-			layoutParams.setMargins(10, 10, 10, 25);
 
+			layoutParams.setMargins(GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN, GM.ENTRY_MARGIN);
 
 			entry.setLayoutParams(layoutParams);
 
 
 			//Set title
 
@@ -929,9 +925,6 @@ public class HomeLayout extends Fragment implements LocationListener {
 
 
 			//Set text
 
 			String text = Html.fromHtml(cursor.getString(2)).toString();
 
-			if (text.length() > 100) {
 
-				text = text.substring(0, 100) + "...";
 
-			}
 
 			TextView tvText = (TextView) entry.findViewById(R.id.tv_row_home_blog_text);
 
 			tvText.setText(text);

+ 2 - 1
app/src/main/java/com/ivalentin/margolariak/HomeSectionLocation.java
Wyświetl plik 

@@ -77,7 +77,8 @@ class HomeSectionLocation extends AsyncTask<Void, Void, Void> {
 
 	protected void onPostExecute(Void v) {
 
 		if (isLocationReported){
 
 
-			SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+			//TODO: Do this on a db table
 
+			SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 			SharedPreferences.Editor editor = preferences.edit();
 
 			editor.putLong(GM.PREF_GM_LATITUDE, Double.doubleToLongBits(coord.latitude));
 
 			editor.putLong(GM.PREF_GM_LONGITUDE, Double.doubleToLongBits(coord.longitude));

+ 3 - 2
app/src/main/java/com/ivalentin/margolariak/LocationLayout.java
Wyświetl plik 

@@ -173,7 +173,8 @@ public class LocationLayout extends Fragment implements OnMapReadyCallback, Loca
 
 		}
 
 		
 		//Set GM marker
 
-		SharedPreferences preferences = v.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+		//TODO: Use db
 
+		SharedPreferences preferences = v.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 		Double lat = Double.longBitsToDouble(preferences.getLong(GM.PREF_GM_LATITUDE, 0));
 
 		Double lon = Double.longBitsToDouble(preferences.getLong(GM.PREF_GM_LONGITUDE, 0));
 
 		gmLocation = new LatLng(lat, lon);
 
@@ -220,7 +221,7 @@ public class LocationLayout extends Fragment implements OnMapReadyCallback, Loca
 
 	@Override
 
 	public void onLocationChanged(Location location) {
 
 		//TODO: Read again the GM Location.
 
-		SharedPreferences preferences = v.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+		SharedPreferences preferences = v.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 		if (!preferences.getString(GM.PREF_GM_LOCATION, GM.DEFAULT_PREF_GM_LOCATION).equals(GM.DEFAULT_PREF_GM_LOCATION)) {
 
 
 			Double lat = Double.longBitsToDouble(preferences.getLong(GM.PREF_GM_LATITUDE, 0));

+ 154 - 161
app/src/main/java/com/ivalentin/margolariak/MainActivity.java
Wyświetl plik 

@@ -81,7 +81,8 @@ public class MainActivity extends Activity {
 
 				result = true;
 
 			}
 
 
-			SharedPreferences settings = getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+			//TODO: Store in database
 
+			SharedPreferences settings = getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 			SharedPreferences.Editor editor = settings.edit();
 
 			if (result) {
 
 				editor.putLong(GM.PREF_GM_LATITUDE, Double.doubleToLongBits(Double.parseDouble(lat)));
 
@@ -183,8 +184,8 @@ public class MainActivity extends Activity {
 
 
 			case GM.SECTION_LABLANCA:
 
 				//Get settings
 
-				SharedPreferences preferences = getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
-				if (preferences.getInt(GM.PREF_DB_FESTIVALS, 0) == 1) {
 
+				SharedPreferences sharedData = getSharedPreferences(GM.DATA.DATA, Context.MODE_PRIVATE);
 
+				if (sharedData.getBoolean(GM.DATA.KEY.LABLANCA, GM.DATA.DEFAULT.LABLANCA)) {
 
 					fragment = new LablancaLayout();
 
 				} else {
 
 					fragment = new LablancaNoFestivalsLayout();
 
@@ -366,218 +367,210 @@ public class MainActivity extends Activity {
 
 		});
 
 
 		//Get preferences
 
-		SharedPreferences preferences = getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
-		SharedPreferences.Editor editor = preferences.edit();
 
+		SharedPreferences sharedData = getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
+		SharedPreferences.Editor dataEditor = sharedData.edit();
 
 
-		//TODO: Read preferences. If there is a recent location, show the menu entry
 
+		//TODO: Read database. If there is a recent location, show the menu entry
 
 
 		//If the user code is not set, generate one
 
-		if (preferences.getString(GM.USER_CODE, "").length() == 0) {
 
+		if (sharedData.getString(GM.DATA.KEY.USER, GM.DATA.DEFAULT.USER).length() == GM.DATA.DEFAULT.USER.length()) {
 
 			SecureRandom random = new SecureRandom();
 
 			String newCode = new BigInteger(130, random).toString(32).substring(0, 16);
 
-			editor.putString(GM.USER_CODE, newCode);
 
-			editor.apply();
 
+			dataEditor.putString(GM.USER_CODE, newCode);
 
+			dataEditor.apply();
 
 		}
 
 
 		//Cerate database if it's not already created
 
 		createDatabase();
 
 
 		//If the database has just been updated, recreate the database
 
-		if (preferences.getInt(GM.PREF_PREVIOUS_VERSION, 0) < BuildConfig.VERSION_CODE) {
 
-			Log.d("UPDATE", "App updated from version " + preferences.getInt(GM.PREF_PREVIOUS_VERSION, 0) + " to " + BuildConfig.VERSION_CODE + ". Forcing a new sync...");
 
+		if (sharedData.getInt(GM.DATA.KEY.PREVIOUS_APP_VERSION, GM.DATA.DEFAULT.PREVIOUS_APP_VERSION) < BuildConfig.VERSION_CODE) {
 
+			Log.d("UPDATE", "App updated from version " + sharedData.getInt(GM.DATA.KEY.PREVIOUS_APP_VERSION, GM.DATA.DEFAULT.PREVIOUS_APP_VERSION) + " to " + BuildConfig.VERSION_CODE + ". Forcing a new sync...");
 
 			deleteDatabase();
 
-			editor.putInt(GM.PREF_PREVIOUS_VERSION, BuildConfig.VERSION_CODE);
 
-			editor.putInt(GM.PREF_DB_VERSION, 0);
 
-			editor.apply();
 
+			dataEditor.putInt(GM.DATA.KEY.PREVIOUS_APP_VERSION, BuildConfig.VERSION_CODE);
 
+			dataEditor.apply();
 
 			createDatabase();
 
 			initialSync();
 
 		}
 
 		else {
 
+			//Sync db
 
+			sync();
 
 
-			//If its the first time
 
-			if (preferences.getInt(GM.PREF_DB_VERSION, GM.DEFAULT_PREF_DB_VERSION) == GM.DEFAULT_PREF_DB_VERSION) {
 
-				initialSync();
 
-			}
 
-			//If t's not the first time
 
-			else {
 
-				//Sync db
 
-				sync();
 
+			//Load initial section
 
+			loadSection(GM.SECTION_HOME);
 
 
-				//Load initial section
 
-				loadSection(GM.SECTION_HOME);
 
+			//If the intent had extras (from notifications), do something
 
+			if (actionText != null) {
 
+				TextView tvDialogTitle, tvDialogText;
 
+				Button btDialogClose, btDialogAction;
 
+				Drawable dialogIcon;
 
+				if (actionTitle != null) {
 
 
-				//If the intent had extras (from notifications), do something
 
-				if (actionText != null) {
 
-					TextView tvDialogTitle, tvDialogText;
 
-					Button btDialogClose, btDialogAction;
 
-					Drawable dialogIcon;
 
-					if (actionTitle != null) {
 
-
 
-						//Create a dialog
 
-						final Dialog dialog = new Dialog(this);
 
-
 
-						//Set up dialog window
 
-						dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-						dialog.setContentView(R.layout.dialog_notification);
 
-
 
-						//Set title
 
-						tvDialogTitle = (TextView) dialog.findViewById(R.id.tv_dialog_notification_title);
 
-						tvDialogTitle.setText(actionTitle);
 
-
 
-						//Set text
 
-						tvDialogText = (TextView) dialog.findViewById(R.id.tv_dialog_notification_text);
 
-						tvDialogText.setText(actionText);
 
-
 
-						//Set close button
 
-						btDialogClose = (Button) dialog.findViewById(R.id.bt_dialog_notification_close);
 
-						btDialogClose.setOnClickListener(new OnClickListener() {
 
-							@Override
 
-							public void onClick(View v) {
 
-								dialog.dismiss();
 
-							}
 
-						});
 
-
 
-						//Set the icon
 
-						dialogIcon = getResources().getDrawable(R.drawable.ic_launcher);
 
-						if (dialogIcon != null) {
 
-							dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
 
-						}
 
-						tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
 
-						tvDialogTitle.setCompoundDrawablePadding(20);
 
+					//Create a dialog
 
+					final Dialog dialog = new Dialog(this);
 
 
-						//Get preferences
 
-						int festivals = preferences.getInt(GM.PREF_DB_FESTIVALS, 0);
 
+					//Set up dialog window
 
+					dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 
+					dialog.setContentView(R.layout.dialog_notification);
 
 
-						//Set the action button
 
-						btDialogAction = (Button) dialog.findViewById(R.id.bt_dialog_notification_action);
 
-						if (action != null) {
 
-							switch (action) {
 
+					//Set title
 
+					tvDialogTitle = (TextView) dialog.findViewById(R.id.tv_dialog_notification_title);
 
+					tvDialogTitle.setText(actionTitle);
 
 
-								case GM.EXTRA_ACTION_LABLANCA:
 
+					//Set text
 
+					tvDialogText = (TextView) dialog.findViewById(R.id.tv_dialog_notification_text);
 
+					tvDialogText.setText(actionText);
 
 
-									//Set up the action button
 
-									btDialogAction.setVisibility(View.VISIBLE);
 
-									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_lablanca));
 
-									btDialogAction.setOnClickListener(new OnClickListener() {
 
-										@Override
 
-										public void onClick(View v) {
 
-											dialog.dismiss();
 
-											loadSection(GM.SECTION_LABLANCA);
 
-										}
 
-									});
 
-									break;
 
-
 
-								case GM.EXTRA_ACTION_LOCATION:
 
-
 
-									if (!preferences.getString(GM.PREF_GM_LOCATION, GM.DEFAULT_PREF_GM_LOCATION).equals(GM.DEFAULT_PREF_GM_LOCATION)) {
 
-										//Set up the action button if location is reported
 
-										btDialogAction.setVisibility(View.VISIBLE);
 
-										btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_location));
 
-										btDialogAction.setOnClickListener(new OnClickListener() {
 
-											@Override
 
-											public void onClick(View v) {
 
-												dialog.dismiss();
 
-												loadSection(GM.SECTION_LOCATION);
 
-											}
 
-										});
 
+					//Set close button
 
+					btDialogClose = (Button) dialog.findViewById(R.id.bt_dialog_notification_close);
 
+					btDialogClose.setOnClickListener(new OnClickListener() {
 
+						@Override
 
+						public void onClick(View v) {
 
+							dialog.dismiss();
 
+						}
 
+					});
 
 
+					//Set the icon
 
+					dialogIcon = getResources().getDrawable(R.drawable.ic_launcher);
 
+					if (dialogIcon != null) {
 
+						dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
 
+					}
 
+					tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
 
+					tvDialogTitle.setCompoundDrawablePadding(20);
 
+
 
+					//Get preferences
 
+					boolean festivals = sharedData.getBoolean(GM.DATA.KEY.LABLANCA, GM.DATA.DEFAULT.LABLANCA);
 
+
 
+					//Set the action button
 
+					btDialogAction = (Button) dialog.findViewById(R.id.bt_dialog_notification_action);
 
+					if (action != null) {
 
+						switch (action) {
 
+
 
+							case GM.EXTRA_ACTION_LABLANCA:
 
+
 
+								//Set up the action button
 
+								btDialogAction.setVisibility(View.VISIBLE);
 
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_lablanca));
 
+								btDialogAction.setOnClickListener(new OnClickListener() {
 
+									@Override
 
+									public void onClick(View v) {
 
+										dialog.dismiss();
 
+										loadSection(GM.SECTION_LABLANCA);
 
 									}
 
-									break;
 
+								});
 
+								break;
 
 
-								case GM.EXTRA_ACTION_BLOG:
 
+							case GM.EXTRA_ACTION_LOCATION:
 
 
-									//Set up the action button
 
+								//TODO: Read from database
 
+								if (!sharedData.getString(GM.PREF_GM_LOCATION, GM.DEFAULT_PREF_GM_LOCATION).equals(GM.DEFAULT_PREF_GM_LOCATION)) {
 
+									//Set up the action button if location is reported
 
 									btDialogAction.setVisibility(View.VISIBLE);
 
-									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_blog));
 
+									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_location));
 
 									btDialogAction.setOnClickListener(new OnClickListener() {
 
 										@Override
 
 										public void onClick(View v) {
 
 											dialog.dismiss();
 
-											loadSection(GM.SECTION_BLOG);
 
+											loadSection(GM.SECTION_LOCATION);
 
 										}
 
 									});
 
-									break;
 
 
-								case GM.EXTRA_ACTION_ACTIVITIES:
 
+								}
 
+								break;
 
+
 
+							case GM.EXTRA_ACTION_BLOG:
 
+
 
+								//Set up the action button
 
+								btDialogAction.setVisibility(View.VISIBLE);
 
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_blog));
 
+								btDialogAction.setOnClickListener(new OnClickListener() {
 
+									@Override
 
+									public void onClick(View v) {
 
+										dialog.dismiss();
 
+										loadSection(GM.SECTION_BLOG);
 
+									}
 
+								});
 
+								break;
 
+
 
+							case GM.EXTRA_ACTION_ACTIVITIES:
 
+
 
+								//Set up the action button
 
+								btDialogAction.setVisibility(View.VISIBLE);
 
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_activities));
 
+								btDialogAction.setOnClickListener(new OnClickListener() {
 
+									@Override
 
+									public void onClick(View v) {
 
+										dialog.dismiss();
 
+										loadSection(GM.SECTION_ACTIVITIES);
 
+									}
 
+								});
 
+								break;
 
+
 
+							case GM.EXTRA_ACTION_GALLERY:
 
+
 
+								//Set up the action button
 
+								btDialogAction.setVisibility(View.VISIBLE);
 
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gallery));
 
+								btDialogAction.setOnClickListener(new OnClickListener() {
 
+									@Override
 
+									public void onClick(View v) {
 
+										dialog.dismiss();
 
+										loadSection(GM.SECTION_GALLERY);
 
+									}
 
+								});
 
+								break;
 
 
+							case GM.EXTRA_ACTION_GMSCHEDULE:
 
+
 
+								if (festivals) {
 
 									//Set up the action button
 
 									btDialogAction.setVisibility(View.VISIBLE);
 
-									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_activities));
 
+									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gmschedule));
 
 									btDialogAction.setOnClickListener(new OnClickListener() {
 
 										@Override
 
 										public void onClick(View v) {
 
 											dialog.dismiss();
 
-											loadSection(GM.SECTION_ACTIVITIES);
 
+											loadSection(GM.SECTION_LABLANCA_GM_SCHEDULE);
 
 										}
 
 									});
 
-									break;
 
-
 
-								case GM.EXTRA_ACTION_GALLERY:
 
+								}
 
+								break;
 
 
+							case GM.EXTRA_ACTION_CITYSCHEDULE:
 
+								if (festivals) {
 
 									//Set up the action button
 
 									btDialogAction.setVisibility(View.VISIBLE);
 
-									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gallery));
 
+									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_cityschedule));
 
 									btDialogAction.setOnClickListener(new OnClickListener() {
 
 										@Override
 
 										public void onClick(View v) {
 
 											dialog.dismiss();
 
-											loadSection(GM.SECTION_GALLERY);
 
+											loadSection(GM.SECTION_LABLANCA_SCHEDULE);
 
 										}
 
 									});
 
-									break;
 
-
 
-								case GM.EXTRA_ACTION_GMSCHEDULE:
 
-
 
-									if (festivals == 1) {
 
-										//Set up the action button
 
-										btDialogAction.setVisibility(View.VISIBLE);
 
-										btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gmschedule));
 
-										btDialogAction.setOnClickListener(new OnClickListener() {
 
-											@Override
 
-											public void onClick(View v) {
 
-												dialog.dismiss();
 
-												loadSection(GM.SECTION_LABLANCA_GM_SCHEDULE);
 
-											}
 
-										});
 
-									}
 
-									break;
 
-
 
-								case GM.EXTRA_ACTION_CITYSCHEDULE:
 
-									if (festivals == 1) {
 
-										//Set up the action button
 
-										btDialogAction.setVisibility(View.VISIBLE);
 
-										btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_cityschedule));
 
-										btDialogAction.setOnClickListener(new OnClickListener() {
 
-											@Override
 
-											public void onClick(View v) {
 
-												dialog.dismiss();
 
-												loadSection(GM.SECTION_LABLANCA_SCHEDULE);
 
-											}
 
-										});
 
-									}
 
-									break;
 
-
 
-								//If the notification is just text
 
-								default:
 
-									//Hide action button
 
-									btDialogAction.setVisibility(View.GONE);
 
-							}
 
-						} else {
 
-							btDialogAction.setVisibility(View.GONE);
 
-						}
 
+								}
 
+								break;
 
 
-						//Set dialog parameters
 
-						WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
 
-						lp.copyFrom(dialog.getWindow().getAttributes());
 
-						lp.width = WindowManager.LayoutParams.MATCH_PARENT;
 
-						lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
 
-						lp.gravity = Gravity.CENTER;
 
-						lp.dimAmount = 0.4f;
 
-						dialog.getWindow().setAttributes(lp);
 
-
 
-						//Show dialog
 
-						dialog.show();
 
+							//If the notification is just text
 
+							default:
 
+								//Hide action button
 
+								btDialogAction.setVisibility(View.GONE);
 
+						}
 
+					} else {
 
+						btDialogAction.setVisibility(View.GONE);
 
 					}
 
+
 
+					//Set dialog parameters
 
+					WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
 
+					lp.copyFrom(dialog.getWindow().getAttributes());
 
+					lp.width = WindowManager.LayoutParams.MATCH_PARENT;
 
+					lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
 
+					lp.gravity = Gravity.CENTER;
 
+					lp.dimAmount = 0.4f;
 
+					dialog.getWindow().setAttributes(lp);
 
+
 
+					//Show dialog
 
+					dialog.show();
 
 				}
 
 			}
 
 		}
 
@@ -632,7 +625,7 @@ public class MainActivity extends Activity {
 
 	private void deleteDatabase() {
 
 		SQLiteDatabase db;
 
 		try {
 
-			deleteDatabase(GM.DB_NAME);
 
+			getApplicationContext().deleteDatabase(GM.DB_NAME);
 
 		} catch (Exception ex) {
 
 			Log.e("Error deleting database", ex.toString());
 
 		}

+ 2 - 2
app/src/main/java/com/ivalentin/margolariak/PostComment.java
Wyświetl plik 

@@ -61,8 +61,8 @@ class PostComment extends AsyncTask<String, String, Integer> {
 
         pb.setVisibility(View.VISIBLE);
 
 
         //Get user code
 
-        SharedPreferences preferences = context.getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
-        userCode = preferences.getString(GM.USER_CODE, "");
 
+        SharedPreferences sharedData = context.getSharedPreferences(GM.DATA.DATA, Context.MODE_PRIVATE);
 
+        userCode = sharedData.getString(GM.DATA.KEY.USER, GM.DATA.DEFAULT.USER);
 
     }
 
 
     /**

+ 250 - 78
app/src/main/java/com/ivalentin/margolariak/SettingsActivity.java
Wyświetl plik 

@@ -1,118 +1,290 @@
 
 package com.ivalentin.margolariak;
 
 
+import android.annotation.SuppressLint;
 
+import android.app.Activity;
 
+import android.app.Dialog;
 
+import android.content.Intent;
 
 import android.content.SharedPreferences;
 
+import android.graphics.Color;
 
+import android.graphics.drawable.ColorDrawable;
 
+import android.net.Uri;
 
 import android.os.Bundle;
 
-import android.preference.CheckBoxPreference;
 
-import android.preference.Preference;
 
-import android.preference.PreferenceActivity;
 
-import java.text.DecimalFormat;
 
-import java.text.NumberFormat;
 
+import android.util.Log;
 
+import android.view.Gravity;
 
+import android.view.View;
 
+import android.view.Window;
 
+import android.view.WindowManager;
 
+import android.webkit.WebView;
 
+import android.widget.Button;
 
+import android.widget.CheckBox;
 
+import android.widget.LinearLayout;
 
+import android.widget.TextView;
 
 
-public class SettingsActivity extends PreferenceActivity {
 
+/**
 
+ * Activity that allows the user to change the app settings.
 
+ *
 
+ * @author Iñigo Valentin
 
+ * @see Activity
 
+ */
 
+public class SettingsActivity extends Activity {
 
+
 
+	//Assign menu items
 
+	private LinearLayout llSync;
 
+	private LinearLayout llNotifications;
 
+	private CheckBox cbSync, cbNotifications;
 
+	private TextView tvSync;
 
+	private TextView tvNotifications;
 
+	private SharedPreferences preferences;
 
+	private SharedPreferences.Editor editor;
 
+
 
+	/**
 
+	 * Run when the app is created. Assigns views, configures their initial
 
+	 * states, and sets listeners
 
+	 *
 
+	 * @param savedInstanceState Activity state.
 
+	 *
 
+	 * @see Activity#onCreate(Bundle)
 
+	 */
 
+	@SuppressLint("CommitPrefEdits") // apply() is called in other methods
 
 	@Override
 
 	public void onCreate(Bundle savedInstanceState) {
 
 		super.onCreate(savedInstanceState);
 
 
-		// Load the preferences from an XML resource
 
-		addPreferencesFromResource(R.xml.preferences);
 
+		//Remove title bar.
 
+		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 
+		super.onCreate(savedInstanceState);
 
+
 
 
-		SharedPreferences sp = getPreferenceScreen().getSharedPreferences();
 
+		//Set layout.
 
+		setContentView(R.layout.activity_settings);
 
 
-		//Set up Sync preference
 
-		CheckBoxPreference prefSync = (CheckBoxPreference) getPreferenceManager().findPreference(GM.KEY_PREFERENCE_SYNC);
 
-		if (prefSync.isChecked()){
 
-			prefSync.setSummary(getString(R.string.preferences_sync_sync_on));
 
+		//Assign views
 
+		llSync = (LinearLayout) findViewById(R.id.ll_settings_sync);
 
+		llNotifications = (LinearLayout) findViewById(R.id.ll_settings_notifications);
 
+		LinearLayout llVersion = (LinearLayout) findViewById(R.id.ll_settings_version);
 
+		LinearLayout llSource = (LinearLayout) findViewById(R.id.ll_settings_source);
 
+		LinearLayout llFeedback = (LinearLayout) findViewById(R.id.ll_settings_feedback);
 
+		tvSync = (TextView) findViewById(R.id.tv_settings_sync);
 
+		tvNotifications = (TextView) findViewById(R.id.tv_settings_notifications);
 
+		TextView tvVersion = (TextView) findViewById(R.id.tv_settings_version);
 
+		cbSync = (CheckBox) findViewById(R.id.cb_settings_sync);
 
+		cbNotifications = (CheckBox) findViewById(R.id.cb_settings_notifications);
 
+
 
+		//Open preferences
 
+		preferences = getSharedPreferences(GM.PREFERENCES.PREFERNCES, MODE_PRIVATE);
 
+		editor = preferences.edit();
 
+
 
+		//Set up sync preferences. Incidentally, also sets initial state for notifications.
 
+		if (preferences.getBoolean(GM.PREFERENCES.KEY.SYNC, GM.PREFERENCES.DEFAULT.SYNC)){
 
+			tvSync.setText(R.string.preferences_sync_sync_on);
 
+			cbSync.setChecked(true);
 
+			enableNotifications();
 
 		}
 
 		else{
 
-			prefSync.setSummary(getString(R.string.preferences_sync_sync_off));
 
+			tvSync.setText(R.string.preferences_sync_sync_off);
 
+			cbSync.setChecked(false);
 
+			disableNotifications();
 
 		}
 
-		prefSync.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
 
-
 
-			public boolean onPreferenceChange(Preference preference, Object newValue) {
 
-				CheckBoxPreference prefNotification = (CheckBoxPreference) getPreferenceManager().findPreference(GM.KEY_PREFERENCE_NOTIFICATION);
 
-				if (newValue.toString().equals("true")) {
 
-					preference.setSummary(getString(R.string.preferences_sync_sync_on));
 
-					if (prefNotification.isChecked()){
 
-						prefNotification.setSummary(getString(R.string.preferences_sync_notifications_on));
 
-					}
 
-					else{
 
-						prefNotification.setSummary(getString(R.string.preferences_sync_notifications_off));
 
-					}
 
-					prefNotification.setEnabled(true);
 
-				} else {
 
-					prefNotification.setEnabled(false);
 
-					prefNotification.setSummary(getString(R.string.preferences_sync_notifications_disabled));
 
-					preference.setSummary(getString(R.string.preferences_sync_sync_off));
 
-				}
 
-				return true;
 
+
 
+		//Set up version preference
 
+		tvVersion.setText(com.ivalentin.margolariak.BuildConfig.VERSION_NAME);
 
+		llVersion.setOnClickListener(new View.OnClickListener() {
 
+			@Override
 
+			public void onClick(View v) {
 
+				blink(v);
 
+				showChangelog();
 
 			}
 
 		});
 
 
-		//Set up Notification preference
 
-		CheckBoxPreference prefNotification = (CheckBoxPreference) getPreferenceManager().findPreference(GM.KEY_PREFERENCE_NOTIFICATION);
 
-		if (!prefSync.isChecked()){
 
-			prefNotification.setEnabled(false);
 
-		}
 
-		else {
 
-			prefNotification.setEnabled(true);
 
-			if(!prefSync.isChecked()){
 
-				//TODO
 
+		//Set up source preference
 
+		llSource.setOnClickListener(new View.OnClickListener() {
 
+			@Override
 
+			public void onClick(View v) {
 
+				blink(v);
 
+				Intent i = new Intent(Intent.ACTION_VIEW);
 
+				i.setData(Uri.parse(GM.URL.GITHUB));
 
+				startActivity(i);
 
 			}
 
-			if (prefNotification.isChecked()) {
 
-				prefNotification.setSummary(getString(R.string.preferences_sync_notifications_on));
 
-			} else {
 
-				prefNotification.setSummary(getString(R.string.preferences_sync_notifications_off));
 
+		});
 
+
 
+		//Set up feedback preference
 
+		llFeedback.setOnClickListener(new View.OnClickListener() {
 
+			@Override
 
+			public void onClick(View v) {
 
+				blink(v);
 
+				//TODO: Show dialog to enter text
 
 			}
 
-		}
 
+		});
 
+	}
 
+
 
+	/**
 
+	 * UI feedback for touched settings.
 
+	 * Just makes them blink.
 
+	 *
 
+	 * @param v The view to be made to blink
 
+	 */
 
+	private void blink(View v){
 
+		final View view = v;
 
+
 
+		//These are the colors of the menu background
 
+		final int r = 0;
 
+		final int g = 120;
 
+		final int b = 255;
 
+
 
+		new Thread(){
 
+
 
+			@Override
 
+			public void run() {
 
 
-		prefNotification.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
 
+				//Alpha
 
+				int a  = 250;
 
 
-			public boolean onPreferenceChange(Preference preference, Object newValue) {
 
-				if (newValue.toString().equals("true")) {
 
-					preference.setSummary(getString(R.string.preferences_sync_notifications_on));
 
-				} else {
 
-					preference.setSummary(getString(R.string.preferences_sync_notifications_off));
 
+				try {
 
+					while (a >= 0) {
 
+						final int passAlpha = a;
 
+						runOnUiThread(new Runnable() {
 
+										  @Override
 
+										  public void run() {
 
+											  view.setBackgroundColor(Color.argb(passAlpha, r, g, b));
 
+										  }
 
+									  });
 
+
 
+						a -= 10;
 
+						sleep(10);
 
+					}
 
+				}
 
+				catch (InterruptedException e) {
 
+					view.setBackgroundColor(Color.argb(0, r, g, b));
 
 				}
 
-				return true;
 
 			}
 
-		});
 
+		}.start();
 
 
+	}
 
 
-		//Set up data preference
 
-		long bgData = sp.getLong(GM.STORAGE_TRAFFIC_BG_RECEIVED, 0) + sp.getLong(GM.STORAGE_TRAFFIC_BG_SENT, 0);
 
-		long fgData = sp.getLong(GM.STORAGE_TRAFFIC_FG_RECEIVED, 0) + sp.getLong(GM.STORAGE_TRAFFIC_FG_SENT, 0);
 
-		String value;
 
-		if (bgData < 1500){
 
-			value = bgData + getString(R.string.Kb);
 
+	/**
 
+	 * Not called from code, but referenced from activity_settings.xml.
 
+	 * Toggles the value of the sync preferences, changing the actual
 
+	 * preference, the ui, and, if set to disabled, it also disables the
 
+	 * notification setting.
 
+	 *
 
+	 * @param v Ignored
 
+	 */
 
+	public void toggleSync(View v){
 
+		blink(llSync);
 
+		editor.putBoolean(GM.PREFERENCES.KEY.SYNC, !preferences.getBoolean(GM.PREFERENCES.KEY.SYNC, GM.PREFERENCES.DEFAULT.SYNC));
 
+		editor.apply();
 
+		if (preferences.getBoolean(GM.PREFERENCES.KEY.SYNC, GM.PREFERENCES.DEFAULT.SYNC)){
 
+			tvSync.setText(R.string.preferences_sync_sync_on);
 
+			cbSync.setChecked(true);
 
+			enableNotifications();
 
+		}
 
+		else{
 
+			tvSync.setText(R.string.preferences_sync_sync_off);
 
+			cbSync.setChecked(false);
 
+			disableNotifications();
 
 		}
 
-		else if(bgData < 5 * 1024){
 
-			NumberFormat formatter = new DecimalFormat("#0.00");
 
-			value = (formatter.format(((float) bgData) / 1024.0)) + getString(R.string.Mb);
 
+	}
 
+
 
+	/**
 
+	 * Not called from code, but referenced from activity_settings.xml.
 
+	 * Toggles the value of the notification preferences, changing the
 
+	 * actual preference and the ui.
 
+	 *
 
+	 * @param v Ignored
 
+	 */
 
+	public void toggleNotifications(View v){
 
+		if (preferences.getBoolean(GM.PREFERENCES.KEY.SYNC, GM.PREFERENCES.DEFAULT.SYNC)) {
 
+			blink(llNotifications);
 
+			editor.putBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, !preferences.getBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, GM.PREFERENCES.DEFAULT.NOTIFICATIONS));
 
+			editor.apply();
 
+			if (preferences.getBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, GM.PREFERENCES.DEFAULT.NOTIFICATIONS)) {
 
+				tvNotifications.setText(R.string.preferences_sync_notifications_on);
 
+				cbNotifications.setChecked(true);
 
+			} else {
 
+				tvNotifications.setText(R.string.preferences_sync_notifications_off);
 
+				cbNotifications.setChecked(false);
 
+			}
 
 		}
 
 		else{
 
-			value = String.valueOf((int) (((float) bgData) / 1024.0)) + getString(R.string.Mb);
 
+			cbNotifications.setChecked(false);
 
 		}
 
-		Preference prefData = getPreferenceManager().findPreference(GM.KEY_PREFERENCE_DATA);
 
-		prefData.setSummary(value);
 
+	}
 
 
+	/**
 
+	 * Enables the notification setting toggler. Must be called when
 
+	 * the sync preference changes to true.
 
+	 */
 
+	private void enableNotifications(){
 
+		llNotifications.setAlpha(1);
 
+		if (preferences.getBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, GM.PREFERENCES.DEFAULT.NOTIFICATIONS)){
 
+			tvNotifications.setText(R.string.preferences_sync_notifications_on);
 
+			cbNotifications.setChecked(true);
 
+		}
 
+		else{
 
+			tvNotifications.setText(R.string.preferences_sync_notifications_off);
 
+			cbNotifications.setChecked(false);
 
+		}
 
 
+	}
 
 
-		//Set up version preference
 
-		Preference prefVersion = getPreferenceManager().findPreference(GM.KEY_PREFERENCE_VERSION);
 
-		prefVersion.setSummary(com.ivalentin.margolariak.BuildConfig.VERSION_NAME);
 
-		prefNotification.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 
+	/**
 
+	 * Enables the notification setting toggler. Must be called when
 
+	 * the sync preference changes to false.
 
+	 */
 
+	private void disableNotifications(){
 
+		llNotifications.setAlpha(0.4f);
 
+		tvNotifications.setText(R.string.preferences_sync_notifications_disabled);
 
+		cbNotifications.setChecked(false);
 
+	}
 
+
 
+	private void showChangelog(){
 
+
 
+		//Create the dialog
 
+		final Dialog dialog = new Dialog(SettingsActivity.this);
 
+
 
+		//Set up dialog window
 
+		dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
 
+		dialog.setContentView(R.layout.dialog_changelog);
 
+
 
+		//Set the web view
 
+		WebView wv = (WebView) dialog.findViewById(R.id.wv_changelog);
 
+		wv.getSettings().setAllowContentAccess(true);
 
+		Log.e("URL", "file:///android_assets/changelog_" + GM.getLang() + ".html");
 
+		wv.loadUrl("file:///android_asset/changelog_" + GM.getLang() + ".html");
 
+
 
+		//Set close button
 
+		Button bt = (Button) dialog.findViewById(R.id.bt_changelog);
 
+		bt.setOnClickListener(new View.OnClickListener() {
 
 			@Override
 
-			public boolean onPreferenceClick(Preference preference) {
 
-				//TODO
 
-				return false;
 
+			public void onClick(View v) {
 
+				dialog.dismiss();
 
 			}
 
 		});
 
 
-		//Set up source preference
 
-		//TODO
 
+		//Prep the dialog
 
+		WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
 
+		lp.copyFrom(dialog.getWindow().getAttributes());
 
+		lp.width = WindowManager.LayoutParams.MATCH_PARENT;
 
+		lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
 
+		lp.gravity = Gravity.CENTER;
 
+		//lp.dimAmount = 0.0f;
 
+		dialog.getWindow().setAttributes(lp);
 
+		dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
 
-		//Set up feedback preference
 
-		//TODO
 
+		//Show dialog
 
+		dialog.show();
 
+
 
+	}
 
 
+	/**
 
+	 * Not called from code, but referenced from activity_settings.xml.
 
+	 * Finishes the activity.
 
+	 *
 
+	 * @param v Ignored
 
+	 *
 
+	 * @see Activity#finish()
 
+	 */
 
+	public void finish(View v){
 
+		finish();
 
 	}
 
 }

+ 6 - 6
app/src/main/java/com/ivalentin/margolariak/SettingsLayout.java
Wyświetl plik 

@@ -59,8 +59,8 @@ public class SettingsLayout extends Fragment{
 
 
 
 		//Set initial state of the notification  settings
 
-		SharedPreferences settings = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
-		if (settings.getInt(GM.PREF_NOTIFICATION, GM.DEFAULT_PREF_NOTIFICATION) == 1){
 
+		SharedPreferences settings = view.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
+		if (settings.getBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, GM.PREFERENCES.DEFAULT.NOTIFICATIONS)){
 
 			cbNotification.setChecked(true);
 
 			tvNotification.setText(view.getContext().getString(R.string.settings_notification_on));
 
 		}
 
@@ -76,17 +76,17 @@ public class SettingsLayout extends Fragment{
 
 				if (cbNotification.isChecked()){
 
 					cbNotification.setChecked(false);
 
 					tvNotification.setText(view.getContext().getString(R.string.settings_notification_off));
 
-					SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+					SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 					SharedPreferences.Editor editor = preferences.edit();
 
-					editor.putInt(GM.PREF_NOTIFICATION, 0);
 
+					editor.putBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, false);
 
 					editor.apply();
 
 				}
 
 				else{
 
 					cbNotification.setChecked(true);
 
 					tvNotification.setText(view.getContext().getString(R.string.settings_notification_on));
 
-					SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+					SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREFERENCES.PREFERNCES, Context.MODE_PRIVATE);
 
 					SharedPreferences.Editor editor = preferences.edit();
 
-					editor.putInt(GM.PREF_NOTIFICATION, 1);
 
+					editor.putBoolean(GM.PREFERENCES.KEY.NOTIFICATIONS, true);
 
 					editor.apply();
 
 				}
 
 			}

+ 3 - 2
app/src/main/java/com/ivalentin/margolariak/Sync.java
Wyświetl plik 

@@ -585,10 +585,10 @@ class Sync extends AsyncTask<Void, Void, Void> {
 
 	protected Void doInBackground(Void... params) {
 
 
 		//Get preferences
 
-		SharedPreferences preferences = myContextRef.getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
 
+		SharedPreferences preferences = myContextRef.getSharedPreferences(GM.DATA.DATA, Context.MODE_PRIVATE);
 
 
 		//Get useful data for the uri
 
-		String userCode = preferences.getString(GM.USER_CODE, "");
 
+		String userCode = preferences.getString(GM.DATA.KEY.USER, GM.DATA.DEFAULT.USER);
 
 
 		//Get database. Stop if it's locked
 
 		SQLiteDatabase db = myContextRef.openOrCreateDatabase(GM.DB_NAME, Activity.MODE_PRIVATE, null);
 
@@ -667,6 +667,7 @@ class Sync extends AsyncTask<Void, Void, Void> {
 
 				default:
 
 					Log.e("SYNC", "The server returned an unexpected code (" + httpCode + ") for the url \"" + uri + "\"");
 
 			}
 
+
 
 			urlConnection.disconnect();
 
 			return null;

+ 9 - 1
app/src/main/res/drawable/entry.xml
Wyświetl plik 

@@ -4,6 +4,14 @@
 
     <stroke
 
         android:width="1dp"
 
         android:color="@color/entry_border" />
 
-    <solid android:color="@color/entry_background" />
 
+
 
+    <solid
 
+        android:color="@color/entry_background" />
 
+
 
+    <corners
 
+        android:bottomRightRadius="4dp"
 
+        android:bottomLeftRadius="4dp"
 
+        android:topLeftRadius="4dp"
 
+        android:topRightRadius="4dp"/>
 
 
 </shape>

+ 13 - 0
app/src/main/res/drawable/gradient_v_white.xml
Wyświetl plik 

@@ -0,0 +1,13 @@
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
 
+
 
+    <gradient
 
+        android:angle="90"
 
+        android:endColor="#00ffffff"
 
+        android:startColor="#ffffffff"
 
+        android:type="linear" />
 
+
 
+    <corners
 
+        android:radius="0dp"/>
 
+
 
+</shape>

+ 15 - 0
app/src/main/res/drawable/row_home_image.xml
Wyświetl plik 

@@ -0,0 +1,15 @@
 
+<shape
 
+    xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:shape="rectangle" >
 
+
 
+    <stroke
 
+        android:width="1dp"
 
+        android:color="@color/image_border" />
 
+
 
+    <corners
 
+        android:bottomRightRadius="2dp"
 
+        android:bottomLeftRadius="2dp"
 
+        android:topLeftRadius="2dp"
 
+        android:topRightRadius="2dp"/>
 
+
 
+</shape>

+ 14 - 5
app/src/main/res/drawable/section.xml
Wyświetl plik 

@@ -1,9 +1,18 @@
 
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
 
+<shape
 
+    xmlns:android="http://schemas.android.com/apk/res/android"
 
     android:shape="rectangle" >
 
 
-    <!--<stroke-->
 
-        <!--android:width="2dp"-->
 
-        <!--android:color="@color/section_border" />-->
 
-    <solid android:color="@color/section_background" />
 
+    <stroke
 
+        android:width="1dp"
 
+        android:color="@color/section_border" />
 
+
 
+    <solid
 
+        android:color="@color/section_background" />
 
+
 
+    <corners
 
+        android:bottomRightRadius="5dp"
 
+        android:bottomLeftRadius="5dp"
 
+        android:topLeftRadius="8dp"
 
+        android:topRightRadius="8dp"/>
 
 
 </shape>

+ 16 - 0
app/src/main/res/drawable/section_title.xml
Wyświetl plik 

@@ -0,0 +1,16 @@
 
+<shape
 
+    xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:shape="rectangle" >
 
+
 
+    <stroke
 
+        android:width="1dp"
 
+        android:color="@color/section_border" />
 
+
 
+    <solid
 
+        android:color="@color/section_title_background" />
 
+
 
+    <corners
 
+        android:topLeftRadius="8dp"
 
+        android:topRightRadius="8dp"/>
 
+
 
+</shape>

+ 22 - 12
app/src/main/res/layout/activity_main.xml
Wyświetl plik 

@@ -9,7 +9,7 @@
 
 	<LinearLayout
 
 		android:layout_width="fill_parent"
 
 		android:layout_height="wrap_content"
 
-		android:background="@drawable/titlebar"
 
+		android:background="@color/background_menu"
 
 		android:gravity="center_vertical"
 
 		android:orientation="horizontal"
 
 		android:padding="2dp">
 
@@ -46,7 +46,8 @@
 
 				android:gravity="center"
 
 				android:text="@string/app_name"
 
 				android:textSize="18sp"
 
-				android:textStyle="bold" />
 
+				android:textStyle="bold"
 
+				android:textColor="@color/menu_entry"/>
 
 
 			<!-- Section title -->
 
 
@@ -56,7 +57,8 @@
 
 				android:layout_height="wrap_content"
 
 				android:gravity="center"
 
 				android:text="@string/menu_home"
 
-				android:textSize="20sp" />
 
+				android:textSize="20sp"
 
+				android:textColor="@color/menu_entry"/>
 
 
 		</LinearLayout>
 
 
@@ -91,7 +93,7 @@
 
 		android:scrollIndicators="none"
 
 		android:requiresFadingEdge="horizontal"
 
 		android:fadingEdgeLength="125dp"
 
-		android:background="@color/background_bar_gradient"
 
+		android:background="@color/background_menu"
 
 		tools:ignore="UnusedAttribute">
 
 
 		<LinearLayout
 
@@ -117,7 +119,8 @@
 
 					android:textSize="15sp"
 
 					android:layout_centerInParent="true"
 
 					android:textStyle="bold"
 
-					android:id="@+id/tv_menu_home"/>
 
+					android:id="@+id/tv_menu_home"
 
+					android:textColor="@color/menu_entry"/>
 
 
 				<ImageView
 
 					android:layout_width="match_parent"
 
@@ -150,7 +153,8 @@
 
 					android:layout_gravity="top"
 
 					android:textSize="15sp"
 
 					android:layout_centerInParent="true"
 
-					android:id="@+id/tv_menu_location"/>
 
+					android:id="@+id/tv_menu_location"
 
+					android:textColor="@color/menu_entry"/>
 
 
 				<ImageView
 
 					android:layout_width="match_parent"
 
@@ -183,7 +187,8 @@
 
 					android:layout_gravity="top"
 
 					android:textSize="15sp"
 
 					android:layout_centerInParent="true"
 
-					android:id="@+id/tv_menu_lablanca"/>
 
+					android:id="@+id/tv_menu_lablanca"
 
+					android:textColor="@color/menu_entry"/>
 
 
 				<ImageView
 
 					android:layout_width="match_parent"
 
@@ -216,7 +221,8 @@
 
 					android:layout_gravity="top"
 
 					android:textSize="15sp"
 
 					android:layout_centerInParent="true"
 
-					android:id="@+id/tv_menu_activities"/>
 
+					android:id="@+id/tv_menu_activities"
 
+					android:textColor="@color/menu_entry"/>
 
 
 				<ImageView
 
 					android:layout_width="match_parent"
 
@@ -249,7 +255,8 @@
 
 					android:layout_gravity="top"
 
 					android:textSize="15sp"
 
 					android:layout_centerInParent="true"
 
-					android:id="@+id/tv_menu_blog"/>
 
+					android:id="@+id/tv_menu_blog"
 
+					android:textColor="@color/menu_entry"/>
 
 
 				<ImageView
 
 					android:layout_width="match_parent"
 
@@ -282,7 +289,8 @@
 
 					android:layout_gravity="top"
 
 					android:textSize="15sp"
 
 					android:layout_centerInParent="true"
 
-					android:id="@+id/tv_menu_gallery"/>
 
+					android:id="@+id/tv_menu_gallery"
 
+					android:textColor="@color/menu_entry"/>
 
 
 				<ImageView
 
 					android:layout_width="match_parent"
 
@@ -305,13 +313,15 @@
 
 	<ScrollView
 
 		android:layout_width="fill_parent"
 
 		android:layout_height="wrap_content"
 
-		android:id="@+id/sv_main_content">
 
+		android:id="@+id/sv_main_content"
 
+		android:background="@color/background_app">
 
 
 		<FrameLayout
 
 			android:id="@+id/activity_main_content_fragment"
 
 			android:layout_width="match_parent"
 
 			android:layout_height="match_parent"
 
-			tools:ignore="ScrollViewSize">
 
+			tools:ignore="ScrollViewSize"
 
+			android:background="@color/background_app">
 
 
 		</FrameLayout>
 
 	</ScrollView>

+ 339 - 0
app/src/main/res/layout/activity_settings.xml
Wyświetl plik 

@@ -0,0 +1,339 @@
 
+<LinearLayout
 
+    xmlns:android="http://schemas.android.com/apk/res/android"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    xmlns:tools="http://schemas.android.com/tools"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="fill_parent"
 
+    android:orientation="vertical">
 
+
 
+    <LinearLayout
 
+        android:layout_width="fill_parent"
 
+        android:layout_height="wrap_content"
 
+        android:background="@color/background_menu"
 
+        android:gravity="center_vertical"
 
+        android:orientation="horizontal"
 
+        android:padding="2dp">
 
+
 
+        <ImageView
 
+            android:contentDescription="@string/app_name"
 
+            android:layout_width="40dp"
 
+            android:layout_height="40dp"
 
+            android:id="@+id/iv_logo"
 
+            android:src="@drawable/ic_launcher"
 
+            android:adjustViewBounds="true"
 
+            android:layout_weight=".2"
 
+            android:maxHeight="45dp"
 
+            android:maxWidth="45dp"
 
+            android:padding="1dp"/>
 
+
 
+        <LinearLayout
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:layout_gravity="center"
 
+            android:layout_weight=".8"
 
+            android:gravity="center"
 
+            android:orientation="vertical" >
 
+
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:gravity="center"
 
+                android:text="@string/app_name"
 
+                android:contentDescription="@string/app_name"
 
+                android:textSize="18sp"
 
+                android:textStyle="bold"
 
+                android:textColor="@color/menu_entry"/>
 
+
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:gravity="center"
 
+                android:text="@string/menu_settings"
 
+                android:textSize="20sp"
 
+                android:textColor="@color/menu_entry"/>
 
+
 
+        </LinearLayout>
 
+
 
+        <ImageButton
 
+            android:layout_width="40dp"
 
+            android:layout_height="match_parent"
 
+            android:src="@android:drawable/ic_menu_revert"
 
+            android:onClick="finish"
 
+            android:contentDescription="@string/accept"
 
+            android:layout_weight=".2"
 
+            android:id="@+id/bt_back"
 
+            app:srcCompat="@android:drawable/ic_menu_revert"
 
+            android:background="#00000000"/>
 
+
 
+    </LinearLayout>
 
+
 
+    <ScrollView
 
+        android:layout_width="fill_parent"
 
+        android:layout_height="wrap_content"
 
+        android:background="@color/background_app">
 
+
 
+        <LinearLayout
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            tools:ignore="ScrollViewSize"
 
+            android:background="@color/background_app"
 
+            android:orientation="vertical">
 
+
 
+            <TextView
 
+                android:text="@string/preferences_sync"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="wrap_content"
 
+                android:textStyle="bold"
 
+                android:textColor="@color/background_menu"
 
+                android:paddingEnd="10dp"
 
+                android:paddingLeft="10dp"
 
+                android:paddingRight="10dp"
 
+                android:paddingStart="10dp"
 
+                android:textSize="20sp"
 
+                android:layout_marginBottom="5dp"
 
+                android:background="@color/section_background"/>
 
+
 
+            <LinearLayout
 
+                android:orientation="horizontal"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="match_parent"
 
+                android:id="@+id/ll_settings_sync"
 
+                android:padding="10dp"
 
+                android:layout_marginBottom="5dp"
 
+                android:onClick="toggleSync">
 
+
 
+                <LinearLayout
 
+                    android:orientation="vertical"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="match_parent"
 
+                    android:layout_weight=".15">
 
+
 
+                    <TextView
 
+                        android:text="@string/preferences_sync_sync"
 
+                        android:layout_width="match_parent"
 
+                        android:layout_height="wrap_content"
 
+                        android:textSize="18sp"
 
+                        android:textColor="@android:color/black"
 
+                        />
 
+
 
+                    <TextView
 
+                        android:text="@string/preferences_sync_sync_on"
 
+                        android:layout_width="match_parent"
 
+                        android:layout_height="wrap_content"
 
+                        android:id="@+id/tv_settings_sync"
 
+                        android:textSize="16sp"
 
+                        android:textColor="@android:color/black"
 
+                        android:layout_marginTop="4dp"
 
+                        android:layout_marginStart="10dp"
 
+                        android:layout_marginLeft="10dp"
 
+                        android:textStyle="italic"
 
+                        android:alpha="0.8"/>
 
+                </LinearLayout>
 
+
 
+                <CheckBox
 
+                    android:layout_height="50dp"
 
+                    android:id="@+id/cb_settings_sync"
 
+                    android:padding="15dp"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_weight=".85"
 
+                    android:gravity="center_vertical|center_horizontal"
 
+                    android:layout_gravity="center_vertical|center_horizontal"
 
+                    android:textAlignment="center"
 
+                    android:onClick="toggleSync"/>
 
+
 
+            </LinearLayout>
 
+
 
+            <TextView
 
+                android:layout_width="match_parent"
 
+                android:layout_height="1dp"
 
+                android:background="@color/entry_border"
 
+                android:layout_marginLeft="15dp"
 
+                android:layout_marginRight="15dp"
 
+                android:layout_marginStart="15dp"
 
+                android:layout_marginEnd="15dp"/>
 
+
 
+            <LinearLayout
 
+                android:orientation="horizontal"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="match_parent"
 
+                android:id="@+id/ll_settings_notifications"
 
+                android:padding="10dp"
 
+                android:layout_marginBottom="5dp"
 
+                android:onClick="toggleNotifications">
 
+
 
+                <LinearLayout
 
+                    android:orientation="vertical"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="match_parent"
 
+                    android:layout_weight=".15">
 
+
 
+                    <TextView
 
+                        android:text="@string/preferences_sync_notifications"
 
+                        android:layout_width="match_parent"
 
+                        android:layout_height="wrap_content"
 
+                        android:textSize="18sp"
 
+                        android:textColor="@android:color/black"
 
+                        />
 
+
 
+                    <TextView
 
+                        android:text="@string/preferences_sync_notifications_on"
 
+                        android:layout_width="match_parent"
 
+                        android:layout_height="wrap_content"
 
+                        android:id="@+id/tv_settings_notifications"
 
+                        android:textSize="16sp"
 
+                        android:textColor="@android:color/black"
 
+                        android:layout_marginTop="4dp"
 
+                        android:layout_marginStart="10dp"
 
+                        android:layout_marginLeft="10dp"
 
+                        android:textStyle="italic"
 
+                        android:alpha="0.8"/>
 
+                </LinearLayout>
 
+
 
+                <CheckBox
 
+                    android:layout_height="50dp"
 
+                    android:id="@+id/cb_settings_notifications"
 
+                    android:padding="15dp"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_weight=".85"
 
+                    android:gravity="center_vertical|center_horizontal"
 
+                    android:layout_gravity="center_vertical|center_horizontal"
 
+                    android:textAlignment="center"
 
+                    android:onClick="toggleNotifications"/>
 
+
 
+            </LinearLayout>
 
+
 
+            <TextView
 
+                android:text="@string/preferences_info"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="wrap_content"
 
+                android:textStyle="bold"
 
+                android:textColor="@color/background_menu"
 
+                android:paddingEnd="10dp"
 
+                android:paddingLeft="10dp"
 
+                android:paddingRight="10dp"
 
+                android:paddingStart="10dp"
 
+                android:layout_marginTop="20dp"
 
+                android:textSize="20sp"
 
+                android:layout_marginBottom="5dp"
 
+                android:background="@color/section_background"/>
 
+
 
+            <LinearLayout
 
+                android:orientation="vertical"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="match_parent"
 
+                android:id="@+id/ll_settings_version"
 
+                android:padding="10dp"
 
+                android:layout_marginBottom="5dp">
 
+
 
+                <TextView
 
+                    android:text="@string/preferences_info_version"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="wrap_content"
 
+                    android:textSize="18sp"
 
+                    android:textColor="@android:color/black"
 
+                    android:layout_weight=".15"/>
 
+
 
+                <TextView
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="wrap_content"
 
+                    android:id="@+id/tv_settings_version"
 
+                    android:textSize="16sp"
 
+                    android:textColor="@android:color/black"
 
+                    android:layout_marginTop="4dp"
 
+                    android:layout_marginStart="10dp"
 
+                    android:layout_marginLeft="10dp"
 
+                    android:layout_weight=".15"
 
+                    android:textStyle="italic"
 
+                    android:alpha="0.8"/>
 
+
 
+            </LinearLayout>
 
+
 
+            <TextView
 
+                android:layout_width="match_parent"
 
+                android:layout_height="1dp"
 
+                android:background="@color/entry_border"
 
+                android:layout_marginLeft="15dp"
 
+                android:layout_marginRight="15dp"
 
+                android:layout_marginStart="15dp"
 
+                android:layout_marginEnd="15dp"/>
 
+
 
+            <LinearLayout
 
+                android:orientation="vertical"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="match_parent"
 
+                android:id="@+id/ll_settings_source"
 
+                android:padding="10dp"
 
+                android:layout_marginBottom="5dp">
 
+
 
+                <TextView
 
+                    android:text="@string/preferences_info_source"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="wrap_content"
 
+                    android:textSize="18sp"
 
+                    android:textColor="@android:color/black"
 
+                    android:layout_weight=".15"/>
 
+
 
+                <TextView
 
+                    android:text="@string/preferences_info_source_summary"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="wrap_content"
 
+                    android:textSize="16sp"
 
+                    android:textColor="@android:color/black"
 
+                    android:layout_marginTop="4dp"
 
+                    android:layout_marginStart="10dp"
 
+                    android:layout_marginLeft="10dp"
 
+                    android:layout_weight=".15"
 
+                    android:textStyle="italic"
 
+                    android:alpha="0.8"/>
 
+
 
+            </LinearLayout>
 
+
 
+            <TextView
 
+                android:layout_width="match_parent"
 
+                android:layout_height="1dp"
 
+                android:background="@color/entry_border"
 
+                android:layout_marginLeft="15dp"
 
+                android:layout_marginRight="15dp"
 
+                android:layout_marginStart="15dp"
 
+                android:layout_marginEnd="15dp"
 
+                android:visibility="gone"/>
 
+
 
+            <LinearLayout
 
+                android:orientation="vertical"
 
+                android:layout_width="match_parent"
 
+                android:layout_height="match_parent"
 
+                android:id="@+id/ll_settings_feedback"
 
+                android:padding="10dp"
 
+                android:layout_marginBottom="5dp"
 
+                android:visibility="gone">
 
+
 
+                <TextView
 
+                    android:text="@string/preferences_info_feedback"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="wrap_content"
 
+                    android:textSize="18sp"
 
+                    android:textColor="@android:color/black"
 
+                    android:layout_weight=".15"/>
 
+
 
+                <TextView
 
+                    android:text="@string/preferences_info_feedback_summary"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="wrap_content"
 
+                    android:textSize="16sp"
 
+                    android:textColor="@android:color/black"
 
+                    android:layout_marginTop="4dp"
 
+                    android:layout_marginStart="10dp"
 
+                    android:layout_marginLeft="10dp"
 
+                    android:layout_weight=".15"
 
+                    android:textStyle="italic"
 
+                    android:alpha="0.8"/>
 
+
 
+            </LinearLayout>
 
+
 
+        </LinearLayout>
 
+
 
+
 
+    </ScrollView>
 
+
 
+</LinearLayout>
 
+

+ 69 - 0
app/src/main/res/layout/dialog_changelog.xml
Wyświetl plik 

@@ -0,0 +1,69 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<RelativeLayout
 
+    xmlns:android="http://schemas.android.com/apk/res/android"
 
+    xmlns:tools="http://schemas.android.com/tools"
 
+    android:orientation="vertical"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="match_parent"
 
+    android:background="@drawable/section"
 
+    android:id="@+id/ll_home_section_lablanca"
 
+    android:layout_marginBottom="30dp"
 
+    android:layout_marginEnd="12dp"
 
+    android:layout_marginLeft="12dp"
 
+    android:layout_marginRight="12dp"
 
+    android:layout_marginStart="12dp"
 
+    android:layout_marginTop="30dp"
 
+    android:paddingBottom="15dp">
 
+
 
+    <TextView
 
+        android:text="@string/changelog"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:textAppearance="?android:attr/textAppearanceLarge"
 
+        android:textStyle="bold"
 
+        android:textColor="@color/section_title"
 
+        android:paddingBottom="4dp"
 
+        android:paddingEnd="10dp"
 
+        android:paddingLeft="20dp"
 
+        android:paddingRight="10dp"
 
+        android:paddingStart="20dp"
 
+        android:paddingTop="4dp"
 
+        android:background="@drawable/section_title"
 
+        android:layout_alignParentTop="true"
 
+        android:id="@+id/tv_changelog"/>
 
+
 
+    <WebView
 
+        android:layout_width="match_parent"
 
+        android:layout_height="match_parent"
 
+        android:id="@+id/wv_changelog"
 
+        android:scrollbars="vertical"
 
+        android:layout_below="@+id/tv_changelog"
 
+        android:layout_above="@+id/bt_changelog"
 
+        android:layout_marginEnd="1dp"
 
+        android:layout_marginLeft="1dp"
 
+        android:layout_marginRight="1dp"
 
+        android:layout_marginStart="1dp"
 
+        android:background="@drawable/entry"
 
+        android:scrollbarFadeDuration="0"
 
+        android:scrollbarAlwaysDrawVerticalTrack="true"/>
 
+
 
+    <Button
 
+        android:text="@string/accept"
 
+        android:layout_width="wrap_content"
 
+        android:id="@+id/bt_changelog"
 
+        android:layout_alignParentBottom="true"
 
+        android:layout_height="wrap_content"
 
+        android:layout_centerInParent="false"
 
+        android:layout_centerHorizontal="true"
 
+        android:layout_marginBottom="15dp"
 
+        android:layout_marginEnd="25dp"
 
+        android:layout_marginLeft="25dp"
 
+        android:layout_marginRight="25dp"
 
+        android:layout_marginStart="25dp"
 
+        android:layout_marginTop="5dp"
 
+        android:layout_weight=".5"
 
+        android:background="@drawable/button_selector"
 
+        android:minHeight="40dp"
 
+        android:textColor="@color/input_button_color"
 
+        android:textStyle="bold"/>
 
+</RelativeLayout>

+ 1 - 1
app/src/main/res/layout/dialog_sync.xml
Wyświetl plik 

@@ -3,7 +3,7 @@
 
               android:layout_height="wrap_content"
 
               android:background="@drawable/section"
 
               android:orientation="vertical"
 
-              android:padding="7dp">
 
+    >
 
 
     <TextView
 
         android:id="@+id/textView1"

+ 185 - 137
app/src/main/res/layout/fragment_layout_home.xml
Wyświetl plik 

@@ -1,5 +1,6 @@
 
 <com.ivalentin.margolariak.CustomScrollView
 
 	xmlns:android="http://schemas.android.com/apk/res/android"
 
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 
 	xmlns:tools="http://schemas.android.com/tools"
 
 	android:id="@+id/sh_home_layout"
 
     android:layout_width="fill_parent"
 
@@ -13,23 +14,27 @@
 
     
 	    <LinearLayout
 
 			android:id="@+id/ll_home_section_location"
 
-			android:layout_width="fill_parent"
 
+			android:layout_width="match_parent"
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_location"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
@@ -39,14 +44,15 @@
 
 				android:orientation="vertical"
 
 				android:background="@drawable/entry"
 
 				android:padding="7dp"
 
-				android:layout_margin="3dp">
 
+				android:layout_margin="8dp">
 
 
 				<TextView
 
-					android:layout_width="wrap_content"
 
+					android:layout_width="match_parent"
 
 					android:layout_height="wrap_content"
 
-					android:textAppearance="@android:style/TextAppearance.Medium"
 
-					android:text="@string/home_section_location_text_0"
 
-					android:id="@+id/textView9"/>
 
+					android:textAppearance="?android:attr/textAppearanceMedium"
 
+					android:textColor="@color/entry_title"
 
+					android:textStyle="bold"
 
+					android:text="@string/home_section_location_text_0"/>
 
 
 				<LinearLayout
 
 					android:orientation="horizontal"
 
@@ -81,24 +87,26 @@
 
 		<LinearLayout
 
 			android:orientation="vertical"
 
 			android:layout_width="match_parent"
 
-			android:layout_height="match_parent"
 
+			android:layout_height="wrap_content"
 
 			android:background="@drawable/section"
 
 			android:id="@+id/ll_home_section_lablanca"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:text="@string/lablanca_title"
 
-				android:id="@+id/textView4"
 
 				android:textStyle="bold"
 
-				android:textColor="@color/section_title"/>
 
+				android:textColor="@color/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
+				android:background="@drawable/section_title"/>
 
 
 			<LinearLayout
 
 				android:orientation="horizontal"
 
@@ -106,7 +114,7 @@
 
 				android:layout_height="match_parent"
 
 				android:background="@drawable/entry"
 
 				android:padding="7dp"
 
-				android:layout_margin="3dp">
 
+				android:layout_margin="8dp">
 
 
 				<ImageView
 
 					android:layout_width="wrap_content"
 
@@ -125,8 +133,14 @@
 
 					android:id="@+id/tv_home_section_lablanca_text"
 
 					android:layout_weight=".6"
 
 					android:padding="7dp"
 
-					android:maxLines="4"
 
-					android:ellipsize="end"/>
 
+					android:maxLines="4"/>
 
+
 
+				<ImageView
 
+					android:layout_width="match_parent"
 
+					android:layout_weight="1"
 
+					android:layout_height="40dp"
 
+					android:layout_marginTop="-40dp"
 
+					android:background="@drawable/gradient_v_white"/>
 
 
 			</LinearLayout>
 
 		</LinearLayout>
 
@@ -137,20 +151,23 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_gmschedule"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
-				android:layout_marginBottom="10dp"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
@@ -160,14 +177,15 @@
 
 				android:background="@drawable/entry"
 
 				android:id="@+id/ll_home_section_gmschedule_now_content"
 
 				android:padding="7dp"
 
-				android:layout_margin="3dp">
 
+				android:layout_margin="8dp">
 
 
 				<TextView
 
-					android:layout_width="wrap_content"
 
+					android:layout_width="match_parent"
 
 					android:layout_height="wrap_content"
 
-					android:textAppearance="@android:style/TextAppearance.Medium"
 
-					android:text="@string/schedule_now"
 
-					android:textStyle="bold"/>
 
+					android:textAppearance="?android:attr/textAppearanceMedium"
 
+					android:textColor="@color/entry_title"
 
+					android:textStyle="bold"
 
+					android:text="@string/schedule_now"/>
 
 
 				<LinearLayout
 
 					android:id="@+id/ll_home_section_gmschedule_now_list"
 
@@ -187,14 +205,15 @@
 
 				android:background="@drawable/entry"
 
 				android:id="@+id/ll_home_section_gmschedule_later_content"
 
 				android:padding="7dp"
 
-				android:layout_margin="3dp">
 
+				android:layout_margin="8dp">
 
 
 				<TextView
 
-					android:layout_width="wrap_content"
 
+					android:layout_width="match_parent"
 
 					android:layout_height="wrap_content"
 
-					android:textAppearance="@android:style/TextAppearance.Medium"
 
-					android:text="@string/schedule_later"
 
-					android:textStyle="bold"/>
 
+					android:textAppearance="?android:attr/textAppearanceMedium"
 
+					android:textColor="@color/entry_title"
 
+					android:textStyle="bold"
 
+					android:text="@string/schedule_later"/>
 
 
 				<LinearLayout
 
 					android:id="@+id/ll_home_section_gmschedule_later_list"
 
@@ -215,20 +234,23 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_cityschedule"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
-				android:layout_marginBottom="10dp"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
@@ -238,14 +260,15 @@
 
 				android:background="@drawable/entry"
 
 				android:id="@+id/ll_home_section_cityschedule_now_content"
 
 				android:padding="7dp"
 
-				android:layout_margin="3dp">
 
+				android:layout_margin="8dp">
 
 
 				<TextView
 
-                    android:layout_width="wrap_content"
 
-                    android:layout_height="wrap_content"
 
-                    android:textAppearance="@android:style/TextAppearance.Medium"
 
-                    android:text="@string/schedule_now"
 
-					android:textStyle="bold"/>
 
+					android:layout_width="match_parent"
 
+					android:layout_height="wrap_content"
 
+					android:textAppearance="?android:attr/textAppearanceMedium"
 
+					android:textColor="@color/entry_title"
 
+					android:textStyle="bold"
 
+                    android:text="@string/schedule_now"/>
 
 
 				<LinearLayout
 
                     android:id="@+id/ll_home_section_cityschedule_now_list"
 
@@ -265,14 +288,15 @@
 
 				android:background="@drawable/entry"
 
 				android:id="@+id/ll_home_section_cityschedule_later_content"
 
 				android:padding="7dp"
 
-				android:layout_margin="3dp">
 
+				android:layout_margin="8dp">
 
 
 				<TextView
 
-					android:layout_width="wrap_content"
 
+					android:layout_width="match_parent"
 
 					android:layout_height="wrap_content"
 
-					android:textAppearance="@android:style/TextAppearance.Medium"
 
-					android:text="@string/schedule_later"
 
-					android:textStyle="bold"/>
 
+					android:textAppearance="?android:attr/textAppearanceMedium"
 
+					android:textColor="@color/entry_title"
 
+					android:textStyle="bold"
 
+					android:text="@string/schedule_later"/>
 
 
 				<LinearLayout
 
 					android:id="@+id/ll_home_section_cityschedule_later_list"
 
@@ -293,26 +317,30 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_around"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
 				android:id="@+id/ll_home_section_around_content"
 
 				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
-				android:layout_margin="3dp"
 
+				android:layout_margin="8dp"
 
 				android:orientation="vertical"
 
 				android:background="@drawable/entry"
 
 				>
 
@@ -327,26 +355,30 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_activities_future"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
 				android:id="@+id/ll_home_section_activities_future_content"
 
 				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
-				android:layout_margin="3dp"
 
+				android:layout_margin="8dp"
 
 				android:orientation="vertical">
 
 
 			</LinearLayout>
 
@@ -359,27 +391,30 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_blog"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
 				android:id="@+id/ll_home_section_blog_content"
 
 				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
-				android:layout_margin="3dp"
 
 				android:orientation="vertical"
 
-				>
 
+				android:layout_margin="8dp">
 
 
 			</LinearLayout>
 
 
@@ -391,25 +426,29 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_gallery"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
 				android:id="@+id/ll_home_section_gallery_content"
 
 				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
-				android:layout_margin="3dp"
 
+				android:layout_margin="8dp"
 
 				android:orientation="vertical"
 
 				android:background="@drawable/entry"
 
 				android:padding="7dp">
 
@@ -432,9 +471,9 @@
 
 							android:layout_height="wrap_content"
 
 							android:id="@+id/iv_home_section_gallery_0"
 
 							android:contentDescription="@string/app_cdesc"
 
-							android:layout_margin="7dp"
 
-							android:padding="1dp"
 
-							android:background="@color/album_border"
 
+							android:layout_margin="3dp"
 
+							android:padding="0.5dp"
 
+							android:background="@color/image_border"
 
 							android:adjustViewBounds="true"
 
 							/>
 
 					</LinearLayout>
 
@@ -451,9 +490,9 @@
 
 							android:layout_height="wrap_content"
 
 							android:id="@+id/iv_home_section_gallery_1"
 
 							android:contentDescription="@string/app_cdesc"
 
-							android:layout_margin="7dp"
 
-							android:background="@color/album_border"
 
-							android:padding="1dp"
 
+							android:layout_margin="3dp"
 
+							android:background="@color/image_border"
 
+							android:padding="0.5dp"
 
 							android:adjustViewBounds="true"
 
 							/>
 
 					</LinearLayout>
 
@@ -478,9 +517,9 @@
 
 							android:layout_height="wrap_content"
 
 							android:id="@+id/iv_home_section_gallery_2"
 
 							android:contentDescription="@string/app_cdesc"
 
-							android:layout_margin="7dp"
 
-							android:padding="1dp"
 
-							android:background="@color/album_border"
 
+							android:layout_margin="3dp"
 
+							android:padding="0.5dp"
 
+							android:background="@color/image_border"
 
 							android:adjustViewBounds="true"
 
 							/>
 
 					</LinearLayout>
 
@@ -497,9 +536,9 @@
 
 							android:layout_height="wrap_content"
 
 							android:id="@+id/iv_home_section_gallery_3"
 
 							android:contentDescription="@string/app_cdesc"
 
-							android:layout_margin="7dp"
 
-							android:background="@color/album_border"
 
-							android:padding="1dp"
 
+							android:layout_margin="3dp"
 
+							android:background="@color/image_border"
 
+							android:padding="0.5dp"
 
 							android:adjustViewBounds="true"
 
 							/>
 
 					</LinearLayout>
 
@@ -544,26 +583,29 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:visibility="gone"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp"
 
+			android:visibility="gone">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_activities_past"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
 				android:id="@+id/ll_home_section_activities_past_content"
 
 				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
-				android:layout_margin="3dp"
 
 				android:orientation="vertical">
 
 
 			</LinearLayout>
 
@@ -576,25 +618,29 @@
 
 			android:layout_height="wrap_content"
 
 			android:orientation="vertical"
 
 			android:background="@drawable/section"
 
-			android:layout_marginLeft="0dp"
 
-			android:layout_marginTop="2dp"
 
-			android:layout_marginRight="0dp"
 
-			android:layout_marginBottom="4dp"
 
-			android:paddingTop="5dp">
 
+			android:layout_margin="10dp">
 
 
 			<TextView
 
-				android:layout_width="wrap_content"
 
+				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
 				android:text="@string/home_section_social"
 
 				android:textAppearance="?android:attr/textAppearanceLarge"
 
 				android:textStyle="bold"
 
+				tools:layout_width="match_parent"
 
+				android:background="@drawable/section_title"
 
+				android:paddingBottom="4dp"
 
+				android:paddingEnd="10dp"
 
+				android:paddingLeft="20dp"
 
+				android:paddingRight="10dp"
 
+				android:paddingStart="20dp"
 
+				android:paddingTop="4dp"
 
 				android:textColor="@color/section_title"/>
 
 
 			<LinearLayout
 
 				android:id="@+id/ll_home_section_social_content"
 
 				android:layout_width="match_parent"
 
 				android:layout_height="wrap_content"
 
-				android:layout_margin="3dp"
 
+				android:layout_margin="8dp"
 
 				android:orientation="vertical"
 
 				android:background="@drawable/entry"
 
 				android:padding="7dp">
 
@@ -608,40 +654,40 @@
 
 						android:id="@+id/iv_home_section_social_phone"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_phone"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_phone"/>
 
 
 					<ImageView
 
 						android:id="@+id/iv_home_section_social_mail"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_mail"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_mail" />
 
 
 					<ImageView
 
 						android:id="@+id/iv_home_section_social_whatsapp"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_whatsapp"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_whatsapp" />
 
 
 					<ImageView
 
 						android:id="@+id/iv_home_section_social_facebook"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_facebook"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_facebook" />
 
 				</LinearLayout>
 
 
@@ -654,42 +700,44 @@
 
 						android:id="@+id/iv_home_section_social_twitter"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_twitter"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_twitter" />
 
 
 					<ImageView
 
 						android:id="@+id/iv_home_section_social_googleplus"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_googleplus"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_googleplus" />
 
 
 					<ImageView
 
 						android:id="@+id/iv_home_section_social_youtube"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_youtube"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_youtube" />
 
 
 					<ImageView
 
 						android:id="@+id/iv_home_section_social_instagram"
 
 						android:layout_width="wrap_content"
 
 						android:layout_height="wrap_content"
 
-						android:layout_margin="10dp"
 
+						android:layout_margin="5dp"
 
 						android:adjustViewBounds="true"
 
 						android:contentDescription="@string/social_instagram"
 
-						android:maxWidth="50dp"
 
+						android:maxWidth="60dp"
 
 						android:src="@drawable/social_instagram" />
 
+
 
 				</LinearLayout>
 
+
 
 			</LinearLayout>
 
 
 		</LinearLayout>

+ 62 - 37
app/src/main/res/layout/row_home_activities.xml
Wyświetl plik 

@@ -1,24 +1,19 @@
 
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
-    android:orientation="vertical" android:layout_width="match_parent"
 
-    android:layout_height="wrap_content"
 
-    android:background="@drawable/entry"
 
-    android:padding="4dp">
 
+              android:orientation="vertical" android:layout_width="match_parent"
 
+              android:layout_height="wrap_content"
 
+              android:background="@drawable/entry"
 
+              android:padding="7dp"
 
+              android:layout_margin="8dp">
 
 
     <TextView
 
-        android:layout_width="wrap_content"
 
+        android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
-        android:textAppearance="?android:attr/textAppearanceLarge"
 
+        android:textAppearance="?android:attr/textAppearanceMedium"
 
+        android:textColor="@color/entry_title"
 
+        android:textStyle="bold"
 
         android:id="@+id/tv_row_home_activity_title" />
 
 
-    <TextView
 
-        android:layout_width="wrap_content"
 
-        android:layout_height="wrap_content"
 
-        android:textAppearance="?android:attr/textAppearanceSmall"
 
-        android:id="@+id/tv_row_home_activity_date"
 
-        android:gravity="end"
 
-        android:textStyle="italic" />
 
-
 
     <TextView
 
         android:layout_width="wrap_content"
 
         android:layout_height="wrap_content"
 
@@ -39,35 +34,65 @@
 
             android:maxWidth="130dp"
 
             android:layout_weight=".8"
 
             android:layout_margin="3dp"
 
-            android:layout_gravity="center_vertical"
 
-            android:adjustViewBounds="true"/>
 
+            android:layout_gravity="top"
 
+            android:adjustViewBounds="true"
 
+            android:background="@color/image_border"
 
+            android:padding="0.5dp"/>
 
 
-        <TextView
 
-            android:layout_width="fill_parent"
 
+        <LinearLayout
 
+            android:orientation="vertical"
 
             android:layout_height="wrap_content"
 
-            android:id="@+id/tv_row_home_activity_text"
 
             android:layout_weight=".2"
 
-            android:textAppearance="@android:style/TextAppearance.Medium"
 
-            android:layout_margin="5dp" />
 
-    </LinearLayout>
 
+            android:layout_width="match_parent"
 
+            android:layout_gravity="top">
 
 
-    <LinearLayout
 
-        android:orientation="horizontal"
 
-        android:layout_width="match_parent"
 
-        android:layout_height="match_parent" >
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:textAppearance="?android:attr/textAppearanceSmall"
 
+                android:id="@+id/tv_row_home_activity_date"
 
+                android:gravity="end"
 
+                android:textStyle="italic"
 
+                android:layout_weight="1"
 
+                android:layout_marginTop="4dp"
 
+                android:layout_marginStart="8dp"
 
+                android:layout_marginLeft="8dp"/>
 
 
-        <TextView
 
-            android:layout_width="wrap_content"
 
-            android:layout_height="wrap_content"
 
-            android:textAppearance="?android:attr/textAppearanceSmall"
 
-            android:id="@+id/tv_row_home_activity_city" />
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:textAppearance="?android:attr/textAppearanceSmall"
 
+                android:id="@+id/tv_row_home_activity_city"
 
+                android:layout_weight="1"
 
+                android:layout_marginLeft="8dp"
 
+                android:layout_marginStart="8dp"/>
 
+
 
+            <TextView
 
+                android:layout_width="fill_parent"
 
+                android:layout_height="wrap_content"
 
+                android:id="@+id/tv_row_home_activity_text"
 
+                android:layout_weight="1"
 
+                android:textAppearance="@android:style/TextAppearance.Medium"
 
+                android:layout_margin="5dp"
 
+                android:maxLines="4"/>
 
+
 
+            <ImageView
 
+                android:layout_width="match_parent"
 
+                android:layout_weight="1"
 
+                android:layout_height="40dp"
 
+                android:layout_marginTop="-40dp"
 
+                android:background="@drawable/gradient_v_white"/>
 
+
 
+            <TextView
 
+                android:layout_width="match_parent"
 
+                android:layout_height="wrap_content"
 
+                android:textAppearance="?android:attr/textAppearanceSmall"
 
+                android:id="@+id/tv_row_home_activity_price"
 
+                android:layout_weight="1"
 
+                android:layout_marginLeft="35dp"
 
+                android:layout_marginStart="35dp"/>
 
+        </LinearLayout>
 
 
-        <TextView
 
-            android:layout_width="fill_parent"
 
-            android:layout_height="wrap_content"
 
-            android:textAppearance="?android:attr/textAppearanceSmall"
 
-            android:id="@+id/tv_row_home_activity_price"
 
-            android:gravity="end" />
 
     </LinearLayout>
 
 
 </LinearLayout>

+ 44 - 21
app/src/main/res/layout/row_home_blog.xml
Wyświetl plik 

@@ -1,30 +1,22 @@
 
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
-    android:orientation="vertical" android:layout_width="match_parent"
 
-    android:layout_height="wrap_content"
 
-    android:background="@drawable/entry"
 
-    android:padding="4dp">
 
+              android:orientation="vertical" android:layout_width="match_parent"
 
+              android:layout_height="wrap_content"
 
+              android:background="@drawable/entry"
 
+              android:padding="7dp"
 
+              android:layout_margin="8dp">
 
 
     <TextView
 
+        android:id="@+id/tv_row_home_blog_title"
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
         android:textAppearance="?android:attr/textAppearanceMedium"
 
-        android:id="@+id/tv_row_home_blog_title"
 
         android:textColor="@color/entry_title"
 
         android:textStyle="bold"/>
 
 
-    <TextView
 
-        android:layout_width="match_parent"
 
-        android:layout_height="0dp"
 
-        android:textAppearance="?android:attr/textAppearanceSmall"
 
-        android:id="@+id/tv_row_home_blog_date"
 
-        android:layout_weight=".5"
 
-        android:textStyle="italic"/>
 
-
 
     <TextView
 
         android:layout_width="wrap_content"
 
         android:layout_height="wrap_content"
 
-        android:text="New Text"
 
         android:id="@+id/tv_row_home_blog_hidden"
 
         android:visibility="gone" />
 
 
@@ -41,16 +33,47 @@
 
             android:maxWidth="130dp"
 
             android:layout_weight=".7"
 
             android:layout_margin="3dp"
 
-            android:layout_gravity="center_vertical"
 
-            android:adjustViewBounds="true"/>
 
+            android:adjustViewBounds="true"
 
+            android:padding="0.5dp"
 
+            android:background="@color/image_border"
 
+            android:layout_gravity="top"/>
 
 
-        <TextView
 
-            android:layout_width="fill_parent"
 
+        <LinearLayout
 
+            android:orientation="vertical"
 
+            android:layout_width="match_parent"
 
             android:layout_height="wrap_content"
 
-            android:id="@+id/tv_row_home_blog_text"
 
             android:layout_weight=".3"
 
-            android:textAppearance="@android:style/TextAppearance.Medium"
 
-            android:layout_margin="5dp" />
 
+            android:layout_gravity="top">
 
+
 
+            <TextView
 
+                android:layout_width="match_parent"
 
+                android:layout_height="0dp"
 
+                android:textAppearance="?android:attr/textAppearanceSmall"
 
+                android:id="@+id/tv_row_home_blog_date"
 
+                android:layout_weight=".3"
 
+                android:textStyle="italic"
 
+                android:layout_marginTop="4dp"
 
+                android:layout_marginStart="8dp"
 
+                android:layout_marginLeft="8dp"/>
 
+
 
+            <TextView
 
+                android:layout_width="match_parent"
 
+                android:layout_height="wrap_content"
 
+                android:id="@+id/tv_row_home_blog_text"
 
+                android:layout_weight=".3"
 
+                android:textAppearance="@android:style/TextAppearance.Medium"
 
+                android:layout_margin="5dp"
 
+                android:maxLines="4"/>
 
+
 
+            <ImageView
 
+                android:layout_width="match_parent"
 
+                android:layout_weight="1"
 
+                android:layout_height="40dp"
 
+                android:layout_marginTop="-40dp"
 
+                android:background="@drawable/gradient_v_white"/>
 
+
 
+        </LinearLayout>
 
+
 
     </LinearLayout>
 
 
 </LinearLayout>

+ 2 - 3
app/src/main/res/layout/row_home_schedule.xml
Wyświetl plik 

@@ -4,9 +4,8 @@
 
     android:layout_width="fill_parent"
 
     android:layout_height="wrap_content"
 
     android:orientation="vertical"
 
-    android:paddingStart="15dp"
 
-    android:paddingEnd="15dp"
 
-    android:paddingTop="5dp">
 
+    android:layout_margin="8dp"
 
+    android:padding="7dp">
 
 
     <TextView
 
         android:id="@+id/tv_row_home_schedule_id"

+ 17 - 16
app/src/main/res/values-en/strings.xml
Wyświetl plik 

@@ -164,21 +164,22 @@
 
 	<string name="pop_menu_about">About us</string>
 
 	<string name="pop_menu_settings">Settings</string>
 
 	<string name="pop_menu_sponsors">-</string>
 
-	<string name="preferences">-</string>
 
-	<string name="preferences_info">-</string>
 
-	<string name="preferences_info_feedback">-</string>
 
-	<string name="preferences_info_feedback_summary">-</string>
 
-	<string name="preferences_info_source">-</string>
 
-	<string name="preferences_info_source_summary">-</string>
 
-	<string name="preferences_info_version">-</string>
 
-	<string name="preferences_sync">-</string>
 
-	<string name="preferences_sync_notifications">-</string>
 
-	<string name="preferences_sync_usage">-</string>
 
-	<string name="preferences_sync_sync_on">-</string>
 
-	<string name="preferences_sync_sync_off">-</string>
 
-	<string name="preferences_sync_sync">-</string>
 
-	<string name="preferences_sync_notifications_on">-</string>
 
-	<string name="preferences_sync_notifications_off">-</string>
 
-	<string name="preferences_sync_notifications_disabled">-</string>
 
+	<string name="preferences">Preferences</string>
 
+	<string name="preferences_info">Information</string>
 
+	<string name="preferences_info_feedback">Feedback</string>
 
+	<string name="preferences_info_feedback_summary">Send anonymous feedback to the developer</string>
 
+	<string name="preferences_info_source">Source code</string>
 
+	<string name="preferences_info_source_summary">Checkout source code on Github</string>
 
+	<string name="preferences_info_version">App version</string>
 
+	<string name="preferences_sync">Sync</string>
 
+	<string name="preferences_sync_notifications">Notifications</string>
 
+	<string name="preferences_sync_usage">Background data usage</string>
 
+	<string name="preferences_sync_sync_on">Background sync is enabled</string>
 
+	<string name="preferences_sync_notifications_on">Notifications will be received</string>
 
+	<string name="preferences_sync_notifications_off">Notifications will not be received</string>
 
+	<string name="preferences_sync_notifications_disabled">Enable background sync to enable notifications</string>
 
+	<string name="preferences_sync_sync">Background Sync</string>
 
+	<string name="preferences_sync_sync_off">Background sync is disabled</string>
 
+	<string name="changelog">Changelog</string>
 
 
 </resources>

+ 18 - 17
app/src/main/res/values-eu-rES/strings.xml
Wyświetl plik 

@@ -167,23 +167,24 @@
 
 	<string name="settings_notification_on">Recibir notificaciones</string>
 
 	<string name="home_section_location_text_calculating">Calculando distancia…</string>
 
 	<string name="pop_menu_about">About us</string>
 
-	<string name="pop_menu_settings">Settings</string>
 
+	<string name="pop_menu_settings">Ajustes</string>
 
 	<string name="pop_menu_sponsors">-</string>
 
-	<string name="preferences">-</string>
 
-	<string name="preferences_info">-</string>
 
-	<string name="preferences_info_feedback">-</string>
 
-	<string name="preferences_info_feedback_summary">-</string>
 
-	<string name="preferences_info_source">-</string>
 
-	<string name="preferences_info_source_summary">-</string>
 
-	<string name="preferences_info_version">-</string>
 
-	<string name="preferences_sync">-</string>
 
-	<string name="preferences_sync_notifications">-</string>
 
-	<string name="preferences_sync_notifications_disabled">-</string>
 
-	<string name="preferences_sync_notifications_off">-</string>
 
-	<string name="preferences_sync_notifications_on">-</string>
 
-	<string name="preferences_sync_sync">-</string>
 
-	<string name="preferences_sync_sync_off">-</string>
 
-	<string name="preferences_sync_sync_on">--</string>
 
-	<string name="preferences_sync_usage">-</string>
 
+	<string name="preferences_info">Informazioa</string>
 
+	<string name="preferences_info_feedback_summary">Send anonymous feedback to the developer</string>
 
+	<string name="preferences_info_source">Codigo fuente</string>
 
+	<string name="preferences_info_source_summary">Ojear el código fuente en Github</string>
 
+	<string name="preferences_info_version">Versión de la aplicación</string>
 
+	<string name="preferences_sync">Sincronización</string>
 
+	<string name="preferences_sync_notifications">Notificaciones</string>
 
+	<string name="preferences_sync_notifications_disabled">Activa la sincronización en segundo plano para recibir notificaciones</string>
 
+	<string name="preferences_sync_notifications_off">No se recibirán notificaciones</string>
 
+	<string name="preferences_sync_notifications_on">Se recibirán notificaciones</string>
 
+	<string name="preferences_sync_sync_on">Sincronización activada</string>
 
+	<string name="preferences_sync_usage">Uso de datos</string>
 
+	<string name="preferences">Preferences</string>
 
+	<string name="preferences_info_feedback">Feedback</string>
 
+	<string name="preferences_sync_sync">Sincronización en segundo plano</string>
 
+	<string name="preferences_sync_sync_off">Sincronización desactivada</string>
 
+	<string name="changelog">Changelog</string>
 
 
 </resources>

+ 10 - 0
app/src/main/res/values-v21/styles.xml
Wyświetl plik 

@@ -0,0 +1,10 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<resources>
 
+
 
+    <style name="Theme.AppBaseTheme" parent="android:Theme.Material.Light">
 
+        <item name="android:colorPrimary">@color/background_menu</item>
 
+        <item name="android:colorPrimaryDark">@color/background_menu</item>
 
+        <item name="android:colorAccent">@color/background_menu</item>
 
+        <item name="android:colorBackground">@color/background_app</item>
 
+    </style>
 
+</resources>

+ 12 - 8
app/src/main/res/values/color.xml
Wyświetl plik 

@@ -3,18 +3,22 @@
 
 
     <!-- Backgrounds for several sections -->
 
     
-    <color name="background_app">#e4f4fd</color>
 
-    <color name="background_menu">#4c9ed8</color>
 
+    <color name="background_app">#b5d3e5</color>
 
+    <color name="background_menu">#0078ff</color>
 
     <color name="background_notification">#000000</color>
 
     <color name="background_separator">#000000</color>
 
 
 
-    <color name="section_background">#d9ecf9</color>
 
-    <color name="section_border">#badde1</color>
 
-    <color name="section_title">#07383e</color>
 
+    <color name="section_background">#98c8ff</color>
 
+    <color name="section_border">#000011</color>
 
+    <color name="section_title">#ffffff</color>
 
+    <color name="section_title_background">#0078ff</color>
 
     <color name="entry_background">#ffffff</color>
 
-    <color name="entry_border">#d8f3f5</color>
 
-    <color name="entry_title">#41786e</color>
 
+    <color name="entry_border">#6D6990</color>
 
+    <color name="entry_title">#275573</color>
 
+
 
+    <!--Color for the border of the image-->
 
+    <color name="image_border">#292690</color>
 
     
     <!--Color for the menu entries-->
 
     <color name="menu_entry">#ffffff</color>
 
@@ -23,7 +27,7 @@
 
 
     <color name="background_bar">#9bc1da</color>
 
     <color name="background_bar_gradient">#bdf8fd</color>
 
-    <color name="menu_selected">#456075</color>
 
+    <color name="menu_selected">#ccccff</color>
 
 
     <!--Color for input fields-->
 
     <color name="input_background">#223344</color>

+ 16 - 15
app/src/main/res/values/strings.xml
Wyświetl plik 

@@ -185,26 +185,27 @@
 
 	<string name="pop_menu_sponsors">Sponsors</string>
 
 
 	<!--Preferences screen-->
 
-	<string name="preferences">Preferences</string>
 
-	<string name="preferences_sync">Sync</string>
 
-	<string name="preferences_sync_sync">Background Sync</string>
 
-	<string name="preferences_sync_sync_on">Background sync is enabled</string>
 
-	<string name="preferences_sync_sync_off">Background sync is disabled</string>
 
-	<string name="preferences_sync_notifications">Notifications</string>
 
-	<string name="preferences_sync_notifications_on">Notifications will be received</string>
 
-	<string name="preferences_sync_notifications_off">Notifications will not be received</string>
 
-	<string name="preferences_sync_notifications_disabled">Enable background sync to enable notifications</string>
 
-	<string name="preferences_sync_usage">Background data usage</string>
 
-	<string name="preferences_info">Information</string>
 
-	<string name="preferences_info_version">App version</string>
 
-	<string name="preferences_info_source">Source code</string>
 
-	<string name="preferences_info_source_summary">Checkout source code on Github</string>
 
+	<string name="preferences">Preferencias</string>
 
+	<string name="preferences_sync">Sincronización</string>
 
+	<string name="preferences_sync_sync">Sincronización en segundo plano</string>
 
+	<string name="preferences_sync_sync_on">Sincronización activada</string>
 
+	<string name="preferences_sync_sync_off">Sincronización desactivada</string>
 
+	<string name="preferences_sync_notifications">Notificaciones</string>
 
+	<string name="preferences_sync_notifications_on">Se recibirán notificaciones</string>
 
+	<string name="preferences_sync_notifications_off">No se recibirán notificaciones</string>
 
+	<string name="preferences_sync_notifications_disabled">Activa la sincronización en segundo plano para recibir notificaciones</string>
 
+	<string name="preferences_sync_usage">Uso de datos</string>
 
+	<string name="preferences_info">Informacion</string>
 
+	<string name="preferences_info_version">Versión de la aplicación</string>
 
+	<string name="preferences_info_source_summary">Ojear el código fuente en Github</string>
 
 	<string name="preferences_info_feedback">Feedback</string>
 
-	<string name="preferences_info_feedback_summary">Send anonymous feedback to the developer</string>
 
+	<string name="preferences_info_feedback_summary">Enviar información anónima al desarrollador</string>
 
 
 	<string name="eur" translatable="false">€</string>
 
 	<string name="Kb" translatable="false"> Kb</string>
 
 	<string name="Mb" translatable="false"> Mb</string>
 
 	<string name="pop_menu_about">Sobre nosotros</string>
 
+	<string name="preferences_info_source">Código fuente</string>
 
+	<string name="changelog">Changelog</string>
 
 
 </resources>

+ 7 - 0
app/src/main/res/values/styles.xml
Wyświetl plik 

@@ -16,6 +16,13 @@
 
     <style name="AppTheme" parent="AppBaseTheme">
 
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
 
         <item name="android:textColorPrimary">#333333</item>
 
+        <item name="android:windowBackground">@color/background_menu</item>
 
+        <item name="android:colorBackground">@color/background_app</item>
 
+
 
+        <item name="colorPrimary">@color/background_menu</item>
 
+        <item name="colorPrimaryDark">@color/background_menu</item>
 
+        <item name="colorAccent">@color/background_menu</item>
 
+
 
     </style>
 
     
     <style name="Theme.Default" parent="Theme.AppCompat.Light"></style>

+ 0 - 4
app/src/main/res/xml/preferences.xml
Wyświetl plik 

@@ -12,10 +12,6 @@
 
             android:title="@string/preferences_sync_notifications"
 
             android:summary="@string/preferences_sync_notifications_on"
 
             android:defaultValue="true" />
 
-        <Preference
 
-            android:key="preference_key_data"
 
-            android:title="@string/preferences_sync_usage"
 
-            android:summary="0 kb" />
 
 
     </PreferenceCategory>

+ 1 - 1
build.gradle
Wyświetl plik 

@@ -4,7 +4,7 @@ buildscript {
 
         jcenter()
 
     }
 
     dependencies {
 
-        classpath 'com.android.tools.build:gradle:2.2.1'
 
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
     }
 
 }

+ 317 - 290
build/intermediates/dex-cache/cache.xml
Wyświetl plik 

@@ -2,526 +2,553 @@
 
 <items version="2" >
 
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars/libs/internal_impl-24.0.0.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="af7582c6b327449c6d32518e6a10307860b7b5d6">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-base-9.6.1_7ac195096f4e0ada520db3c53d8ae9864e1c8ba2.jar" />
 
+        sha1="fcaf463e10e69c1923ccf1edeba3b4196d239e00">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/internal_impl-24.0.0_1f5abb0d2e89b98d6d33de46b87c13626eb7935b/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-iid/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="1e14ebe1cda8491f152083e752ca5bf73cd37bff">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-iid-9.6.1_403ea5a61be49e21332f3462c234008ca60f6336.jar" />
 
+        sha1="3f8f779a22cbb4c4d0759467a4f1011bb5252970">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-auth-module-9.8.0_026ec631482474d9a78a3613caf910156cf35d07/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/24.0.0/jars/libs/internal_impl-24.0.0.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="159494eb362396d073d8c922b77e40c0da5fc5bc">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-storage-common-9.6.1_48af8689644cd6ecb17fc824c2419f055cba7102.jar" />
 
+        sha1="b6763651ec29b4c95e7bbe63fc393ffcc8c4c2c5">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/internal_impl-24.0.0_1055fe1af038c6ce63de654dd954a4d039099a24/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.0.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="cf2c4e6607c77b0e671dc5ca252c5ea0d9c1ce0d">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-config-9.6.1_db8ba77b89d7aa440ac0686170139e28f09de65e.jar" />
 
+        sha1="0874286cc2fd88d54fdf130e9d5372730da6de97">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-appcompat-v7-24.0.0_7fef7b8e9a4b533406d389142608cd7b149350fe/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gass/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="a136366045678579300d161de97c2211c4c4f7a0">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-cast-9.6.1_e6cebcfd61f8db0e1de857ed62e76f8cc4074fbf.jar" />
 
+        sha1="363a20f1d25336e827dd24020f2ecdc42d62638f">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-gass-9.8.0_136935441bc2374d3e6fef0991c3f67f6c063a3c/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-iid/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-wallet/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="0dfc12e4aacf514346ea866560c99807d032bc48">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-iid-9.6.1_7014a27f57ed36da6bde443bc509f94d66ac5992.jar" />
 
+        sha1="910c013c511f752c4bbe24c5f492f669f4a3ccc0">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-wallet-9.8.0_33918df18de852ff9c11022eafe5c929c4d66667/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-instantapps/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="c828add497d2b7a3de7c047bf72050cd4b7521a1">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-safetynet-9.6.1_4678d98ae5dccc9db0ffa35bc61cb0e5973b2165.jar" />
 
+        sha1="00d358528c5a8731a6e19bca910cbb3fd755ee31">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-instantapps-9.8.0_fc1c185b5952d0d2037bd5bd14e9a98d5d2d7a80/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gass/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.0.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="ee61ace5f3e488fc610e1c67693c49186a441f32">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-gass-9.6.1_896c4af60e1d386beaddc6f5875a8ade673aa21e.jar" />
 
+        sha1="3bd97cfefd783e9de1dd1c30574a6adb44b4409b">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-support-vector-drawable-24.0.0_779af4c59b4d7b1c1469457bd8bfdd61d69f6f97/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="1ef72e72bc0d05602c366582afa9439f58bb31d6">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-common-9.6.1_1ee9d93b6a5bef16c77f067d004083613ebe5687.jar" />
 
+        sha1="266570862e5792ef3c51143a8b8593cf54fac68d">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-tagmanager-api-9.8.0_0781074c70dff3dd41ee18703578e2c477c4a0b4/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="eccaaa9ffa6bb4bfbd2e870f01aaf69655d353be">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-basement-9.6.1_3b563553288b9611099ebf3986f0aa6217a54dd2.jar" />
 
+        sha1="7fd91ec2730fdaa82906aad32a3f3d3e574bae56">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-storage-9.8.0_aa88eadb0e5cad3cd10296be35cb1e8736af8077/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="f8db47be01cbe8cfa81e9cecce5ff1371ed1ad95">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-drive-9.6.1_439b5527f332d0fde03f43ed22ef4715c0997ebf.jar" />
 
+        sha1="5ffe8867f51cfc726e9fb21db1e5b6962ebf25a0">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-messaging-9.8.0_57e03b5b76fc3707d229b8b7b92b694594cb050c/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="518adc52081d41724932b41bc132e4d50a352b86">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-identity-9.6.1_8dd6e8ed2658f860e3443c0a2cc4c83ba83d7f8a.jar" />
 
+        sha1="0b8e087da59c0b062c33f49a335e59f907086da2">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-wearable-9.8.0_035236780241321148d8689380c1e2002010820f/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast-framework/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="9c0cf3d4f9d7d076f301e110b92e18ae23da12c2">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-cast-framework-9.6.1_e3b8b0d2f2f44a2811f6ff98a35fe11a83e590d2.jar" />
 
+        sha1="9f6d236bac26d02b410e4ee186ba517ace5ee661">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-basement-9.8.0_3bccf6bcc9662d6e3f4ace5094096aaed494ae00/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/24.0.0/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-iid/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="b327fbe2fad414bc38cf0ce8f7efe1a38f572837">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.android.support-mediarouter-v7-24.0.0_37111cf3f37cb25b45cafcbf20b7d59ebc35f8b4.jar" />
 
+        sha1="6b6f292b8b951dcf2ecf2b20853e3eabc7d65c48">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-iid-9.8.0_85b28521c4d103b0aa554598bc525fd9b4f3facd/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="a76a6983a23788b3689524d4bed763955afbd306">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-fitness-9.6.1_94a53ea85de76064035a935ef964dffc16dc8411.jar" />
 
+        sha1="c61641e333fa88da21758bab8cc28ee16604b05f">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-common-9.8.0_d79ae3ff232f7acc69aebbc63aaaa88ad3883237/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-awareness/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="90be14317e3f26d18438e8dbf8544500d1dfe07f">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-awareness-9.6.1_13b3809e1cbc9236685716ab1101442909c4a61b.jar" />
 
+        sha1="2f7e6e2dad1bccaf68a8820820adc6c0d5b96d37">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-support-v4-24.0.0_2405e5abb42e00b89ce6df7f5c072345c0402549/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="8ebae43cd06058e99e08c8b4d305b72f2b9927c6">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-plus-9.6.1_74efde925ed72f28ae8a6c63e854c6f453803ba2.jar" />
 
+        sha1="e56f31b23ddb067f95f01255295167db7c798612">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-appinvite-9.8.0_db1641e5bc566dd01e9f1987d238565ff5dfba79/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-nearby/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="f6aa7c76cbaa867e05dbad0afab1ef0e65c4e55f">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-nearby-9.6.1_3ab37a921fabd80c6d6d8d25526c87e9cecacffb.jar" />
 
+        sha1="7e92aadd0697922316d1395c1887a23aebec640a">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-base-9.8.0_93124110ade0eca1bc1f90b1bd46a89f834744b4/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="0cae6511c5705869cacf199f8abb0ea84cd10157">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-vision-9.6.1_7046c35ff7fab1822f646ca381c7c432487957ce.jar" />
 
+        sha1="e3234cd25e23069abd48ecd2117bc0e8011bf45a">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-appindexing-9.8.0_8388d6b91d0a8a7d86a3a815169d825571470938/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.0.0/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-places/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="e70f608219ed6b974644c333249ab2bb7b71de98">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-24.0.0_0432bfa53eb43dda18ef4e2a2522d2908732ec51.jar" />
 
+        sha1="679251204de40ace98776a6f4e3a649c27e3d89f">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-places-9.8.0_2b6ccaba062c06153d4172e13d7f697acff114d5/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-instantapps/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="babb25794a7599069d34705038744c5760a9a88c">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-instantapps-9.6.1_502472f88bac34da85fdaac903a4792fd6880b0c.jar" />
 
+        sha1="74ac7cbcf0de4a88e59612dc3a9e3f9e71acb4ca">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-cast-9.8.0_7a5b206f5c8b69748f976abda3113164a226084f/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-iid/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="6ff796a3173787afe2e712f3aec6f5b99796118e">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-ads-lite-9.6.1_8ac9236c48c6caefc7f159eadfb1127b136cefaf.jar" />
 
+        sha1="85299bf1924dde0200109a58033c5ef84ecb6991">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-iid-9.8.0_a26961d68877f0fe7bc2dc682d45ec69c41e2e1a/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-cast-framework/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="ee0ccb43f6ab276191b7f2d77c305fa9beb26db9">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-clearcut-9.6.1_150290d780b3cbce95dff4c78f1ef8ad67452090.jar" />
 
+        sha1="055eed08c9cff50cac0db69c74c4d9ff7aef3d84">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-cast-framework-9.8.0_e38928212d681428077eafcc1c4630117185f64b/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-nearby/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="2a18547ea91d258866d132c2a763185f15b01b25">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-auth-9.6.1_b65a93693af9823e5d71520a6b5252c45e96537c.jar" />
 
+        sha1="c81df6bd515398ebe45089b0b16c55752a131f6a">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-nearby-9.8.0_f93f25e4b32bddd155d384a9aa998e314032c7a7/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-places/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database-connection/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="cdddf21e0a8205e9955661061d1735ed10e44a7b">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-places-9.6.1_ae576b6d11930d9721dce2ad8c83a0665d9b2bfd.jar" />
 
+        sha1="5f47ede9561595584dca71104baa0fecb36dda87">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-database-connection-9.8.0_6172862b79dc258844ca29a43ce22407e8641a10/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics-impl/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="4df40545c9b875855f3dd9d4928e5d07f07c20ba">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-crash-9.6.1_30cc233294b5b71e088083f80812d190a960a390.jar" />
 
+        sha1="50e35ae101a679c4c8ef3dda075b1df9d5d947d9">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-analytics-impl-9.8.0_a0984f87512b8c86bf04266016f62f0a71027fd1/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/incremental-runtime-classes/debug/instant-run.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="47bbb3ec4b31ba71e125241c090dabe70cbb4de7">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-ads-9.6.1_cb8fcbdf4447e783b359533368a55cff32d7fcf4.jar" />
 
+        sha1="6cf346e253708b5f7644233a177549c90b526951">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run_15a1d2a9f707c04a32b2e59a05f11d5d24fd3ce9/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="465f40f840e583f8b7421a3aacf3fbf08c28f00a">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-auth-base-9.6.1_7c13c2c00b4257fd63f3da661fa647661d12adf5.jar" />
 
+        sha1="78ea232052df889856dcb7b7b542707c89bb3bfb">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-multidex-1.0.1_acbdadd08a79c83848e4c5c45cf39c3c1e5068a6/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="da3f763afd39da1c947d9442847c837e9182a09f">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-auth-9.6.1_7b0956e5298c0704efcdce87ed69e78870b69577.jar" />
 
+        sha1="03df48d3713661d66ad024b1e406259a4c26fcac">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-database-9.8.0_0e49b07e90ce06f18619b27c049b66b27573b528/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="526f4b02f1771fa7607ff1b89fe2e9bd0344fee8">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-analytics-9.6.1_7a7d4736db50f805b1dff41d472dae36c85fa415.jar" />
 
+        sha1="04bbbddf868aa02dd33f9e90d8f5d908c360f638">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-location-9.8.0_09556db1e4fa2f91ac1b8a666e4b482e7f0ea35d/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appinvite/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="0e0e0681c26a1f575d3e4c542182dd59bab75fd6">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-appinvite-9.6.1_44fde3350ae98e4b6b4e01b9a98c6ebd08618756.jar" />
 
+        sha1="4438b1a7848a7c571122ba618aa1304514aabee6">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-auth-common-9.8.0_991a8566aff547b010754b1e30f5c65297e013bf/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.0.0/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="0874286cc2fd88d54fdf130e9d5372730da6de97">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-24.0.0_fffe2f4e617ed3b8b602d243b14e5bfddbc035fe.jar" />
 
+        sha1="f2d240dd085626f03f759c41d628a0c8b63e491f">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-ads-9.8.0_f0e3f40d925b978bae5086f1b688ad465c13974f/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-config/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="ad7706f8bb4a985656a8d2142f74021c8b0e03d8">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-gcm-9.6.1_0cd90341675e204663d8aded708c25b798e726cd.jar" />
 
+        sha1="289cad663c288ce965463cb9ece8b35cc7de0fac">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-config-9.8.0_80b37e37c27d00f8c0f312a883ad116bed31d32c/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/24.0.0/jars/libs/internal_impl-24.0.0.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth-base/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="b6763651ec29b4c95e7bbe63fc393ffcc8c4c2c5">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/internal_impl-24.0.0_9e4eec54accb1025979d2d84a5828ba0a5fa0f7e.jar" />
 
+        sha1="a1ed98e01bd58976d80c062fd0ea2968a1ff68a1">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-auth-base-9.8.0_e51c86e62ac06fb61d2ea8b66ac2cea4810c0450/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager-api/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/incremental-classes/debug/instant-run-bootstrap.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="f0e96478ca3147bc588aadb9ae467d85b42473cc">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-tagmanager-api-9.6.1_3a3f426ee25c2910c6847e28a26e06c92b412979.jar" />
 
+        sha1="e028955d7c7107d32dcd97784324a384650182b5">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/instant-run-bootstrap_1f8d3b9c93240d0d1885dad81b19dab9322da9fd/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/palette-v7/24.0.0/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-vision/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="734e80dffea7bd76c18ae256822a124c30d85850">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.android.support-palette-v7-24.0.0_1eb42a962599c03e9301e4593d9d3e0752764a5e.jar" />
 
+        sha1="a30aea7df545072ad3c06f56b2efc13e67222140">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-vision-9.8.0_e9d270e53ca3748e41bbc3b49095af940d1be322/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars/libs/internal_impl-24.0.0.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="fcaf463e10e69c1923ccf1edeba3b4196d239e00">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/internal_impl-24.0.0_0bfa3fe36cec8d9b2d7905ab662ceeb5a4a0e58a.jar" />
 
+        sha1="190a642ba16d1421296a4d794606279b80039c59">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-analytics-impl-9.8.0_9310018f448c90b6176e92e47f467e6e0b652572/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-games/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="d45c048bb1c55cf963899190e507065aea8e5be9">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-games-9.6.1_7187e617d56a281306570d28a8f3f1fc56d3bceb.jar" />
 
+        sha1="b4671be3d1288bf4e5f527cd33e42909fbe4ecc6">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-crash-9.8.0_4d3e16bde72e1f0b90cb4c701e690ec7810d598a/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics-impl/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="a53ac0560ab915a02c50d2e5c7b003381e6fb5e3">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-analytics-impl-9.6.1_0bf634eb6b12cfc69346189837582a52fcd9a023.jar" />
 
+        sha1="16afe57c1d7f8165d107c7806ce7b0c71de87159">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-analytics-9.8.0_304497a55aa685d6d7fe616fc4685f1da9ece2d4/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-module/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-safetynet/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="6ffe8b28ab61e5ee92ab9431a220379790c71ddf">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-auth-module-9.6.1_77dbaa8ee2121c4b96ecf141481f5174812c95b1.jar" />
 
+        sha1="20a3c4e355150c15c13dd58045d43ad0c717d916">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-safetynet-9.8.0_b6a3be890d92e2bceb9c239098aa4e5ded9a2fde/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-auth/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="a1c351dc10b92d638da57f3a6513f87cfbdc9f83">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-analytics-9.6.1_23e650ce0aab172a687385979e89845d745beb83.jar" />
 
+        sha1="ca851be26ff89f5b32cc222cee98139fb3fac830">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-auth-9.8.0_d9ee32f042317823baa9e464f78570f0ddaedbe5/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Programs/Android/android-sdk-linux/extras/android/m2repository/com/android/support/support-annotations/24.0.0/support-annotations-24.0.0.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.0.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="2943c74db6d4346ab8c6531adac91fa05c137c40">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/support-annotations-24.0.0_a307c3e70da68a9f44492c93047893d0b55d1b75.jar" />
 
+        sha1="e70f608219ed6b974644c333249ab2bb7b71de98">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-animated-vector-drawable-24.0.0_025bebee508480f87c4e017fd682ee9c2d5e2648/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-appindexing/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="cc39b4bcc9e7062891db90d5a752fa9e4986f447">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-appindexing-9.6.1_598e839e48d8dd58401117fe429593be893f77b9.jar" />
 
+        sha1="9ff04cc3470178a44512624036751a803418c2ca">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-analytics-9.8.0_38d0e9b02eb98f963d5ddc03aacb914cac779b19/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-drive/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="b75ecdd04a37d31b4a0da2729fc5c558962a529b">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-database-9.6.1_d0ea3856c392787d15aac4247ee2e2ba824b6feb.jar" />
 
+        sha1="0b53c4b90654b67ee3892a8e2e7b819c083ab7a6">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-drive-9.8.0_a39dd64fc73178a7fbf9b4e7af36127cdb5b41a2/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-fitness/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="8c6ef5bd4072f8cda2b89d8356ea7d8acd0683aa">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-storage-9.6.1_130d84515be5e8380c6231d1accd13b45ca98716.jar" />
 
+        sha1="a7a04d6b7c01e569a285fa627cf64f5b05295906">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-fitness-9.8.0_4e390e594e082fcc57db950dfa56f0d1219a805f/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-database-connection/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="ac8365c87591065db07f7bac8551504504832cd4">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-database-connection-9.6.1_8dfb11044e39d6aeeee7f957383e98ef73f294b4.jar" />
 
+        sha1="122ec9237acd8a57d974b9d529987f1ee6ca5aea">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-maps-9.8.0_3f533d8d2a31d2095f5a226af82b4a5049032ed1/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-games/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="1810ae0df0a1b9b539ce97df54e96f2bf8f5ff94">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-tagmanager-9.6.1_4ebb81133a0d5b4b538b68858350108b02f5f790.jar" />
 
+        sha1="fbb3885c40e431cd2b0dc69c0cab2bf6d5da7b43">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-games-9.8.0_1cfe6955cc90c06bd807299d0e42e6d3dbed1420/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tagmanager/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="ff9be0a1e75a21c372735930d8987a55b5e6065f">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-panorama-9.6.1_edbce62deb7f068efdf61b8b2fb432bfd6340029.jar" />
 
+        sha1="a972970c8beddb69c198f61f3fc55f0606a7dfe3">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-tagmanager-9.8.0_d3cb228a84cb7e2023a7cda3d65bf9dffb738436/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="2f7e6e2dad1bccaf68a8820820adc6c0d5b96d37">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-24.0.0_82200ff615466707c1068dc2de15d0e06b5f7532.jar" />
 
+        sha1="e9b2cfdfd59b03643f1e240668275378b96615a8">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-ads-lite-9.8.0_2d1a8abbfd58330e7ee0598533be3a1c14f91b08/classes.dex" />
 
+    </item>
 
+    <item
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-identity/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
+        optimize="true"
 
+        revision="23.0.3"
 
+        sha1="cef85cfc7df40e29fbea58844dd4c1e7d0b15542">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-identity-9.8.0_92e692dac73502fa44dfbf2111ddcb440f910699/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-panorama/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="80dd8bea08bc5fe10b10a3243b8279c856ccc690">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-messaging-9.6.1_ca9035fcae6e09c2bc3167ed7844256ed56f010c.jar" />
 
+        sha1="2d3035050a075484cbf2e33f1ce1f779bae4d451">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-panorama-9.8.0_443e11effa260c78dd048572e74481584197c280/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="c4394d46152165cd3256fb711ac94f66a28fbae1">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-wearable-9.6.1_032dcfc4a8f685fde6ebb96ace6ff7e6aefad27f.jar" />
 
+        sha1="15e59454416c6341bd3ed2533b585cd340682dd1">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-auth-9.8.0_bf70c5f6c5d03920f28655523113af69e0bf55bf/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-auth-common/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Programs/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/24.0.0/support-annotations-24.0.0.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="77558e74bb2056ef38516296f13a27c4c4fc3e5c">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-auth-common-9.6.1_eeb25c700a88f601d9a935cdc3c0d9a2ea2720b4.jar" />
 
+        sha1="2943c74db6d4346ab8c6531adac91fa05c137c40">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/support-annotations-24.0.0_a204ee22575048a5757e016bb09883c73ef9d2fe/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="79f521967ad7f49b34748db89df02852c2b2f87b">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-location-9.6.1_4dd398850bcc58da034d2a7115aef034f34715ee.jar" />
 
+        sha1="ee5304fd374e0b4ebf6b42d4037fbfb2c5336511">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-clearcut-9.8.0_23e57e78b70f65b627689c14c5a1a7943651614c/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.0.0/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-awareness/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="3bd97cfefd783e9de1dd1c30574a6adb44b4409b">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.android.support-support-vector-drawable-24.0.0_30a210962b76daf110f6c248d758ff76af36c91f.jar" />
 
+        sha1="a2537b11ae24b42172d34e2a613fc0b903c56158">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-awareness-9.8.0_d033a8aa306a43878a1a01b805c4c7ff651a163c/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.firebase/firebase-storage-common/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="4a36600281a648769411ef642c331851732bf29e">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-tasks-9.6.1_e5da4cbad7106508e70f48ab1c58b1bd89f9d339.jar" />
 
+        sha1="ec9104b53aee77dfcfd2fe1c4add23ff7c4df55f">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.firebase-firebase-storage-common-9.8.0_eadb09fec83faf92d2a3962402bbcaddadd1837b/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/mediarouter-v7/24.0.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="62ff84124b89177abc0c27f3e38c9732f2d41617">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-maps-9.6.1_7d3d201dd83655f1e56d50051050b9fc7499d5e7.jar" />
 
+        sha1="b327fbe2fad414bc38cf0ce8f7efe1a38f572837">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-mediarouter-v7-24.0.0_706b31c0a28b18bdf2132ccc7939541728a94cb9/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-wallet/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="dfcba20b85ef3669a8ced0a8760a6df281cbd7c7">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-wallet-9.6.1_e14df77cbd735d7b7b5220855532ace3c5be2c47.jar" />
 
+        sha1="9dae58326f6f6a515022468cce56dd04ec3b9fdb">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-gcm-9.8.0_8a83d84cd4e99ced12f131366186881e3994205a/classes.dex" />
 
     </item>
 
     <item
 
-        is-multidex="false"
 
-        jar="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.6.1/jars/classes.jar"
 
-        jumboMode="false"
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
         optimize="true"
 
         revision="23.0.3"
 
-        sha1="0efd1b44f47c134fb245914a1d54a55adbfc2f8d">
 
-        <dex dex="/home/seavenois/Workspace/Programming/GM_APP/app/build/intermediates/pre-dexed/debug/com.google.firebase-firebase-analytics-impl-9.6.1_53934db2b49616a01755c1a794694d08424aa1a4.jar" />
 
+        sha1="bf2e1838e4428616c1aa26edf43de72b5b99bf84">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-tasks-9.8.0_043faf11c6abe645354a5c73a74a8605204b1261/classes.dex" />
 
+    </item>
 
+    <item
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-plus/9.8.0/jars/classes.jar"
 
+        jumboMode="true"
 
+        optimize="true"
 
+        revision="23.0.3"
 
+        sha1="3daa7a9c9009fd386872a84c177a76979bdcafd6">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.google.android.gms-play-services-plus-9.8.0_9d0fe6ff89528de9139499cc0e7c80783e4b1df2/classes.dex" />
 
+    </item>
 
+    <item
 
+        is-multidex="true"
 
+        jar="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/exploded-aar/com.android.support/palette-v7/24.0.0/jars/classes.jar"
 
+        jumboMode="true"
 
+        optimize="true"
 
+        revision="23.0.3"
 
+        sha1="734e80dffea7bd76c18ae256822a124c30d85850">
 
+        <dex dex="/home/seavenois/Workspace/GasteizkoMargolariakApp/app/build/intermediates/transforms/dex/debug/folders/1000/10/com.android.support-palette-v7-24.0.0_36f3b0263787295c8ddece1cb24ad54877f5ca2f/classes.dex" />
 
     </item>
 
 
 </items>