Skip to content
This repository was archived by the owner on Jan 29, 2023. It is now read-only.

Commit edc821e

Browse files
vase4kinvase4kin
authored
Update dependencies (#351)
* Update dependencies * Update kotlinter and have to format some kotlin files.. :( * Fix lint issues
1 parent 997f0ed commit edc821e

File tree

60 files changed

+542
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+542
-416
lines changed

‎app/src/androidTest/java/com/github/vase4kin/teamcityapp/agents/view/AgentListFragmentTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ class AgentListFragmentTest {
122122
withRecyclerView(R.id.agents_recycler_view).atPositionOnView(
123123
0,
124124
R.id.title
125-
), isDisplayed()
125+
),
126+
isDisplayed()
126127
)
127128
)
128129
.check(matches(withText("agent 1")))

‎app/src/androidTest/java/com/github/vase4kin/teamcityapp/cancel_build/CancelBuildTest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Andrey Tolpeev
2+
* Copyright 2020 Andrey Tolpeev
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -147,7 +147,8 @@ class CancelBuildTest {
147147
override fun onSuccess() {}
148148

149149
override fun onFail() {}
150-
})
150+
}
151+
)
151152

152153
// Prepare intent
153154
// <! ---------------------------------------------------------------------- !>
@@ -388,7 +389,8 @@ class CancelBuildTest {
388389
override fun onSuccess() {}
389390

390391
override fun onFail() {}
391-
})
392+
}
393+
)
392394

393395
// Prepare intent
394396
// <! ---------------------------------------------------------------------- !>

‎app/src/androidTest/java/com/github/vase4kin/teamcityapp/properties/view/PropertiesFragmentTest.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,14 @@ class PropertiesFragmentTest {
198198
// <! ---------------------------------------------------------------------- !>
199199
val intent = Intent()
200200
val b = Bundle()
201-
b.putSerializable(BundleExtractorValues.BUILD, Mocks.successBuild(
202-
Properties(
203-
emptyList()
201+
b.putSerializable(
202+
BundleExtractorValues.BUILD,
203+
Mocks.successBuild(
204+
Properties(
205+
emptyList()
206+
)
204207
)
205-
))
208+
)
206209
b.putString(BundleExtractorValues.NAME, NAME)
207210
intent.putExtras(b)
208211

‎app/src/androidTest/java/teamcityapp/features/about/AboutActivityTest.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,14 @@ class AboutActivityTest {
8989
fun testAboutServerInfoDetails() {
9090
val version = "xxx117"
9191
val serverUrl = "https://www.server.xxx177.com"
92-
`when`(teamCityService.serverInfo()).thenReturn(Single.just(
93-
teamcityapp.features.about.repository.models.ServerInfo(
94-
version,
95-
serverUrl
92+
`when`(teamCityService.serverInfo()).thenReturn(
93+
Single.just(
94+
teamcityapp.features.about.repository.models.ServerInfo(
95+
version,
96+
serverUrl
97+
)
9698
)
97-
))
99+
)
98100
activityTestRule.launchActivity(null)
99101
onView(withText(version)).check(ViewAssertions.matches(isDisplayed()))
100102
onView(withText(serverUrl)).check(ViewAssertions.matches(isDisplayed()))

‎app/src/androidTest/java/teamcityapp/features/drawer/view/DrawerTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ class DrawerTest {
165165
BundleMatchers.hasEntry(
166166
CoreMatchers.equalTo(
167167
BundleExtractorValues.IS_REQUIRED_TO_RELOAD
168-
), CoreMatchers.equalTo(true)
168+
),
169+
CoreMatchers.equalTo(true)
169170
)
170171
)
171172
)

‎app/src/androidTest/java/teamcityapp/features/splash/view/SplashActivityTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Andrey Tolpeev
2+
* Copyright 2020 Andrey Tolpeev
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -63,7 +63,8 @@ class SplashActivityTest {
6363
@JvmField
6464
@Rule
6565
val activityRule: CustomIntentsTestRule<teamcityapp.features.splash.view.SplashActivity> = CustomIntentsTestRule(
66-
teamcityapp.features.splash.view.SplashActivity::class.java)
66+
teamcityapp.features.splash.view.SplashActivity::class.java
67+
)
6768

6869
@Before
6970
fun setUp() {

‎app/src/main/java/com/github/vase4kin/teamcityapp/account/create/data/CreateAccountDataManagerImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ class CreateAccountDataManagerImpl(
218218
// On data save fail
219219
listener.onFail("")
220220
}
221-
})
221+
}
222+
)
222223
}
223224

