From 35d9b7dcd810ca7b5c5d60493711f02e7406ada0 Mon Sep 17 00:00:00 2001
From: Ferdinando Traversa <ferdi.traversa@gmail.com>
Date: Sat, 11 Jul 2020 23:55:43 +0200
Subject: [PATCH 1/2] Problema che su iOS portava ad una strana  top bar

Bump a 1.1.7
---
 app/styles/app.tss   |  3 ---
 app/styles/index.tss | 10 ++--------
 tiapp.xml            |  8 +++-----
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/styles/app.tss b/app/styles/app.tss
index 1f266a9..101f32e 100644
--- a/app/styles/app.tss
+++ b/app/styles/app.tss
@@ -147,9 +147,6 @@ overrode the settings with other TSS, XML, or JS settings:
 	left: "0%"
 }
 
-"Window": {
-	backgroundColor: '#FFFFFF',
-}
 
 ".greycliffbold": {
 	  font: {
diff --git a/app/styles/index.tss b/app/styles/index.tss
index 94b17fd..762436a 100755
--- a/app/styles/index.tss
+++ b/app/styles/index.tss
@@ -1,6 +1,4 @@
-".container": {
-	backgroundColor:"white"
-}
+
 
 "#label": {
 	font: {
@@ -8,10 +6,6 @@
 	}
 }
 
-".container": {
-    backgroundColor: "white"
-}
-
-"TabGroup": {
+"TabGroup[platform=android]": {
 	theme: "Theme.AppCompat.NoTitleBar"
 }
\ No newline at end of file
diff --git a/tiapp.xml b/tiapp.xml
index 18b6f22..0a03fc9 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -3,14 +3,14 @@
   xmlns:ti="http://ti.appcelerator.org">
   <id>it.wikimedia.wikilovesmonuments</id>
   <name>WLM Italia</name>
-  <version>1.1.6</version>
+  <version>1.1.7</version>
   <publisher>Ferdinando Traversa</publisher>
   <url>https://www.wikilovesmonuments.wikimedia.it</url>
   <description>App per trovare i monumenti partecipanti a Wiki Loves Monuments con la propria posizione.</description>
   <copyright>Ferdinando Traversa - Apache License</copyright>
   <icon>appicon.png</icon>
   <fullscreen>false</fullscreen>
-  <navbar-hidden>true</navbar-hidden>
+  <navbar-hidden>false</navbar-hidden>
   <analytics>true</analytics>
   <guid>2234bc15-7129-44c8-9444-e86bff2a2a3d</guid>
   <property name="ti.ui.defaultunit" type="string">dp</property>
@@ -38,8 +38,6 @@
         <false/>
         <key>UIStatusBarHidden</key>
         <false/>
-        <key>UIStatusBarStyle</key>
-        <string>UIStatusBarStyleDefault</string>
         <key>NSLocationWhenInUseUsageDescription</key>
         <string>Abbiamo bisogno della tua posizione per poterti localizzare ed indicare quali sono i monumenti più vicini a te.</string>
         <key>NSLocationAlwaysUsageDescription</key>
@@ -49,7 +47,7 @@
   </ios>
   <android 
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <manifest android:versionCode="11" 
+    <manifest android:versionCode="12" 
       xmlns:android="http://schemas.android.com/apk/res/android">
       <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
       <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

From 9c60aa42c51e6034e5f87c4379f12233f083f2ef Mon Sep 17 00:00:00 2001
From: Ferdinando Traversa <ferdi.traversa@gmail.com>
Date: Sun, 12 Jul 2020 23:29:09 +0200
Subject: [PATCH 2/2] Aggiornamento urgente per cambio backend

---
 .gitignore                    |  3 ++-
 app/controllers/home/index.js |  6 +-----
 app/controllers/home/show.js  | 10 +++++-----
 app/styles/home/index.tss     |  3 ++-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf98853..f3eff93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ tmp
 .settings
 Thumbs.db
 distandroid
-distios
\ No newline at end of file
+distios
+backend
\ No newline at end of file
diff --git a/app/controllers/home/index.js b/app/controllers/home/index.js
index 4e7d0f1..a5497cc 100644
--- a/app/controllers/home/index.js
+++ b/app/controllers/home/index.js
@@ -56,7 +56,7 @@ function findmon(e, type, latkeep, latdelta, londelta) {
         annotation = Map.createAnnotation({
           latitude: item.latitude,
           longitude: item.longitude,
-          title: item.itemLabel,
+          title: item.itemlabel,
           myid: item.id,
           leftButton: "/images/Info blue.png"
         });
@@ -128,13 +128,9 @@ $.refresh.addEventListener('click', function () {
 $.search.addEventListener('click', function () {
   $.searchfield.show();
   $.searchfield.focus();
-  if (OS_ANDROID) {
-    $.searchfield.height = "20%";
-  }
   $.searchfield.addEventListener('return', function (e) {
     findmon(e.value, "city");
     $.searchfield.hide();
-    $.searchfield.height = "10%";
     if (OS_ANDROID) {
       Ti.UI.Android.hideSoftKeyboard();
     }
diff --git a/app/controllers/home/show.js b/app/controllers/home/show.js
index 5a42940..82eddae 100644
--- a/app/controllers/home/show.js
+++ b/app/controllers/home/show.js
@@ -15,18 +15,18 @@ var client = Ti.Network.createHTTPClient({
     onload: function (e) {
         var response = JSON.parse(this.responseText);
 
-        $.window.title = response.itemLabel;
+        $.window.title = response.itemlabel;
         if (OS_ANDROID) {
             $.window.addEventListener("open", function(){
-                $.window.activity.actionBar.title = response.itemLabel;
+                $.window.activity.actionBar.title = response.itemlabel;
             });
         }
 
         if (response.image != null && response.image != undefined && response.image != "") {
             $.image.image = "https://commons.wikimedia.org/w/thumb.php?f=" + response.image + "&w=1000";
         }
-        if (response.itemDescription != null && response.itemDescription != undefined && response.itemDescription != "") {
-            $.description.text = response.itemDescription;
+        if (response.itemdescription != null && response.itemdescription != undefined && response.itemdescription != "") {
+            $.description.text = response.itemdescription;
         } else {
             $.description.hide();
         }
@@ -37,7 +37,7 @@ var client = Ti.Network.createHTTPClient({
         } else {
             $.Wikipedia.hide();
         }
-        $.title.text = response.itemLabel;
+        $.title.text = response.itemlabel;
         $.Wikidata.addEventListener('click', function (e) {
             Ti.Platform.openURL("https://www.wikidata.org/wiki/" + response.item);
         });
diff --git a/app/styles/home/index.tss b/app/styles/home/index.tss
index ca3d3b4..274f71c 100644
--- a/app/styles/home/index.tss
+++ b/app/styles/home/index.tss
@@ -1,6 +1,7 @@
 
 "Window": {
-  height: Ti.UI.FILL	
+  height: Ti.UI.FILL,
+  windowSoftInputMode: Ti.UI.Android.SOFT_INPUT_ADJUST_PAN
 }
 
 "#mapview": {