Skip to content

Commit a2a7c10

Browse files
Reco1IReco1I
committed
Remove Toolkt dependency and inline/replace usages
1 parent dec5380 commit a2a7c10

Some content is hidden

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

65 files changed

+576
-223
lines changed

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ dependencies {
202202

203203
// Tools
204204
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0"
205-
implementation 'com.github.Reco1I:Toolkt:1.0.24'
206205
implementation 'commons-io:commons-io:2.18.0'
207206
testImplementation 'junit:junit:4.13.2'
208207
testImplementation 'org.robolectric:robolectric:4.14.1'

‎src/com/edlplan/ui/fragment/BeatmapPropertiesFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import com.edlplan.ui.BaseAnimationListener
1111
import com.edlplan.ui.EasingHelper
1212
import com.osudroid.data.BeatmapOptions
1313
import com.osudroid.data.DatabaseManager
14+
import com.reco1l.framework.android.cornerRadius
15+
import com.reco1l.framework.android.dp
1416
import com.reco1l.osu.ui.MessageDialog
15-
import com.reco1l.toolkt.android.cornerRadius
16-
import com.reco1l.toolkt.android.dp
1717
import ru.nsu.ccfit.zuev.osu.GlobalManager
1818
import ru.nsu.ccfit.zuev.osu.menu.IPropsMenu
1919
import ru.nsu.ccfit.zuev.osu.menu.BeatmapSetItem

‎src/com/edlplan/ui/fragment/CollectionsManagerFragment.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
import com.edlplan.ui.BaseAnimationListener;
1717
import com.edlplan.ui.EasingHelper;
1818
import com.osudroid.data.DatabaseManager;
19+
import com.reco1l.framework.android.ViewsKt;
1920
import com.reco1l.osu.ui.MessageDialog;
2021
import com.reco1l.osu.ui.PromptDialog;
21-
import com.reco1l.toolkt.android.Dimensions;
22-
import com.reco1l.toolkt.android.Texts;
23-
import com.reco1l.toolkt.android.Views;
2422

2523
import java.util.ArrayList;
2624
import java.util.Collections;
@@ -84,7 +82,7 @@ protected void onLoadView() {
8482
}
8583

8684
playOnLoadAnim();
87-
Views.setCornerRadius(findViewById(R.id.frg_body), Dimensions.getDp(14f));
85+
ViewsKt.setCornerRadius(findViewById(R.id.frg_body), ViewsKt.getDp(14f));
8886
}
8987