224225
/**

‎app/src/main/java/com/github/vase4kin/teamcityapp/account/create/presenter/CreateAccountPresenterImpl.kt

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Andrey Tolpeev
2+
* Copyright 2020 Andrey Tolpeev
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -79,36 +79,40 @@ class CreateAccountPresenterImpl @Inject constructor(
7979
view.showNewAccountExistErrorMessage()
8080
view.dismissProgressDialog()
8181
} else {
82-
dataManager.authUser(object : CustomOnLoadingListener<String> {
83-
override fun onSuccess(url: String) {
84-
dataManager.saveNewUserAccount(
85-
url,
86-
userName,
87-
password,
88-
isSslDisabled,
89-
object : OnLoadingListener<String> {
90-
override fun onSuccess(serverUrl: String) {
91-
dataManager.initTeamCityService(serverUrl)
92-
tracker.trackUserLoginSuccess(!isSslDisabled)
93-
view.dismissProgressDialog()
94-
view.finish()
95-
router.startRootProjectActivityWhenNewAccountIsCreated()
96-
}
82+
dataManager.authUser(
83+
object : CustomOnLoadingListener<String> {
84+
override fun onSuccess(url: String) {
85+
dataManager.saveNewUserAccount(
86+
url,
87+
userName,
88+
password,
89+
isSslDisabled,
90+
object : OnLoadingListener<String> {
91+
override fun onSuccess(serverUrl: String) {
92+
dataManager.initTeamCityService(serverUrl)
93+
tracker.trackUserLoginSuccess(!isSslDisabled)
94+
view.dismissProgressDialog()
95+
view.finish()
96+
router.startRootProjectActivityWhenNewAccountIsCreated()
97+
}
9798

98-
override fun onFail(errorMessage: String) {
99-
view.showCouldNotSaveUserError()
100-
view.dismissProgressDialog()
101-
tracker.trackUserDataSaveFailed()
99+
override fun onFail(errorMessage: String) {
100+
view.showCouldNotSaveUserError()
101+
view.dismissProgressDialog()
102+
tracker.trackUserDataSaveFailed()
103+
}
102104
}
103-
})
104-
}
105+
)
106+
}
105107

106-
override fun onFail(code: Int, errorMessage: String) {
107-
view.showError(errorMessage)
108-
view.dismissProgressDialog()
109-
tracker.trackUserLoginFailed(errorMessage)
110-
}
111-
}, url, userName, password, isSslDisabled, false)
108+
override fun onFail(code: Int, errorMessage: String) {
109+
view.showError(errorMessage)
110+
view.dismissProgressDialog()
111+
tracker.trackUserLoginFailed(errorMessage)
112+
}
113+
},
114+
url, userName, password, isSslDisabled, false
115+
)
112116
}
113117
}
114118

@@ -126,22 +130,25 @@ class CreateAccountPresenterImpl @Inject constructor(
126130
view.showNewAccountExistErrorMessage()
127131
view.dismissProgressDialog()
128132
} else {
129-
dataManager.authGuestUser(object : CustomOnLoadingListener<String> {
130-
override fun onSuccess(url: String) {
131-
dataManager.saveGuestUserAccount(url, isSslDisabled)
132-
dataManager.initTeamCityService(url)
133-
tracker.trackGuestUserLoginSuccess(!isSslDisabled)
134-
view.dismissProgressDialog()
135-
view.finish()
136-
router.startRootProjectActivityWhenNewAccountIsCreated()
137-
}
133+
dataManager.authGuestUser(
134+
object : CustomOnLoadingListener<String> {
135+
override fun onSuccess(url: String) {
136+
dataManager.saveGuestUserAccount(url, isSslDisabled)
137+
dataManager.initTeamCityService(url)
138+
tracker.trackGuestUserLoginSuccess(!isSslDisabled)
139+
view.dismissProgressDialog()
140+
view.finish()
141+
router.startRootProjectActivityWhenNewAccountIsCreated()
142+
}
138143

139-
override fun onFail(statusCode: Int, errorMessage: String) {
140-
view.showError(errorMessage)
141-
view.dismissProgressDialog()
142-
tracker.trackGuestUserLoginFailed(errorMessage)
143-
}
144-
}, url, isSslDisabled, false)
144+
override fun onFail(statusCode: Int, errorMessage: String) {
145+
view.showError(errorMessage)
146+
view.dismissProgressDialog()
147+
tracker.trackGuestUserLoginFailed(errorMessage)
148+
}
149+
},
150+
url, isSslDisabled, false
151+
)
145152
}
146153
}
147154

‎app/src/main/java/com/github/vase4kin/teamcityapp/agents/dagger/AgentModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Andrey Tolpeev
2+
* Copyright 2020 Andrey Tolpeev
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ class AgentModule {
5454
filterProvider: FilterProvider
5555
): BaseListView<AgentDataModel> {
5656
return AgentViewImpl(
57-
fragment.view!!,
57+
fragment.requireView(),
5858
fragment.activity as Activity,
5959
R.string.empty_list_message_agents,
6060
adapter,

‎app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,13 @@ class BottomNavigationViewImpl(
116116
bottomNavigation.isBehaviorTranslationEnabled = false
117117

118118
bottomNavigation.setOnTabSelectedListener { position, wasSelected ->
119-
Handler(activity.mainLooper).postDelayed({
120-
interactor.switchTab(position)
121-
listener.onTabSelected(position, wasSelected)
122-
}, DELAY)
119+
Handler(activity.mainLooper).postDelayed(
120+
{
121+
interactor.switchTab(position)
122+
listener.onTabSelected(position, wasSelected)
123+
},
124+
DELAY
125+
)
123126
true
124127
}
125128
}

‎app/src/main/java/com/github/vase4kin/teamcityapp/artifact/dagger/ArtifactsFragmentModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ object ArtifactsFragmentModule {
6464
adapter: ArtifactAdapter
6565
): ArtifactView {
6666
return ArtifactViewImpl(
67-
fragment.view!!,
67+
fragment.requireView(),
6868
fragment.requireActivity(),
6969
R.string.empty_list_message_artifacts,
7070
adapter

‎app/src/main/java/com/github/vase4kin/teamcityapp/artifact/presenter/ArtifactPresenterImpl.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Andrey Tolpeev
2+
* Copyright 2020 Andrey Tolpeev
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -46,7 +46,10 @@ class ArtifactPresenterImpl @Inject constructor(
4646
dataManager,
4747
tracker,
4848
valueExtractor
49-
), ArtifactPresenter, OnArtifactPresenterListener, OnArtifactEventListener {
49+
),
50+
ArtifactPresenter,
51+
OnArtifactPresenterListener,
52+
OnArtifactEventListener {
5053

5154
@VisibleForTesting
5255
var fileName: String? = null
@@ -186,7 +189,8 @@ class ArtifactPresenterImpl @Inject constructor(
186189
view.dismissProgressDialog()
187190
showRetryDownloadArtifactSnackBar()
188191
}
189-
})
192+
}
193+
)
190194
}
191195
}
192196
}
@@ -225,6 +229,7 @@ class ArtifactPresenterImpl @Inject constructor(
225229
override fun onDenied() {
226230
view.showPermissionsDeniedDialog()
227231
}
228-
})
232+
}
233+
)
229234
}
230235
}

‎app/src/main/java/com/github/vase4kin/teamcityapp/artifact/view/ArtifactAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Andrey Tolpeev
2+
* Copyright 2020 Andrey Tolpeev
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ class ArtifactAdapter
3030
*
3131
* @param viewHolderFactories - view holder factories from DI
3232
*/
33-
(viewHolderFactories: Map<Int, ViewHolderFactory<ArtifactDataModel>>) :
33+
(viewHolderFactories: Map<Int, ViewHolderFactory<ArtifactDataModel>>) :
3434
BaseAdapter<ArtifactDataModel>(viewHolderFactories) {
3535

3636
private var onClickListener: OnArtifactPresenterListener? = null

‎app/src/main/java/com/github/vase4kin/teamcityapp/bottomsheet_dialog/view/BottomSheetDialogFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class BottomSheetDialogFragment :
4848
// Injecting presenter
4949
DaggerBottomSheetComponent.builder()
5050
.bottomSheetModule(BottomSheetModule(view, this))
51-
.appComponent((activity!!.application as TeamCityApplication).appInjector)
51+
.appComponent((requireActivity().application as TeamCityApplication).appInjector)
5252
.build()
5353
.inject(this)
5454

0 commit comments

Comments
 (0)