Skip to content

Commit

Permalink
Optimize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Reco1I committed Apr 30, 2024
1 parent db57657 commit dd1b12d
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 16 deletions.
12 changes: 11 additions & 1 deletion src/com/reco1l/ibancho/RoomAPI.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
package com.reco1l.ibancho

import com.dgsrz.bancho.security.SecurityUtils
import com.reco1l.ibancho.data.*
import com.reco1l.ibancho.data.PlayerStatus
import com.reco1l.ibancho.data.Room
import com.reco1l.ibancho.data.RoomStatus
import com.reco1l.ibancho.data.RoomTeam
import com.reco1l.ibancho.data.TeamMode
import com.reco1l.ibancho.data.WinCondition
import com.reco1l.ibancho.data.parseBeatmap
import com.reco1l.ibancho.data.parseGameplaySettings
import com.reco1l.ibancho.data.parseMods
import com.reco1l.ibancho.data.parsePlayer
import com.reco1l.ibancho.data.parsePlayers
import com.reco1l.osu.multiplayer.Multiplayer
import io.socket.client.IO
import io.socket.client.Socket
Expand Down
28 changes: 22 additions & 6 deletions src/com/reco1l/osu/beatmaplisting/BeatmapListing.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,22 @@ package com.reco1l.osu.beatmaplisting

import android.graphics.BitmapFactory
import android.util.Log
import android.view.*
import android.view.View.*
import android.view.ContextThemeWrapper
import android.view.KeyEvent
import android.view.LayoutInflater
import android.view.View
import android.view.View.GONE
import android.view.View.OnKeyListener
import android.view.View.VISIBLE
import android.view.ViewGroup
import android.view.ViewOutlineProvider
import android.view.inputmethod.EditorInfo
import android.widget.*
import android.widget.Button
import android.widget.EditText
import android.widget.ImageButton
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import android.widget.TextView.OnEditorActionListener
import androidx.core.text.buildSpannedString
import androidx.core.text.color
Expand All @@ -17,11 +29,15 @@ import androidx.recyclerview.widget.RecyclerView.OnScrollListener
import com.edlplan.ui.fragment.BaseFragment
import com.google.android.material.progressindicator.CircularProgressIndicator
import com.reco1l.framework.bass.URLBassStream
import com.reco1l.osu.mainThread
import com.reco1l.framework.net.IDownloaderObserver
import com.reco1l.framework.net.JsonArrayRequest
import com.reco1l.osu.OsuColors
import kotlinx.coroutines.*
import com.reco1l.osu.mainThread
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import ru.nsu.ccfit.zuev.audio.Status
import ru.nsu.ccfit.zuev.osu.Config
import ru.nsu.ccfit.zuev.osu.GlobalManager
Expand All @@ -30,7 +46,7 @@ import ru.nsu.ccfit.zuev.osu.ToastLogger
import ru.nsu.ccfit.zuev.osuplus.R
import java.net.URL
import java.text.SimpleDateFormat
import java.util.*
import java.util.TimeZone


object BeatmapListing : BaseFragment(),
Expand Down
24 changes: 15 additions & 9 deletions src/com/reco1l/osu/multiplayer/RoomScene.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,36 @@ import android.app.AlertDialog
import com.reco1l.ibancho.IPlayerEventListener
import com.reco1l.ibancho.IRoomEventListener
import com.reco1l.ibancho.RoomAPI
import com.reco1l.ibancho.data.PlayerStatus.*
import com.reco1l.ibancho.data.RoomTeam.BLUE
import com.reco1l.ibancho.data.RoomTeam.RED
import com.reco1l.ibancho.data.TeamMode.HEAD_TO_HEAD
import com.reco1l.ibancho.data.TeamMode.TEAM_VS_TEAM
import com.reco1l.ibancho.data.WinCondition.*
import com.reco1l.ibancho.data.PlayerStatus
import com.reco1l.ibancho.data.PlayerStatus.MISSING_BEATMAP
import com.reco1l.ibancho.data.PlayerStatus.NOT_READY
import com.reco1l.ibancho.data.PlayerStatus.PLAYING
import com.reco1l.ibancho.data.PlayerStatus.READY
import com.reco1l.ibancho.data.Room
import com.reco1l.ibancho.data.RoomBeatmap
import com.reco1l.ibancho.data.RoomGameplaySettings
import com.reco1l.ibancho.data.RoomMods
import com.reco1l.ibancho.data.RoomPlayer
import com.reco1l.ibancho.data.RoomTeam
import com.reco1l.ibancho.data.RoomTeam.BLUE
import com.reco1l.ibancho.data.RoomTeam.RED
import com.reco1l.ibancho.data.TeamMode
import com.reco1l.ibancho.data.TeamMode.HEAD_TO_HEAD
import com.reco1l.ibancho.data.TeamMode.TEAM_VS_TEAM
import com.reco1l.ibancho.data.WinCondition
import com.reco1l.toolkt.kotlin.runSafe
import com.reco1l.osu.updateThread
import com.reco1l.ibancho.data.WinCondition.ACCURACY
import com.reco1l.ibancho.data.WinCondition.MAX_COMBO
import com.reco1l.ibancho.data.WinCondition.SCORE_V1
import com.reco1l.ibancho.data.WinCondition.SCORE_V2
import com.reco1l.osu.mainThread
import com.reco1l.osu.multiplayer.Multiplayer.isConnected
import com.reco1l.osu.multiplayer.Multiplayer.isRoomHost
import com.reco1l.osu.multiplayer.Multiplayer.player
import com.reco1l.osu.multiplayer.Multiplayer.room
import com.reco1l.osu.ui.BeatmapButton
import com.reco1l.osu.ui.ComposedText
import com.reco1l.osu.updateThread
import com.reco1l.toolkt.kotlin.runSafe
import com.rian.osu.ui.DifficultyAlgorithmSwitcher
import org.anddev.andengine.engine.camera.SmoothCamera
import org.anddev.andengine.entity.primitive.Rectangle
Expand All @@ -49,7 +55,7 @@ import ru.nsu.ccfit.zuev.osu.online.OnlinePanel
import ru.nsu.ccfit.zuev.osu.scoring.Replay
import ru.nsu.ccfit.zuev.skins.OsuSkin
import java.text.SimpleDateFormat
import java.util.*
import java.util.TimeZone
import ru.nsu.ccfit.zuev.osu.GlobalManager.getInstance as getGlobal
import ru.nsu.ccfit.zuev.osu.LibraryManager.INSTANCE as library
import ru.nsu.ccfit.zuev.osu.ResourceManager.getInstance as getResources
Expand Down

0 comments on commit dd1b12d

Please sign in to comment.