From 96c9ca22cb1b274b37e481a2cf09b10d16878ed3 Mon Sep 17 00:00:00 2001
From: Michal Holecy <michal.holecy@sygictravel.com>
Date: Wed, 2 Aug 2017 09:24:28 +0200
Subject: [PATCH 1/2] SDK: Updating Android SDK version to 26

---
 app/build.gradle                              | 18 ++++++------
 .../sygic/travel/sdkdemo/DemoMainActivity.kt  | 11 ++++----
 .../sdkdemo/detail/PlaceDetailActivity.kt     | 28 +++++++++----------
 .../sdkdemo/detail/ReferenceActivity.kt       |  4 +--
 .../sdkdemo/favorites/FavoritesActivity.kt    |  2 +-
 .../sdkdemo/filters/CategoriesDialog.kt       |  2 +-
 .../travel/sdkdemo/gallery/GalleryActivity.kt |  2 +-
 .../travel/sdkdemo/gallery/GalleryAdapter.kt  |  2 +-
 .../travel/sdkdemo/gallery/PhotoActivity.kt   |  2 +-
 .../travel/sdkdemo/list/PlacesAdapter.kt      |  5 ++--
 .../travel/sdkdemo/list/PlacesListActivity.kt |  2 +-
 .../travel/sdkdemo/search/SearchActivity.kt   |  4 +--
 .../travel/sdkdemo/tours/ToursActivity.kt     |  2 +-
 .../travel/sdkdemo/tours/ToursAdapter.kt      |  4 +--
 build.gradle                                  |  2 +-
 sdk/build.gradle                              |  8 +++---
 16 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 578dd78d..459aa94d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "com.sygic.travel.sdkdemo"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,15 +30,15 @@ dependencies {
     compile project(":sdk")
 
     // google
-    compile 'com.google.android.gms:play-services-location:11.0.2'
-    compile 'com.google.android.gms:play-services-maps:11.0.2'
+    compile 'com.google.android.gms:play-services-location:11.0.4'
+    compile 'com.google.android.gms:play-services-maps:11.0.4'
     compile 'com.google.android:flexbox:0.3.0'
 
     // Android
-    compile 'com.android.support:appcompat-v7:25.4.0'
-    compile 'com.android.support:design:25.4.0'
-    compile 'com.android.support:cardview-v7:25.4.0'
-    compile 'com.android.support:recyclerview-v7:25.4.0'
+    compile 'com.android.support:appcompat-v7:26.0.0'
+    compile 'com.android.support:design:26.0.0'
+    compile 'com.android.support:cardview-v7:26.0.0'
+    compile 'com.android.support:recyclerview-v7:26.0.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
     // photos
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/DemoMainActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/DemoMainActivity.kt
index 2818eba4..c43d2ddf 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/DemoMainActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/DemoMainActivity.kt
@@ -3,6 +3,7 @@ package com.sygic.travel.sdkdemo
 import android.content.Intent
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.widget.Button
 import com.sygic.travel.sdk.StSDK
 import com.sygic.travel.sdkdemo.favorites.FavoritesActivity
 import com.sygic.travel.sdkdemo.list.PlacesListActivity
@@ -23,11 +24,11 @@ class DemoMainActivity : AppCompatActivity() {
 	}
 
 	private fun initUI() {
-		findViewById(R.id.btn_map_activity).setOnClickListener { startMapActivity() }
-		findViewById(R.id.btn_list_activity).setOnClickListener { startListActivity() }
-		findViewById(R.id.btn_search_activity).setOnClickListener { startSearchActivity() }
-		findViewById(R.id.btn_tours_activity).setOnClickListener { startToursActivity() }
-		findViewById(R.id.btn_favorites_activity).setOnClickListener { startFavoritesActivity() }
+		findViewById<Button>(R.id.btn_map_activity).setOnClickListener { startMapActivity() }
+		findViewById<Button>(R.id.btn_list_activity).setOnClickListener { startListActivity() }
+		findViewById<Button>(R.id.btn_search_activity).setOnClickListener { startSearchActivity() }
+		findViewById<Button>(R.id.btn_tours_activity).setOnClickListener { startToursActivity() }
+		findViewById<Button>(R.id.btn_favorites_activity).setOnClickListener { startFavoritesActivity() }
 	}
 
 	private fun startMapActivity() {
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/detail/PlaceDetailActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/detail/PlaceDetailActivity.kt
index 516be4fc..8658688f 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/detail/PlaceDetailActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/detail/PlaceDetailActivity.kt
@@ -214,20 +214,20 @@ class PlaceDetailActivity : AppCompatActivity() {
         }
 
     private inner class Views internal constructor() {
-        internal var ivPhoto: ImageView = findViewById(R.id.iv_detail_photo) as ImageView
-        internal var tvName: TextView = findViewById(R.id.tv_name) as TextView
-        internal var tvNameSuffix: TextView = findViewById(R.id.tv_name_suffix) as TextView
-        internal var tvPerex: TextView = findViewById(R.id.tv_perex) as TextView
-        internal var tvDescription: TextView = findViewById(R.id.tv_description) as TextView
-        internal var tvRating: TextView = findViewById(R.id.tv_rating) as TextView
-        internal var tvAddress: TextView = findViewById(R.id.tv_address) as TextView
-        internal var tvPhone: TextView = findViewById(R.id.tv_phone) as TextView
-        internal var tvEmail: TextView = findViewById(R.id.tv_email) as TextView
-        internal var tvAdmission: TextView = findViewById(R.id.tv_admission) as TextView
-        internal var tvOpeningHours: TextView = findViewById(R.id.tv_opening_hours) as TextView
-        internal var fblTags: FlexboxLayout = findViewById(R.id.fbl_tags) as FlexboxLayout
-        internal var llReferencesList: LinearLayout = findViewById(R.id.ll_references_list) as LinearLayout
-        internal var cbFavorite: CheckBox = findViewById(R.id.cb_favorite) as CheckBox
+        internal var ivPhoto: ImageView = findViewById(R.id.iv_detail_photo)
+        internal var tvName: TextView = findViewById(R.id.tv_name)
+        internal var tvNameSuffix: TextView = findViewById(R.id.tv_name_suffix)
+        internal var tvPerex: TextView = findViewById(R.id.tv_perex)
+        internal var tvDescription: TextView = findViewById(R.id.tv_description)
+        internal var tvRating: TextView = findViewById(R.id.tv_rating)
+        internal var tvAddress: TextView = findViewById(R.id.tv_address)
+        internal var tvPhone: TextView = findViewById(R.id.tv_phone)
+        internal var tvEmail: TextView = findViewById(R.id.tv_email)
+        internal var tvAdmission: TextView = findViewById(R.id.tv_admission)
+        internal var tvOpeningHours: TextView = findViewById(R.id.tv_opening_hours)
+        internal var fblTags: FlexboxLayout = findViewById(R.id.fbl_tags)
+        internal var llReferencesList: LinearLayout = findViewById(R.id.ll_references_list)
+        internal var cbFavorite: CheckBox = findViewById(R.id.cb_favorite)
     }
 
     companion object {
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/detail/ReferenceActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/detail/ReferenceActivity.kt
index a7678342..74c77aff 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/detail/ReferenceActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/detail/ReferenceActivity.kt
@@ -41,9 +41,9 @@ class ReferenceActivity : AppCompatActivity() {
         if (loaded) {
             return
         }
-        progressBar = findViewById(R.id.pb_reference) as ProgressBar
+        progressBar = findViewById(R.id.pb_reference)
 
-        webView = findViewById(R.id.wv_reference) as WebView
+        webView = findViewById(R.id.wv_reference)
         webView!!.settings.javaScriptEnabled = true
         webView!!.settings.domStorageEnabled = true
         webView!!.settings.setSupportZoom(true)
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/favorites/FavoritesActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/favorites/FavoritesActivity.kt
index b59553d9..678a2a7f 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/favorites/FavoritesActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/favorites/FavoritesActivity.kt
@@ -63,7 +63,7 @@ class FavoritesActivity : AppCompatActivity() {
 
 	// Recycler view initialization - list with dividers
 	private fun initRecycler() {
-		rvPlaces = findViewById(R.id.rv_places) as RecyclerView
+		rvPlaces = findViewById(R.id.rv_places)
 		rvPlaces!!.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
 		rvPlaces!!.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
 		placesAdapter = PlacesAdapter(onPlaceClick, Utils.getDetailPhotoSize(this))
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/filters/CategoriesDialog.kt b/app/src/main/java/com/sygic/travel/sdkdemo/filters/CategoriesDialog.kt
index 58889d2c..1c9d1a1f 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/filters/CategoriesDialog.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/filters/CategoriesDialog.kt
@@ -15,7 +15,7 @@ class CategoriesDialog(context: Context, private val onCategoryClick: Categories
 
     private fun render() {
         setContentView(R.layout.categories_dialog)
-        val rvCategories = findViewById(R.id.rv_categories) as RecyclerView
+        val rvCategories = findViewById<RecyclerView>(R.id.rv_categories)
         rvCategories.layoutManager = LinearLayoutManager(context)
         rvCategories.addItemDecoration(DividerDecoration(context, R.drawable.line_divider))
         rvCategories.adapter = CategoriesAdapter(onCategoryClick)
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryActivity.kt
index b5a4e6f6..f655438d 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryActivity.kt
@@ -38,7 +38,7 @@ class GalleryActivity : AppCompatActivity() {
     }
 
     private fun initRecycler() {
-        rvGallery = findViewById(R.id.rv_gallery) as RecyclerView
+        rvGallery = findViewById(R.id.rv_gallery)
         rvGallery!!.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         rvGallery!!.addItemDecoration(DividerDecoration(this, R.drawable.line_divider))
         galleryAdapter = GalleryAdapter(onPhotoClick, Utils.getDetailPhotoSize(this))
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryAdapter.kt b/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryAdapter.kt
index 3ca7c7ab..3ad7c62b 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryAdapter.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/gallery/GalleryAdapter.kt
@@ -48,7 +48,7 @@ class GalleryAdapter(
             vItem: View,
             private val galleryPhotoClick: ViewHolder.GalleryPhotoClick
     ) : RecyclerView.ViewHolder(vItem), View.OnClickListener {
-        var ivPhoto: ImageView = vItem.findViewById(R.id.iv_gallery_photo) as ImageView
+        var ivPhoto: ImageView = vItem.findViewById(R.id.iv_gallery_photo)
 
         init {
             vItem.setOnClickListener(this)
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/gallery/PhotoActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/gallery/PhotoActivity.kt
index 81609639..648d5ba5 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/gallery/PhotoActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/gallery/PhotoActivity.kt
@@ -29,7 +29,7 @@ class PhotoActivity : AppCompatActivity() {
                 .with(this)
                 .load(photoUrl)
                 .placeholder(R.drawable.ic_photo_camera)
-                .into(findViewById(R.id.iv_gallery_photo) as ImageView)
+                .into(findViewById<ImageView>(R.id.iv_gallery_photo))
     }
 
     companion object {
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesAdapter.kt b/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesAdapter.kt
index e52a6544..b66388e8 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesAdapter.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesAdapter.kt
@@ -52,9 +52,8 @@ class PlacesAdapter(
     }
 
     class ViewHolder(vItem: View, private val placeClick: ViewHolder.PlaceClick) : RecyclerView.ViewHolder(vItem), View.OnClickListener {
-        internal val ivPlacePhoto: ImageView = vItem.findViewById(R.id.iv_place_item_photo) as ImageView
-        internal val tvPlaceName: TextView = vItem.findViewById(R.id.tv_place_item_name) as TextView
-
+        internal val ivPlacePhoto: ImageView = vItem.findViewById(R.id.iv_place_item_photo)
+        internal val tvPlaceName: TextView = vItem.findViewById(R.id.tv_place_item_name)
         init {
             vItem.setOnClickListener(this)
         }
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesListActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesListActivity.kt
index 5122af51..c3e9ee65 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesListActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/list/PlacesListActivity.kt
@@ -64,7 +64,7 @@ class PlacesListActivity : AppCompatActivity() {
 
     // Recycler view initialization - list with dividers
     private fun initRecycler() {
-        rvPlaces = findViewById(R.id.rv_places) as RecyclerView
+        rvPlaces = findViewById(R.id.rv_places)
         rvPlaces!!.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         rvPlaces!!.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
         placesAdapter = PlacesAdapter(onPlaceClick, Utils.getDetailPhotoSize(this))
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/search/SearchActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/search/SearchActivity.kt
index 718f2ebe..46e375fe 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/search/SearchActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/search/SearchActivity.kt
@@ -48,7 +48,7 @@ class SearchActivity : AppCompatActivity() {
 
     // Recycler view initialization - list with dividers
     private fun initRecycler() {
-        rvPlaces = findViewById(R.id.rv_result_places) as RecyclerView
+        rvPlaces = findViewById(R.id.rv_result_places)
         rvPlaces!!.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         rvPlaces!!.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
         placesAdapter = PlacesAdapter(onPlaceClick, Utils.getDetailPhotoSize(this))
@@ -113,7 +113,7 @@ class SearchActivity : AppCompatActivity() {
     // Sets listners for search edit text.
     private fun setSearchListeners(searchItem: MenuItem) {
         val searchView = MenuItemCompat.getActionView(searchItem) as SearchView
-        val searchEdit = searchView.findViewById(R.id.search_src_text) as EditText
+        val searchEdit = searchView.findViewById<EditText>(R.id.search_src_text)
 
         searchEdit.imeOptions = EditorInfo.IME_ACTION_SEARCH
         searchEdit.setOnEditorActionListener(getOnKeyboardEnterClickListener())
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursActivity.kt b/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursActivity.kt
index f861baa7..0e229ee7 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursActivity.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursActivity.kt
@@ -74,7 +74,7 @@ class ToursActivity : AppCompatActivity(), ToursAdapter.ListItemClickListener {
 
     // Recycler view initialization - list with dividers
     private fun initRecycler() {
-        rvTours = findViewById(R.id.rv_tours) as RecyclerView
+        rvTours = findViewById(R.id.rv_tours)
         rvTours!!.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         rvTours!!.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))
         toursAdapter = ToursAdapter(this)
diff --git a/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursAdapter.kt b/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursAdapter.kt
index fc424c12..c4073c29 100644
--- a/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursAdapter.kt
+++ b/app/src/main/java/com/sygic/travel/sdkdemo/tours/ToursAdapter.kt
@@ -59,8 +59,8 @@ internal class ToursAdapter(
     }
 
     internal inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-        internal val ivTourPhoto: ImageView = itemView.findViewById(R.id.iv_tour_item_photo) as ImageView
-        internal val tvTourName: TextView = itemView.findViewById(R.id.tv_tour_item_name) as TextView
+        internal val ivTourPhoto: ImageView = itemView.findViewById(R.id.iv_tour_item_photo)
+        internal val tvTourName: TextView = itemView.findViewById(R.id.tv_tour_item_name)
 
         init {
             itemView.setOnClickListener(this)
diff --git a/build.gradle b/build.gradle
index cf04b665..3495f61b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext.kotlin_version = '1.1.3-2'
     ext.dokka_version = '0.9.15'
-    ext.room_version = '1.0.0-alpha3'
+    ext.room_version = '1.0.0-alpha7'
 
     repositories {
         jcenter()
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 627d4485..64e8cfd4 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -28,13 +28,13 @@ ext {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
 
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName stVersion
 
@@ -75,7 +75,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    compile 'com.android.support:appcompat-v7:25.4.0'
+    compile 'com.android.support:appcompat-v7:26.0.0'
     testCompile "junit:junit:4.12"
     testCompile "com.nhaarman:mockito-kotlin:1.4.0"
 }

From 285a88d84b3b1939a69ecf0d6f105f1968f9113e Mon Sep 17 00:00:00 2001
From: Michal Holecy <michal.holecy@sygictravel.com>
Date: Thu, 27 Jul 2017 14:07:27 +0200
Subject: [PATCH 2/2] SDK: Fix of parsing JSON in PlaceDetail => Description

---
 .../com/sygic/travel/sdk/api/model/place/ApiDescription.kt  | 6 +++---
 .../java/com/sygic/travel/sdk/model/place/Description.kt    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sdk/src/main/java/com/sygic/travel/sdk/api/model/place/ApiDescription.kt b/sdk/src/main/java/com/sygic/travel/sdk/api/model/place/ApiDescription.kt
index 809781ce..30e3c9aa 100644
--- a/sdk/src/main/java/com/sygic/travel/sdk/api/model/place/ApiDescription.kt
+++ b/sdk/src/main/java/com/sygic/travel/sdk/api/model/place/ApiDescription.kt
@@ -18,8 +18,8 @@ internal class ApiDescription : ApiModel<Description> {
     @SerializedName("translation_provider")
     var translationProvider: String? = null
 
-    @SerializedName("url")
-    var url: String? = null
+    @SerializedName("link")
+    var link: String? = null
 
     override fun convert(): Description {
         val description = Description()
@@ -27,7 +27,7 @@ internal class ApiDescription : ApiModel<Description> {
         description.text = text
         description.provider = provider
         description.translationProvider = translationProvider
-        description.url = url
+        description.link = link
 
         return description
     }
diff --git a/sdk/src/main/java/com/sygic/travel/sdk/model/place/Description.kt b/sdk/src/main/java/com/sygic/travel/sdk/model/place/Description.kt
index 66f77e6b..ff17d15f 100644
--- a/sdk/src/main/java/com/sygic/travel/sdk/model/place/Description.kt
+++ b/sdk/src/main/java/com/sygic/travel/sdk/model/place/Description.kt
@@ -7,5 +7,5 @@ class Description {
     var text: String? = null
     var provider: String? = null
     var translationProvider: String? = null
-    var url: String? = null
+    var link: String? = null
 }