From c290e643b8abc72edccf905d1fdfbc116eb89cf3 Mon Sep 17 00:00:00 2001
From: konstantiniiv <ki@agileburo.com>
Date: Mon, 18 Nov 2019 16:03:19 +0300
Subject: [PATCH] diff fixes

---
 app/build.gradle                                         | 5 +++++
 .../com/agileburo/anytype/ui/desktop/DesktopFragment.kt  | 6 +++++-
 app/src/main/res/navigation/graph.xml                    | 9 ++++++++-
 app/src/main/res/values/colors.xml                       | 2 +-
 build.gradle                                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties                 | 2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f3db19dbea..8ff621e24c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,6 +50,11 @@ android {
             debuggable true
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 ext {
diff --git a/app/src/main/java/com/agileburo/anytype/ui/desktop/DesktopFragment.kt b/app/src/main/java/com/agileburo/anytype/ui/desktop/DesktopFragment.kt
index 48d2f14c9e..0c0e02d73f 100644
--- a/app/src/main/java/com/agileburo/anytype/ui/desktop/DesktopFragment.kt
+++ b/app/src/main/java/com/agileburo/anytype/ui/desktop/DesktopFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.agileburo.anytype.R
 import com.agileburo.anytype.core_utils.ui.ViewState
@@ -71,7 +72,10 @@ class DesktopFragment : ViewStateFragment<ViewState<List<DesktopView>>>(R.layout
                     layoutManager = GridLayoutManager(context, 2)
                     adapter = desktopAdapter
                 }
-                fab.setOnClickListener { vm.onAddNewDocumentClicked() }
+                fab.setOnClickListener {
+                    findNavController().navigate(R.id.action_desktopScreen_to_databaseViewFragment)
+                    //vm.onAddNewDocumentClicked()
+                }
                 profileImage.setOnClickListener { vm.onProfileClicked() }
             }
             is ViewState.Success -> {
diff --git a/app/src/main/res/navigation/graph.xml b/app/src/main/res/navigation/graph.xml
index b521cc0cf2..b805aa42e1 100644
--- a/app/src/main/res/navigation/graph.xml
+++ b/app/src/main/res/navigation/graph.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_navigation"
-    app:startDestination="@id/splashScreen">
+    app:startDestination="@id/databaseViewFragment">
     <fragment
         android:id="@+id/desktopScreen"
         android:name="com.agileburo.anytype.ui.desktop.DesktopFragment"
@@ -16,6 +16,9 @@
             app:exitAnim="@anim/slide_out_left"
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right" />
+        <action
+            android:id="@+id/action_desktopScreen_to_databaseViewFragment"
+            app:destination="@id/databaseViewFragment" />
     </fragment>
 
     <fragment
@@ -237,5 +240,9 @@
             android:name="com.agileburo.anytype.ui.profile.KeychainPhraseDialog"
             tools:layout="@layout/dialog_keychain_phrase" />
     </navigation>
+    <fragment
+        android:id="@+id/databaseViewFragment"
+        android:name="com.agileburo.anytype.ui.table.DatabaseViewFragment"
+        android:label="DatabaseViewFragment" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 79a4a01670..6b25fad7f4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,7 +5,7 @@
     <color name="colorAccent">#3F51B5</color>
 
     <color name="gray_background">#6a6962</color>
-    <color name="button_active">#ffbb2c</color>
+    <color name="button_active">#FFBB2C</color>
     <color name="button_not_active">#ACA996</color>
 
     <color name="orange">#FFBB2C</color>
diff --git a/build.gradle b/build.gradle
index 8104a1a7b1..513239a52e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.2'
         classpath 'io.fabric.tools:gradle:1.31.1'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1637a471c2..2c927f1c66 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip