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.

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

Refactor 'com.reco1l' package and upgrade tools #349

Merged
merged 23 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
91121b1
Remove 'extensions' package and upgrade 'net' package
Reco1I Apr 25, 2024
b1b2e85
Rename 'legacy' package to 'osu'
Reco1I Apr 25, 2024
454b2c6
Refactor 'osu.data' package as 'osu.conversion'
Reco1I Apr 25, 2024
2fe6f5f
Merge 'VideoTexture' into 'VideoSprite.kt'
Reco1I Apr 25, 2024
866c373
Move and rename 'beatmapdownloader' package to top level as 'beatmapl…
Reco1I Apr 25, 2024
fc013ba
Rename 'engine' package to 'graphics'
Reco1I Apr 25, 2024
d717c7f
Move 'multiplayer' package to top level
Reco1I Apr 25, 2024
7665679
Merge 'entity' package with top level 'ui'
Reco1I Apr 25, 2024
93dfcc7
Move 'Multiplayer' object to 'multiplayer' package
Reco1I Apr 25, 2024
c6b4f27
Move 'IniReader' to 'osu' package
Reco1I Apr 25, 2024
714980d
Move 'api.ibancho' package to top level 'com.reco1l' package
Reco1I Apr 25, 2024
df2daf2
Move 'SkinConversion' to its own package
Reco1I Apr 25, 2024
f2bafcb
Replace some Execution.kt methods with Toolkt library equivalents
Reco1I Apr 25, 2024
e539012
Fix compiler warning upon SDK upgrade.
Reco1I Apr 25, 2024
1bb5541
Add secondary constructors for WebRequest types
Reco1I Apr 25, 2024
5c39d0e
Add missing access modifier
Reco1I Apr 25, 2024
08b42ac
Add missing execute() call
Reco1I Apr 27, 2024
850f588
Rename 'InGameLeaderboard' to 'GameplayLeaderboard'
Reco1I Apr 27, 2024
db57657
Merge remote-tracking branch 'refs/remotes/origin/master' into packag…
Reco1I Apr 30, 2024
dd1b12d
Optimize imports
Reco1I Apr 30, 2024
35a0ecc
Rename 'IniReader.kt' to 'SkinIniReader.kt'
Reco1I Apr 30, 2024
f71d02d
Fix wrong \n in beatmap set card
Reco1I Apr 30, 2024
8a13193
Fix few CodeFactor inspections
Rian8337 May 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ android {

dependencies {
implementation project(':AndEngine')
implementation project(':LibBASS')
implementation project(':andnext_markdown')
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference:1.2.1'
Expand All @@ -166,22 +167,18 @@ dependencies {
implementation 'com.google.firebase:firebase-analytics:21.5.1'
implementation 'com.google.firebase:firebase-messaging:23.4.1'

// implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
// implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
// implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
implementation 'com.google.code.gson:gson:2.10.1'
//implementation 'com.github.tbruyelle:rxpermissions:0.12'
implementation 'pub.devrel:easypermissions:3.0.0'
implementation 'net.lingala.zip4j:zip4j:2.11.5'

implementation 'com.github.EdrowsLuo:osudroidstrings:bd9507b289'
implementation 'com.github.EdrowsLuo.EdlGameFramework:EdlJavaExt:d91c53fcff'
implementation 'com.github.EdrowsLuo.EdlGameFramework:EdlOsbSupport:d91c53fcff'
implementation project(path: ':LibBASS')

// Tools
implementation 'com.github.Reco1I:Toolkt:1.1.9'
implementation 'commons-io:commons-io:2.15.1'
implementation 'com.github.delight-im:Android-AdvancedWebView:v3.2.1'

// Multiplayer
implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3')
Expand Down
2 changes: 1 addition & 1 deletion src/com/edlplan/osu/support/slider/SliderBody2D.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.edlplan.andengine.TrianglePack;
import com.edlplan.framework.math.Color4;
import com.edlplan.framework.math.line.LinePath;
import com.reco1l.framework.lang.Execution;
import com.reco1l.osu.Execution;

import org.anddev.andengine.entity.IEntity;
import org.anddev.andengine.entity.modifier.*;
Expand Down
2 changes: 1 addition & 1 deletion src/com/edlplan/ui/fragment/FilterMenuFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import com.edlplan.framework.easing.Easing
import com.edlplan.framework.support.util.Updater
import com.edlplan.ui.BaseAnimationListener
import com.edlplan.ui.EasingHelper
import com.reco1l.framework.lang.mainThread
import com.reco1l.osu.mainThread
import org.anddev.andengine.engine.handler.IUpdateHandler
import org.anddev.andengine.entity.scene.Scene
import ru.nsu.ccfit.zuev.osu.helper.InputManager
Expand Down
4 changes: 2 additions & 2 deletions src/com/edlplan/ui/fragment/InGameSettingMenu.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import com.edlplan.framework.easing.Easing
import com.edlplan.framework.math.FMath
import com.edlplan.ui.BaseAnimationListener
import com.edlplan.ui.EasingHelper
import com.reco1l.framework.lang.mainThread
import com.reco1l.legacy.Multiplayer
import com.reco1l.osu.mainThread
import com.reco1l.osu.multiplayer.Multiplayer
import org.anddev.andengine.input.touch.TouchEvent
import ru.nsu.ccfit.zuev.osu.Config
import ru.nsu.ccfit.zuev.osu.GlobalManager
Expand Down
110 changes: 0 additions & 110 deletions src/com/reco1l/api/ibancho/LobbyAPI.kt

This file was deleted.

9 changes: 0 additions & 9 deletions src/com/reco1l/framework/data/IniException.kt

This file was deleted.

75 changes: 0 additions & 75 deletions src/com/reco1l/framework/extensions/JsonExt.kt

This file was deleted.

98 changes: 0 additions & 98 deletions src/com/reco1l/framework/extensions/KotlinExt.kt

This file was deleted.

Loading
Loading