Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: convert Java to Kotlin #1042

Merged
merged 60 commits into from
Aug 18, 2021
Merged

refactor: convert Java to Kotlin #1042

merged 60 commits into from
Aug 18, 2021

Conversation

kacperkapusciak
Copy link
Member

@kacperkapusciak kacperkapusciak commented Aug 9, 2021 •
edited
Loading

Description

This PR converts all Java android-connected files to Kotlin. Also it adds ktlint and ktlintFormat as linter and formatter for Kotlin code.

Changes

  • Updated Gradle from 4.10 to 6.9
  • Converted Java to Kotlin
  • Set official Kotlin code style for formatting
  • Added ktlint and ktlintFormat tasks per commit

kacperkapusciak and others added 30 commits August 9, 2021 16:57
@kacperkapusciak
feat: setup kotlin
2cd9d4b
@kacperkapusciak
refactor: convert ScreenAppearEvent to Kotlin
87c6d2d
@kacperkapusciak
fix: ScreenAppearEvent type error
5029ffa
@kacperkapusciak
fix: make ScreenAppearEvent more idiomatic
24f21bd
@kacperkapusciak
refactor: convert Screen to Kotlin
89e2fb9
@kacperkapusciak
fix: make Screen more idiomatic
b29a905
@kacperkapusciak
chore: lint & format Kotlin code
ca7a37b
@kacperkapusciak
chore: bump gradle to 6.9
bac4548
@kacperkapusciak
feat: setup kotlin linter & formatter
ac7a8a2
@kacperkapusciak
fix: make ktlint output only errors
e2d366d
@kacperkapusciak
refactor: convert ScreenDisappearEvent to Kotlin
53339aa
@kacperkapusciak
fix: make ScreenDisappearEvent more idiomatic
92d9219
@kacperkapusciak
refactor: convert ScreenDismissedEvent to Kotlin
bd104b6
@kacperkapusciak
fix: make ScreenDismissedEvent more idiomatic
859b2c7
@kacperkapusciak
refactor: convert RNScreensPackage to Kotlin
8e53862
@kacperkapusciak
fix: make RNSScreensPackage more idiomatic
6163750
@kacperkapusciak
refactor: convert ScreenWillAppearEvent to Kotlin
c9d62b2
@kacperkapusciak
fix: make ScreenWillAppearEvent more idiomatic
244e511
@kacperkapusciak
feat: enable Kotlin in Example proj
f76dea5
@kacperkapusciak
refactor: convert ScreenWillDisappearEvent to Kotlin
968b5d6
@kacperkapusciak
fix: make ScreenWillDisappearEvent more idiomatic
6524242
@kacperkapusciak
refactor: convert StackFinishTransitioningEvent to Kotlin
d3d87e3
@kacperkapusciak
fix: make StackFinishTransitioningEvent more idiomatic
1e26a16
@kacperkapusciak
refactor: move events to separate package
1ab455d
@kacperkapusciak
refactor: convert ScreenViewManager to Kotlin
d895d3c
@WoLewicki
feat: convert ScreenContainer
69d4651
@WoLewicki
feat: align Screen, ScreenContainer, ScreenViewManager
8b85401
@WoLewicki
feat: convert ScreenContainerViewManager
1d5ec92
@WoLewicki
fix: fix ScreenContainerViewManager
16235b5
@WoLewicki
feat: convert ScreenStack
fe4c89e
WoLewicki and others added 18 commits August 16, 2021 17:14
@WoLewicki
feat: format ScreenStackHeaderSubview
4189f89
@WoLewicki
feat: convert ScreenStackHeaderSubviewManager
0f5641b
@WoLewicki
feat: convert ScreenStackHeaderSubviewManager
9cb2ad7
@WoLewicki
feat: convert ScreenStackHeaderConfig
566961b
@WoLewicki
feat: align ScreenStackHeaderConfig
4867d89
@WoLewicki
feat: format ScreenStackHeaderConfig and ScreenStackHeaderSubviewManager
b32bb64
@WoLewicki
feat: convert ScreenWindowTraits
6a2d318
@WoLewicki
feat: align ScreenFragment, ScreenStackHeaderConfig, ScreenWindowTraits
86cce2b
@WoLewicki
feat: convert LifecycleHelper
156ba9d
@WoLewicki
feat: align LifecycleHelper
0d089b5
@kacperkapusciak
chore: merge current master
4041ac6
@kacperkapusciak
feat: add ktlint&ktlintFormat to lint-staged, remove lint-java script
0e80eb0
@kacperkapusciak
feat: convert ScreenStackHeaderConfigViewManager
b190a69
@kacperkapusciak
feat: format ScreenStackHeaderConfigViewManager
3f98f1f
@kacperkapusciak
feat: run ktlint on lint-staged
45c1eb2
@kacperkapusciak
feat: scripts fail on error
7d3f269
@kacperkapusciak
feat: add lint-android to pre-commit hook
0272e58
@kacperkapusciak
fix: remove redundant code, pre-commit ordering
6f148c9
@kacperkapusciak kacperkapusciak marked this pull request as ready for review August 17, 2021 13:45
WoLewicki
WoLewicki reviewed Aug 17, 2021
View reviewed changes
Copy link
Member

@WoLewicki WoLewicki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some comments to the code

.husky/pre-commit Outdated Show resolved Hide resolved
package.json Show resolved Hide resolved
android/build.gradle Show resolved Hide resolved
WoLewicki
WoLewicki reviewed Aug 18, 2021
View reviewed changes
Copy link
Member

@WoLewicki WoLewicki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good job!

@kacperkapusciak kacperkapusciak merged commit eea4c22 into master Aug 18, 2021
@kacperkapusciak kacperkapusciak deleted the @kacperkapusciak/convert-java-to-kotlin branch August 18, 2021 10:10
This was referenced Sep 1, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WoLewicki WoLewicki WoLewicki approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kacperkapusciak @WoLewicki