9088
private void playOnLoadAnim() {
@@ -215,8 +213,8 @@ public void onBindViewHolder(@NonNull VH holder, int position) {
215213

216214
updateFolderNameText(holder, folder);
217215

218-
Texts.setDrawableLeft(holder.button1, getContext().getDrawable(R.drawable.delete_24px));
219-
Texts.getDrawableLeft(holder.button1).setTint(0xFFFFBFBF);
216+
ViewsKt.setDrawableLeft(holder.button1, getContext().getDrawable(R.drawable.delete_24px));
217+
ViewsKt.getDrawableLeft(holder.button1).setTint(0xFFFFBFBF);
220218
holder.button1.setVisibility(isDefaultFolder ? View.GONE : View.VISIBLE);
221219

222220
holder.button1.setOnClickListener(v -> {
@@ -278,7 +276,7 @@ public void onBindViewHolder(@NonNull VH holder, int position) {
278276

279277
var folder = folders.get(position);
280278

281-
Texts.setDrawableLeft(holder.button2, getContext().getDrawable(
279+
ViewsKt.setDrawableLeft(holder.button2, getContext().getDrawable(
282280
DatabaseManager.getBeatmapCollectionsTable().inCollection(folder, track)
283281
? R.drawable.remove_24px
284282
: R.drawable.add_24px
@@ -288,10 +286,10 @@ public void onBindViewHolder(@NonNull VH holder, int position) {
288286

289287
if (DatabaseManager.getBeatmapCollectionsTable().inCollection(folder, track)) {
290288
DatabaseManager.getBeatmapCollectionsTable().removeBeatmap(folder, track);
291-
Texts.setDrawableLeft(holder.button2, getContext().getDrawable(R.drawable.add_24px));
289+
ViewsKt.setDrawableLeft(holder.button2, getContext().getDrawable(R.drawable.add_24px));
292290
} else {
293291
DatabaseManager.getBeatmapCollectionsTable().addBeatmap(folder, track);
294-
Texts.setDrawableLeft(holder.button2, getContext().getDrawable(R.drawable.remove_24px));
292+
ViewsKt.setDrawableLeft(holder.button2, getContext().getDrawable(R.drawable.remove_24px));
295293
}
296294

297295
updateFolderNameText(holder, folder);

‎src/com/edlplan/ui/fragment/ScoreMenuFragment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
import com.edlplan.ui.EasingHelper;
1818
import com.osudroid.data.BeatmapInfo;
1919
import com.osudroid.data.DatabaseManager;
20+
import com.reco1l.framework.android.ViewsKt;
2021
import com.reco1l.osu.ui.MessageDialog;
21-
import com.reco1l.toolkt.android.Dimensions;
22-
import com.reco1l.toolkt.android.Views;
2322

2423
import java.io.File;
2524
import java.util.Locale;
@@ -119,7 +118,7 @@ public void onClick(View v) {
119118
});
120119

121120
playOnLoadAnim();
122-
Views.setCornerRadius(findViewById(R.id.fullLayout), Dimensions.getDp(14f));
121+
ViewsKt.setCornerRadius(findViewById(R.id.fullLayout), ViewsKt.getDp(14f));
123122
}
124123

125124
@Override

‎src/com/edlplan/ui/fragment/SearchBarFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import com.osudroid.resources.R.*
1919
import com.edlplan.ui.BaseAnimationListener
2020
import com.edlplan.ui.EasingHelper
2121
import com.osudroid.utils.mainThread
22-
import com.reco1l.toolkt.android.cornerRadius
23-
import com.reco1l.toolkt.android.dp
22+
import com.reco1l.framework.android.cornerRadius
23+
import com.reco1l.framework.android.dp
2424
import org.anddev.andengine.entity.scene.Scene
2525
import ru.nsu.ccfit.zuev.osu.*
2626
import ru.nsu.ccfit.zuev.osu.helper.StringTable

‎src/com/osudroid/beatmaplisting/BeatmapDownloader.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.reco1l.framework.net.IFileRequestObserver
88
import com.osudroid.utils.mainThread
99
import com.osudroid.multiplayer.Multiplayer
1010
import com.osudroid.ui.v1.DownloadFragment
11-
import com.reco1l.toolkt.kotlin.async
11+
import com.osudroid.utils.async
1212
import net.lingala.zip4j.ZipFile
1313
import ru.nsu.ccfit.zuev.osu.Config
1414
import ru.nsu.ccfit.zuev.osu.GlobalManager

‎src/com/osudroid/beatmaplisting/BeatmapListing.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ import com.osudroid.utils.mainThread
4242
import com.reco1l.osu.ui.Option
4343
import com.reco1l.osu.ui.SelectDialog
4444
import com.reco1l.osu.ui.SelectDropdown
45-
import com.reco1l.toolkt.android.cornerRadius
46-
import com.reco1l.toolkt.android.dp
47-
import com.reco1l.toolkt.android.drawableLeft
45+
import com.reco1l.framework.android.cornerRadius
46+
import com.reco1l.framework.android.dp
47+
import com.reco1l.framework.android.drawableLeft
4848
import kotlinx.coroutines.CoroutineExceptionHandler
4949
import kotlinx.coroutines.CoroutineScope
5050
import kotlinx.coroutines.Dispatchers

‎src/com/osudroid/beatmaps/BeatmapCache.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.osudroid.beatmaps
22

33
import com.osudroid.data.BeatmapInfo
44
import com.osudroid.data.BeatmapSetInfo
5-
import com.reco1l.toolkt.kotlin.fastForEach
65
import com.rian.osu.beatmap.Beatmap
76
import com.rian.osu.beatmap.parser.BeatmapParser
87
import com.rian.osu.GameMode
@@ -121,7 +120,7 @@ object BeatmapCache {
121120
*/
122121
@JvmStatic
123122
fun invalidate(beatmapSetInfo: BeatmapSetInfo) = lock.withLock {
124-
beatmapSetInfo.beatmaps.fastForEach {
123+
beatmapSetInfo.beatmaps.forEach {
125124
droidCache.remove(it.md5)
126125
standardCache.remove(it.md5)
127126
}

‎src/com/osudroid/beatmaps/DifficultyCalculationManager.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.osudroid.utils.async
77
import com.osudroid.data.DatabaseManager
88
import com.osudroid.utils.mainThread
99
import com.osudroid.utils.stopAsync
10-
import com.reco1l.toolkt.kotlin.fastForEach
1110
import com.rian.osu.beatmap.parser.BeatmapParser
1211
import com.rian.osu.difficulty.calculator.DroidDifficultyCalculator
1312
import com.rian.osu.difficulty.calculator.StandardDifficultyCalculator
@@ -92,7 +91,7 @@ object DifficultyCalculationManager {
9291
var calculated = totalBeatmaps - pendingBeatmaps.size
9392

9493
pendingBeatmaps.chunked(max(pendingBeatmaps.size / threadCount, 1))
95-
.fastForEach { chunk ->
94+
.forEach { chunk ->
9695
ensureActive()
9796

9897
threadPool.submit {

‎src/com/osudroid/data/Beatmaps.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.osudroid.data
22

33
import android.util.*
44
import androidx.room.*
5-
import com.reco1l.toolkt.kotlin.*
65
import com.rian.osu.difficulty.BeatmapDifficultyCalculator
76
import ru.nsu.ccfit.zuev.osu.Config
87
import ru.nsu.ccfit.zuev.osu.DifficultyAlgorithm
@@ -382,7 +381,7 @@ data class BeatmapInfo(
382381
// have the ability to calculate slider durations in this context.
383382
val lastTime = beatmap.hitObjects.objects.lastOrNull()?.endTime ?: timingPoints.lastOrNull()?.time ?: 0.0
384383

385-
timingPoints.fastForEachIndexed { i, t ->
384+
timingPoints.forEachIndexed { i, t ->
386385
scope?.ensureActive()
387386

388387
val bpm = t.bpm.toFloat()
@@ -396,7 +395,7 @@ data class BeatmapInfo(
396395
bpmOverallDuration = 0.0
397396
}
398397

399-
return@fastForEachIndexed
398+
return@forEachIndexed
400399
}
401400

402401
// osu!stable forced the first control point to start at 0.

0 commit comments

Comments
 (0)