Skip to content

GitLab

Commit a1d3b8f2 authored by Filip Wiesner's avatar Filip Wiesner
Browse files
Options

Desktop merge

parent 30ec5462
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 182 deletions
BlackBird/.idea/kotlinc.xml deleted 100644 → 0
View file @ 30ec5462
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="1.8" />
</component>
</project>
\ No newline at end of file
BlackBird/.idea/misc.xml
View file @ a1d3b8f2
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables">
<value>
<list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
</list>
</value>
</option>
<option name="myNotNulls">
<value>
<list size="5">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
</list>
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
......
BlackBird/.idea/navEditor.xml deleted 100644 → 0
View file @ 30ec5462
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="navEditor-manualLayoutAlgorithm2">
<option name="myPositions">
<map>
<entry key="bottom_nav_graph.xml">
<value>
<LayoutPositions>
<option name="myPositions">
<map>
<entry key="nav_profile">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="660" />
<option name="y" value="57" />
</Point>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="nav_search">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="474" />
<option name="y" value="60" />
</Point>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="nav_tasks">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="72" />
<option name="y" value="53" />
</Point>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="nav_timetable">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="268" />
<option name="y" value="58" />
</Point>
</option>
</LayoutPositions>
</value>
</entry>
</map>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="nav_graph.xml">
<value>
<LayoutPositions>
<option name="myPositions">
<map>
<entry key="authFragment">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="12" />
<option name="y" value="12" />
</Point>
</option>
<option name="myPositions">
<map>
<entry key="onLogged">
<value>
<LayoutPositions />
</value>
</entry>
</map>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="navigationFragment">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="265" />
<option name="y" value="12" />
</Point>
</option>
<option name="myPositions">
<map>
<entry key="toEventDetail">
<value>
<LayoutPositions />
</value>
</entry>
</map>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="timetableDetailFragment">
<value>
<LayoutPositions>
<option name="myPosition">
<Point>
<option name="x" value="518" />
<option name="y" value="12" />
</Point>
</option>
</LayoutPositions>
</value>
</entry>
<entry key="toAuth">
<value>
<LayoutPositions />
</value>
</entry>
</map>
</option>
</LayoutPositions>
</value>
</entry>
</map>
</option>
</component>
</project>
\ No newline at end of file
BlackBird/app/build.gradle
View file @ a1d3b8f2
......@@ -33,9 +33,9 @@ kapt {
dependencies {
def anko_version = "0.10.5"
def room_version = "2.0.0"
def room_version = "2.1.0-alpha01"
def dagger_version = "2.16"
def nav_version = "1.0.0-alpha06"
def nav_version = "1.0.0-alpha07"
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
......@@ -47,8 +47,8 @@ dependencies {
testImplementation 'junit:junit:4.12'
// Testing
androidTestImplementation 'androidx.test:runner:1.1.0-beta01'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-beta01'
androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
//Tools
implementation "org.jetbrains.anko:anko-commons:$anko_version"
......@@ -102,8 +102,8 @@ dependencies {
debugImplementation 'com.willowtreeapps.hyperion:hyperion-measurement:0.9.24'
debugImplementation 'com.willowtreeapps.hyperion:hyperion-geiger-counter:0.9.24'
}
//kotlin {
// experimental {
// coroutines "enable"
// }
//}
kotlin {
experimental {
}
}
BlackBird/app/src/main/java/com/cvut/blackbird/flows/authentication/AuthViewModel.kt
View file @ a1d3b8f2
......@@ -10,6 +10,8 @@ import com.cvut.blackbird.model.Result
import com.cvut.blackbird.model.Success
import com.cvut.blackbird.model.flows.AuthModel
import com.cvut.blackbird.model.support.AuthResult
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
class AuthViewModel : BlackBirdVM() {
private val model: AuthModel = AuthModel()
......
BlackBird/app/src/main/java/com/cvut/blackbird/flows/detail/EventDetailViewModel.kt
View file @ a1d3b8f2
......@@ -8,6 +8,7 @@ import com.cvut.blackbird.flows.BlackBirdVM
import com.cvut.blackbird.model.entities.DetailedEvent
import com.cvut.blackbird.model.entities.Event
import com.cvut.blackbird.model.flows.EventDetailModel
import kotlinx.coroutines.launch
interface EventDetailVM {
val detailedEvent: LiveData<DetailedEvent>
......
BlackBird/build.gradle
View file @ a1d3b8f2
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.0-rc-146'
ext.kotlin_version = '1.3.0'
repositories {
google()
jcenter()
......@@ -10,9 +10,9 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.0-alpha13'
classpath 'com.android.tools.build:gradle:3.4.0-alpha02'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-alpha06"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-alpha07"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment