anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

diff fixes

Browse source
This commit is contained in:
konstantiniiv 2019-11-18 16:03:19 +03:00
parent 6570d4400b
commit c290e643b8
6 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle
View file

@ -50,6 +50,11 @@ android {
debuggable true
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
ext {

6
app/src/main/java/com/agileburo/anytype/ui/desktop/DesktopFragment.kt
View file

@ -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 -> {

9
app/src/main/res/navigation/graph.xml
View file

@ -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>

2
app/src/main/res/values/colors.xml
View file

@ -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>

2
build.gradle
View file

@ -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'

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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