Commit aef69ad2 authored by Konstantin Tskhovrebov's avatar Konstantin Tskhovrebov 🤖

Merge branch 'refactor/ui_architecture' into develop

parents 8ae1dd7c e1913469
Pipeline #60882535 passed with stage
in 9 minutes and 9 seconds
......@@ -49,14 +49,6 @@ android {
buildConfigField("String", "OAUTH_CALLBACK", "\"app://gitlab.client/\"")
multiDexEnabled = true
javaCompileOptions {
annotationProcessorOptions {
arguments = mapOf(
"toothpick_registry_package_name" to "ru.terrakok.gitlabclient"
)
}
}
}
signingConfigs {
......@@ -95,8 +87,8 @@ android {
dependencies {
val supportLibraryVersion = "28.0.0"
val moxyVersion = "1.4.6"
val toothpickVersion = "1.0.6"
val moxyVersion = "1.5.6"
val toothpickVersion = "2.1.0"
val retrofitVersion = "2.2.0"
val markwonVersion = "2.0.0"
val glideVersion = "4.8.0"
......
......@@ -7,13 +7,11 @@ import com.jakewharton.threetenabp.AndroidThreeTen
import io.fabric.sdk.android.Fabric
import ru.noties.markwon.SpannableConfiguration
import ru.noties.markwon.spans.SpannableTheme
import ru.terrakok.gitlabclient.toothpick.DI
import ru.terrakok.gitlabclient.toothpick.module.AppModule
import ru.terrakok.gitlabclient.di.DI
import ru.terrakok.gitlabclient.di.module.AppModule
import timber.log.Timber
import toothpick.Toothpick
import toothpick.configuration.Configuration
import toothpick.registries.FactoryRegistryLocator
import toothpick.registries.MemberInjectorRegistryLocator
import java.util.*
/**
......@@ -53,9 +51,7 @@ class App : Application() {
if (BuildConfig.DEBUG) {
Toothpick.setConfiguration(Configuration.forDevelopment().preventMultipleRootScopes())
} else {
Toothpick.setConfiguration(Configuration.forProduction().disableReflection())
FactoryRegistryLocator.setRootRegistry(ru.terrakok.gitlabclient.FactoryRegistry())
MemberInjectorRegistryLocator.setRootRegistry(ru.terrakok.gitlabclient.MemberInjectorRegistry())
Toothpick.setConfiguration(Configuration.forProduction())
}
}
......
......@@ -11,13 +11,12 @@ import ru.terrakok.gitlabclient.ui.about.AboutFragment
import ru.terrakok.gitlabclient.ui.auth.AuthFlowFragment
import ru.terrakok.gitlabclient.ui.auth.AuthFragment
import ru.terrakok.gitlabclient.ui.drawer.DrawerFlowFragment
import ru.terrakok.gitlabclient.ui.global.StubFragment
import ru.terrakok.gitlabclient.ui.issue.IssueFlowFragment
import ru.terrakok.gitlabclient.ui.issue.IssueFragment
import ru.terrakok.gitlabclient.ui.issue.IssueInfoFragment
import ru.terrakok.gitlabclient.ui.issue.IssueNotesFragment
import ru.terrakok.gitlabclient.ui.issue.MainIssueFragment
import ru.terrakok.gitlabclient.ui.libraries.LibrariesFragment
import ru.terrakok.gitlabclient.ui.main.MainFlowFragment
import ru.terrakok.gitlabclient.ui.main.MainFragment
import ru.terrakok.gitlabclient.ui.mergerequest.*
import ru.terrakok.gitlabclient.ui.my.activity.MyEventsFragment
import ru.terrakok.gitlabclient.ui.my.issues.MyIssuesContainerFragment
......@@ -27,8 +26,8 @@ import ru.terrakok.gitlabclient.ui.my.mergerequests.MyMergeRequestsFragment
import ru.terrakok.gitlabclient.ui.my.todos.MyTodosContainerFragment
import ru.terrakok.gitlabclient.ui.my.todos.MyTodosFragment
import ru.terrakok.gitlabclient.ui.privacypolicy.PrivacyPolicyFragment
import ru.terrakok.gitlabclient.ui.project.MainProjectFragment
import ru.terrakok.gitlabclient.ui.project.ProjectFlowFragment
import ru.terrakok.gitlabclient.ui.project.ProjectFragment
import ru.terrakok.gitlabclient.ui.project.files.ProjectFilesFragment
import ru.terrakok.gitlabclient.ui.project.info.ProjectEventsFragment
import ru.terrakok.gitlabclient.ui.project.info.ProjectInfoContainerFragment
......@@ -49,12 +48,45 @@ import ru.terrakok.gitlabclient.ui.user.info.UserInfoFragment
* @author Konstantin Tskhovrebov (aka terrakok) on 26.03.17.
*/
object Screens {
//flows
object AuthFlow : SupportAppScreen() {
override fun getFragment() = AuthFlowFragment()
}
object DrawerFlow : SupportAppScreen() {
override fun getFragment() = DrawerFlowFragment()
}
object MainFlow : SupportAppScreen() {
override fun getFragment() = MainFlowFragment()
data class ProjectFlow(
val projectId: Long
) : SupportAppScreen() {
override fun getFragment() = ProjectFlowFragment.create(projectId)
}
data class UserFlow(
val userId: Long
) : SupportAppScreen() {
override fun getFragment() = UserFlowFragment.create(userId)
}
data class IssueFlow(
val projectId: Long,
val issueId: Long
) : SupportAppScreen() {
override fun getFragment() = IssueFlowFragment.create(projectId, issueId)
}
data class MergeRequestFlow(
val projectId: Long,
val mrId: Long
) : SupportAppScreen() {
override fun getFragment() = MergeRequestFlowFragment.create(projectId, mrId)
}
//screens
object Main : SupportAppScreen() {
override fun getFragment() = MainFragment()
}
object MyEvents : SupportAppScreen() {
......@@ -111,22 +143,12 @@ object Screens {
override fun getFragment() = LibrariesFragment()
}
object AuthFlow : SupportAppScreen() {
override fun getFragment() = AuthFlowFragment()
}
object Auth : SupportAppScreen() {
override fun getFragment() = AuthFragment()
}
data class ProjectFlow(
val projectId: Long
) : SupportAppScreen() {
override fun getFragment() = ProjectFlowFragment.create(projectId)
}
object ProjectMainFlow : SupportAppScreen() {
override fun getFragment() = ProjectFragment()
object MainProject : SupportAppScreen() {
override fun getFragment() = MainProjectFragment()
}
object ProjectInfoContainer : SupportAppScreen() {
......@@ -179,25 +201,12 @@ object Screens {
override fun getFragment() = ProjectFilesFragment()
}
data class UserFlow(
val userId: Long
) : SupportAppScreen() {
override fun getFragment() = UserFlowFragment.create(userId)
}
object UserInfo : SupportAppScreen() {
override fun getFragment() = UserInfoFragment()
}
data class MergeRequestFlow(
val projectId: Long,
val mrId: Long
) : SupportAppScreen() {
override fun getFragment() = MergeRequestFlowFragment.create(projectId, mrId)
}
object MergeRequest : SupportAppScreen() {
override fun getFragment() = MergeRequestFragment()
object MainMergeRequest : SupportAppScreen() {
override fun getFragment() = MainMergeRequestFragment()
}
object MergeRequestInfo : SupportAppScreen() {
......@@ -216,15 +225,8 @@ object Screens {
override fun getFragment() = MergeRequestChangesFragment()
}
data class IssueFlow(
val projectId: Long,
val issueId: Long
) : SupportAppScreen() {
override fun getFragment() = IssueFlowFragment.create(projectId, issueId)
}
object Issue : SupportAppScreen() {
override fun getFragment() = IssueFragment()
object MainIssue : SupportAppScreen() {
override fun getFragment() = MainIssueFragment()
}
object IssueInfo : SupportAppScreen() {
......@@ -239,30 +241,11 @@ object Screens {
override fun getFragment() = PrivacyPolicyFragment()
}
//external flows
data class ExternalBrowserFlow(
val url: String
) : SupportAppScreen() {
override fun getActivityIntent(context: Context?) =
Intent(Intent.ACTION_VIEW, Uri.parse(url))
}
data class ShareFlow(
val text: String
) : SupportAppScreen() {
override fun getActivityIntent(context: Context?) =
Intent.createChooser(
Intent(Intent.ACTION_SEND).apply {
putExtra(Intent.EXTRA_TEXT, text)
type = "text/plain"
},
text
)
}
data class MilestoneFlow(
val milestoneId: Long
) : SupportAppScreen() {
//todo: implement milestone flow.
override fun getFragment() = StubFragment()
}
}
\ No newline at end of file
package ru.terrakok.gitlabclient.toothpick
package ru.terrakok.gitlabclient.di
/**
* @author Konstantin Tskhovrebov (aka terrakok) on 09.07.17.
......
package ru.terrakok.gitlabclient.toothpick
package ru.terrakok.gitlabclient.di
/**
* @author Konstantin Tskhovrebov (aka terrakok) on 09.07.17.
......
package ru.terrakok.gitlabclient.toothpick.module
package ru.terrakok.gitlabclient.di.module
import android.content.Context
import android.content.res.AssetManager
......@@ -7,6 +7,8 @@ import ru.terrakok.cicerone.Cicerone
import ru.terrakok.cicerone.NavigatorHolder
import ru.terrakok.cicerone.Router
import ru.terrakok.gitlabclient.BuildConfig
import ru.terrakok.gitlabclient.di.*
import ru.terrakok.gitlabclient.di.provider.GsonProvider
import ru.terrakok.gitlabclient.entity.app.develop.AppInfo
import ru.terrakok.gitlabclient.model.data.storage.RawAppData
import ru.terrakok.gitlabclient.model.interactor.app.AppInfoInteractor
......@@ -18,12 +20,6 @@ import ru.terrakok.gitlabclient.model.system.ResourceManager
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.model.system.message.SystemMessageNotifier
import ru.terrakok.gitlabclient.presentation.AppLauncher
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.provider.GsonProvider
import ru.terrakok.gitlabclient.toothpick.qualifier.AppDevelopersPath
import ru.terrakok.gitlabclient.toothpick.qualifier.CacheLifetime
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultServerPath
import toothpick.config.Module
/**
......
package ru.terrakok.gitlabclient.toothpick.module
package ru.terrakok.gitlabclient.di.module
import ru.terrakok.cicerone.Cicerone
import ru.terrakok.cicerone.NavigatorHolder
......
package ru.terrakok.gitlabclient.toothpick.module
package ru.terrakok.gitlabclient.di.module
import ru.terrakok.gitlabclient.presentation.global.GlobalMenuController
import toothpick.config.Module
......
package ru.terrakok.gitlabclient.toothpick.module
package ru.terrakok.gitlabclient.di.module
import okhttp3.OkHttpClient
import ru.terrakok.gitlabclient.BuildConfig
import ru.terrakok.gitlabclient.di.ServerPath
import ru.terrakok.gitlabclient.di.WithErrorHandler
import ru.terrakok.gitlabclient.di.provider.ApiProvider
import ru.terrakok.gitlabclient.di.provider.MarkDownConverterProvider
import ru.terrakok.gitlabclient.di.provider.OkHttpClientProvider
import ru.terrakok.gitlabclient.di.provider.OkHttpClientWithErrorHandlerProvider
import ru.terrakok.gitlabclient.entity.app.session.AuthHolder
import ru.terrakok.gitlabclient.entity.app.session.OAuthParams
import ru.terrakok.gitlabclient.entity.app.session.UserAccount
......@@ -25,12 +31,6 @@ import ru.terrakok.gitlabclient.model.repository.todo.TodoRepository
import ru.terrakok.gitlabclient.model.repository.user.UserRepository
import ru.terrakok.gitlabclient.presentation.global.ErrorHandler
import ru.terrakok.gitlabclient.presentation.global.MarkDownConverter
import ru.terrakok.gitlabclient.toothpick.provider.ApiProvider
import ru.terrakok.gitlabclient.toothpick.provider.MarkDownConverterProvider
import ru.terrakok.gitlabclient.toothpick.provider.OkHttpClientProvider
import ru.terrakok.gitlabclient.toothpick.provider.OkHttpClientWithErrorHandlerProvider
import ru.terrakok.gitlabclient.toothpick.qualifier.ServerPath
import ru.terrakok.gitlabclient.toothpick.qualifier.WithErrorHandler
import toothpick.config.Module
/**
......
package ru.terrakok.gitlabclient.toothpick.provider
package ru.terrakok.gitlabclient.di.provider
import com.google.gson.Gson
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.gson.GsonConverterFactory
import ru.terrakok.gitlabclient.di.ServerPath
import ru.terrakok.gitlabclient.di.WithErrorHandler
import ru.terrakok.gitlabclient.model.data.cache.ProjectCache
import ru.terrakok.gitlabclient.model.data.server.ApiWithCache
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.toothpick.qualifier.ServerPath
import ru.terrakok.gitlabclient.toothpick.qualifier.WithErrorHandler
import javax.inject.Inject
import javax.inject.Provider
......
package ru.terrakok.gitlabclient.toothpick.provider
package ru.terrakok.gitlabclient.di.provider
import com.google.gson.Gson
import com.google.gson.GsonBuilder
......
package ru.terrakok.gitlabclient.toothpick.provider
package ru.terrakok.gitlabclient.di.provider
import android.content.Context
import okhttp3.OkHttpClient
......@@ -7,10 +7,10 @@ import ru.noties.markwon.UrlProcessorRelativeToAbsolute
import ru.noties.markwon.il.AsyncDrawableLoader
import ru.noties.markwon.spans.SpannableTheme
import ru.terrakok.gitlabclient.R
import ru.terrakok.gitlabclient.di.DefaultServerPath
import ru.terrakok.gitlabclient.extension.color
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.presentation.global.MarkDownConverter
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultServerPath
import java.util.concurrent.Executors
import javax.inject.Inject
import javax.inject.Provider
......
package ru.terrakok.gitlabclient.toothpick.provider
package ru.terrakok.gitlabclient.di.provider
import android.content.Context
import okhttp3.Cache
......
package ru.terrakok.gitlabclient.toothpick.provider
package ru.terrakok.gitlabclient.di.provider
import okhttp3.OkHttpClient
import ru.terrakok.gitlabclient.model.data.server.interceptor.ErrorResponseInterceptor
......
package ru.terrakok.gitlabclient.toothpick.qualifier
package ru.terrakok.gitlabclient.di
import javax.inject.Qualifier
......
......@@ -8,7 +8,7 @@ import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
import com.bumptech.glide.load.model.GlideUrl
import com.bumptech.glide.module.AppGlideModule
import okhttp3.OkHttpClient
import ru.terrakok.gitlabclient.toothpick.DI
import ru.terrakok.gitlabclient.di.DI
import toothpick.Toothpick
import java.io.InputStream
......
package ru.terrakok.gitlabclient.model.data.cache
import ru.terrakok.gitlabclient.di.CacheLifetime
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.Project
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.CacheLifetime
import timber.log.Timber
import java.util.concurrent.ConcurrentHashMap
import javax.inject.Inject
......
package ru.terrakok.gitlabclient.model.interactor.launch
import ru.terrakok.gitlabclient.di.DI
import ru.terrakok.gitlabclient.di.module.ServerModule
import ru.terrakok.gitlabclient.model.repository.app.AppInfoRepository
import ru.terrakok.gitlabclient.model.repository.session.SessionRepository
import ru.terrakok.gitlabclient.toothpick.DI
import ru.terrakok.gitlabclient.toothpick.module.ServerModule
import toothpick.Toothpick
import javax.inject.Inject
......
package ru.terrakok.gitlabclient.model.interactor.session
import io.reactivex.Completable
import ru.terrakok.gitlabclient.di.DI
import ru.terrakok.gitlabclient.di.DefaultServerPath
import ru.terrakok.gitlabclient.di.module.ServerModule
import ru.terrakok.gitlabclient.entity.app.session.OAuthParams
import ru.terrakok.gitlabclient.entity.app.session.UserAccount
import ru.terrakok.gitlabclient.model.data.cache.ProjectCache
import ru.terrakok.gitlabclient.model.repository.session.SessionRepository
import ru.terrakok.gitlabclient.toothpick.DI
import ru.terrakok.gitlabclient.toothpick.module.ServerModule
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultServerPath
import toothpick.Toothpick
import java.net.URI
import java.util.*
......
......@@ -4,6 +4,8 @@ import io.reactivex.Observable
import io.reactivex.Single
import io.reactivex.functions.BiFunction
import org.threeten.bp.LocalDateTime
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.OrderBy
import ru.terrakok.gitlabclient.entity.Project
import ru.terrakok.gitlabclient.entity.PushDataRefType
......@@ -16,8 +18,6 @@ import ru.terrakok.gitlabclient.entity.event.EventTargetType
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.data.server.MarkDownUrlResolver
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
/**
......
......@@ -3,6 +3,8 @@ package ru.terrakok.gitlabclient.model.repository.issue
import io.reactivex.Observable
import io.reactivex.Single
import io.reactivex.functions.BiFunction
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.Note
import ru.terrakok.gitlabclient.entity.OrderBy
import ru.terrakok.gitlabclient.entity.Project
......@@ -15,8 +17,6 @@ import ru.terrakok.gitlabclient.entity.issue.IssueState
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.data.server.MarkDownUrlResolver
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
/**
......
package ru.terrakok.gitlabclient.model.repository.label
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
/**
......
......@@ -4,6 +4,8 @@ import io.reactivex.Observable
import io.reactivex.Single
import io.reactivex.functions.BiFunction
import org.threeten.bp.LocalDateTime
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.*
import ru.terrakok.gitlabclient.entity.app.CommitWithAvatarUrl
import ru.terrakok.gitlabclient.entity.app.target.*
......@@ -15,8 +17,6 @@ import ru.terrakok.gitlabclient.entity.mergerequest.MergeRequestViewType
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.data.server.MarkDownUrlResolver
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
class MergeRequestRepository @Inject constructor(
......
......@@ -2,12 +2,12 @@ package ru.terrakok.gitlabclient.model.repository.milestone
import io.reactivex.Completable
import io.reactivex.Single
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.milestone.Milestone
import ru.terrakok.gitlabclient.entity.milestone.MilestoneState
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
class MilestoneRepository @Inject constructor(
......
package ru.terrakok.gitlabclient.model.repository.profile
import ru.terrakok.gitlabclient.di.ServerPath
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.qualifier.ServerPath
import javax.inject.Inject
/**
......
package ru.terrakok.gitlabclient.model.repository.project
import io.reactivex.Single
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.Branch
import ru.terrakok.gitlabclient.entity.OrderBy
import ru.terrakok.gitlabclient.entity.Sort
......@@ -8,8 +10,6 @@ import ru.terrakok.gitlabclient.entity.Visibility
import ru.terrakok.gitlabclient.entity.app.ProjectFile
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
/**
......
......@@ -5,6 +5,7 @@ import io.reactivex.Single
import okhttp3.FormBody
import okhttp3.OkHttpClient
import okhttp3.Request
import ru.terrakok.gitlabclient.di.DefaultServerPath
import ru.terrakok.gitlabclient.entity.TokenData
import ru.terrakok.gitlabclient.entity.User
import ru.terrakok.gitlabclient.entity.app.session.UserAccount
......@@ -12,7 +13,6 @@ import ru.terrakok.gitlabclient.model.data.server.ServerError
import ru.terrakok.gitlabclient.model.data.server.Tls12SocketFactory.Companion.enableTls12
import ru.terrakok.gitlabclient.model.data.storage.Prefs
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultServerPath
import javax.inject.Inject
class SessionRepository @Inject constructor(
......
package ru.terrakok.gitlabclient.model.repository.todo
import ru.terrakok.gitlabclient.di.DefaultPageSize
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.entity.Assignee
import ru.terrakok.gitlabclient.entity.User
import ru.terrakok.gitlabclient.entity.app.target.*
......@@ -10,8 +12,6 @@ import ru.terrakok.gitlabclient.entity.todo.TodoAction
import ru.terrakok.gitlabclient.entity.todo.TodoState
import ru.terrakok.gitlabclient.model.data.server.GitlabApi
import ru.terrakok.gitlabclient.model.system.SchedulersProvider
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.DefaultPageSize
import javax.inject.Inject
/**
......
......@@ -2,11 +2,11 @@ package ru.terrakok.gitlabclient.presentation.about
import com.arellomobile.mvp.InjectViewState
import ru.terrakok.gitlabclient.Screens
import ru.terrakok.gitlabclient.di.AppDevelopersPath
import ru.terrakok.gitlabclient.model.interactor.app.AppInfoInteractor
import ru.terrakok.gitlabclient.model.system.flow.FlowRouter
import ru.terrakok.gitlabclient.presentation.global.BasePresenter
import ru.terrakok.gitlabclient.presentation.global.GlobalMenuController
import ru.terrakok.gitlabclient.toothpick.qualifier.AppDevelopersPath
import timber.log.Timber
import javax.inject.Inject
......
......@@ -43,7 +43,7 @@ class NavigationDrawerPresenter @Inject constructor(
menuController.close()
if (item != currentSelectedItem) {
when (item) {
ACTIVITY -> router.newRootScreen(Screens.MainFlow)
ACTIVITY -> router.newRootScreen(Screens.Main)
PROJECTS -> router.newRootScreen(Screens.ProjectsContainer)
ABOUT -> router.newRootScreen(Screens.About)
}
......
......@@ -4,6 +4,9 @@ import com.arellomobile.mvp.InjectViewState
import io.reactivex.Single
import io.reactivex.functions.BiFunction
import ru.terrakok.gitlabclient.R
import ru.terrakok.gitlabclient.di.IssueId
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.di.ProjectId
import ru.terrakok.gitlabclient.entity.Project
import ru.terrakok.gitlabclient.entity.issue.Issue
import ru.terrakok.gitlabclient.model.interactor.issue.IssueInteractor
......@@ -12,9 +15,6 @@ import ru.terrakok.gitlabclient.model.system.ResourceManager
import ru.terrakok.gitlabclient.model.system.flow.FlowRouter
import ru.terrakok.gitlabclient.presentation.global.BasePresenter
import ru.terrakok.gitlabclient.presentation.global.ErrorHandler
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.IssueId
import ru.terrakok.gitlabclient.toothpick.qualifier.ProjectId
import javax.inject.Inject
/**
......
package ru.terrakok.gitlabclient.presentation.issue.info
import com.arellomobile.mvp.InjectViewState
import ru.terrakok.gitlabclient.di.IssueId
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.di.ProjectId
import ru.terrakok.gitlabclient.model.interactor.issue.IssueInteractor
import ru.terrakok.gitlabclient.presentation.global.BasePresenter
import ru.terrakok.gitlabclient.presentation.global.ErrorHandler
import ru.terrakok.gitlabclient.presentation.global.MarkDownConverter
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.IssueId
import ru.terrakok.gitlabclient.toothpick.qualifier.ProjectId
import javax.inject.Inject
/**
......
package ru.terrakok.gitlabclient.presentation.issue.notes
import com.arellomobile.mvp.InjectViewState
import ru.terrakok.gitlabclient.di.IssueId
import ru.terrakok.gitlabclient.di.PrimitiveWrapper
import ru.terrakok.gitlabclient.di.ProjectId
import ru.terrakok.gitlabclient.model.interactor.issue.IssueInteractor
import ru.terrakok.gitlabclient.presentation.global.BasePresenter
import ru.terrakok.gitlabclient.presentation.global.ErrorHandler
import ru.terrakok.gitlabclient.presentation.global.MarkDownConverter
import ru.terrakok.gitlabclient.presentation.global.NoteWithFormattedBody
import ru.terrakok.gitlabclient.toothpick.PrimitiveWrapper
import ru.terrakok.gitlabclient.toothpick.qualifier.IssueId
import ru.terrakok.gitlabclient.toothpick.qualifier.ProjectId
import javax.inject.Inject
/**
......
......@@ -4,6 +4,9 @@ import com.arellomobile.mvp.InjectViewState
import io.reactivex.Single
import io.reactivex.functions.BiFunction
import ru.terrakok.gitlabclient.R
import ru.terrakok.gitlabclient.di.MergeRequestId