From e605b8c6958ab3802ebce3b6d95f49a5a8ddf55f Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Thu, 21 Apr 2022 22:35:54 +0530 Subject: [PATCH] Converted RetroUtil to Kotlin --- .../retromusic/activities/MainActivity.kt | 2 - .../retromusic/adapter/SongFileAdapter.kt | 4 +- .../retromusic/adapter/album/AlbumAdapter.kt | 4 +- .../adapter/artist/ArtistAdapter.kt | 4 +- .../adapter/base/AbsMultiSelectAdapter.kt | 5 +- .../adapter/playlist/PlaylistAdapter.kt | 4 +- .../adapter/song/ShuffleButtonSongAdapter.kt | 2 +- .../retromusic/adapter/song/SongAdapter.kt | 6 +- .../extensions/ContextExtensions.kt | 7 +- .../retromusic/extensions/InsetsExtensions.kt | 2 +- .../fragments/albums/AlbumsFragment.kt | 2 +- .../fragments/artists/ArtistsFragment.kt | 2 +- .../fragments/backup/BackupFragment.kt | 4 +- .../AbsRecyclerViewCustomGridSizeFragment.kt | 2 +- .../fragments/genres/GenresFragment.kt | 2 +- .../fragments/other/DetailListFragment.kt | 20 +- .../fragments/other/MiniPlayerFragment.kt | 2 +- .../player/gradient/GradientPlayerFragment.kt | 1 - .../fragments/playlists/PlaylistsFragment.kt | 4 +- .../fragments/songs/SongsFragment.kt | 2 +- .../name/monkey/retromusic/util/RetroUtil.kt | 265 +++++++++--------- .../views/insets/InsetsConstraintLayout.kt | 2 +- .../views/insets/InsetsLinearLayout.kt | 2 +- 23 files changed, 175 insertions(+), 175 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index 1dbbab9fe..289fda277 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -96,7 +96,6 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener { } } navController.addOnDestinationChangedListener { _, destination, _ -> - val start = System.currentTimeMillis() if (destination.id == navGraph.startDestinationId) { currentFragment(R.id.fragment_container)?.enterTransition = null } @@ -117,7 +116,6 @@ class MainActivity : AbsCastActivity(), OnSharedPreferenceChangeListener { animate = true ) // Hide Bottom Navigation Bar } - showToast("Time : ${System.currentTimeMillis() - start}") } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt index c6c0a2b5a..3192d1700 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt @@ -132,8 +132,8 @@ class SongFileAdapter( return dataSet[position] } - override fun getName(`object`: File): String { - return getFileTitle(`object`) + override fun getName(model: File): String { + return getFileTitle(model) } override fun onMultipleItemAction(menuItem: MenuItem, selection: List) { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index edba4cb32..49b00d412 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -135,8 +135,8 @@ open class AlbumAdapter( return dataSet[position] } - override fun getName(album: Album): String { - return album.title + override fun getName(model: Album): String { + return model.title } override fun onMultipleItemAction( diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index 6cb68af92..4976fcb44 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -132,8 +132,8 @@ class ArtistAdapter( return dataSet[position] } - override fun getName(artist: Artist): String { - return artist.name + override fun getName(model: Artist): String { + return model.name } override fun onMultipleItemAction( diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt index 093233c36..675c3cbda 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt @@ -64,9 +64,8 @@ abstract class AbsMultiSelectAdapter( } protected abstract fun getIdentifier(position: Int): I? - protected open fun getName(i: I): String? { - return i.toString() - } + + protected abstract fun getName(model: I): String? protected fun isChecked(identifier: I): Boolean { return checked.contains(identifier) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index 89122d125..70afd22b1 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -120,8 +120,8 @@ class PlaylistAdapter( return dataSet[position] } - override fun getName(playlist: PlaylistWithSongs): String { - return playlist.playlistEntity.playlistName + override fun getName(model: PlaylistWithSongs): String { + return model.playlistEntity.playlistName } override fun onMultipleItemAction(menuItem: MenuItem, selection: List) { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt index 29ccf448b..b8f053ec7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt @@ -60,7 +60,7 @@ class ShuffleButtonSongAdapter( } } else { super.onBindViewHolder(holder, position - 1) - val landscape = RetroUtil.isLandscape() + val landscape = RetroUtil.isLandscape if ((PreferenceUtil.songGridSize > 2 && !landscape) || (PreferenceUtil.songGridSizeLand > 5 && landscape)) { holder.menu?.isVisible = false } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt index b76ce5d25..a7c6b634d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt @@ -100,7 +100,7 @@ open class SongAdapter( holder.text?.text = getSongText(song) holder.text2?.text = getSongText(song) loadAlbumCover(song, holder) - val landscape = RetroUtil.isLandscape() + val landscape = RetroUtil.isLandscape if ((PreferenceUtil.songGridSize > 2 && !landscape) || (PreferenceUtil.songGridSizeLand > 5 && landscape)) { holder.menu?.isVisible = false } @@ -149,8 +149,8 @@ open class SongAdapter( return dataSet[position] } - override fun getName(song: Song): String { - return song.title + override fun getName(model: Song): String { + return model.title } override fun onMultipleItemAction(menuItem: MenuItem, selection: List) { diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt index 040696eb9..8cbc4be53 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt @@ -1,6 +1,7 @@ package code.name.monkey.retromusic.extensions import android.content.Context +import android.content.res.Configuration import android.widget.Toast import androidx.annotation.StringRes @@ -10,4 +11,8 @@ fun Context.showToast(@StringRes stringRes: Int, duration: Int = Toast.LENGTH_SH fun Context.showToast(message: String, duration: Int = Toast.LENGTH_SHORT) { Toast.makeText(this, message, duration).show() -} \ No newline at end of file +} + +val Context.isLandscape: Boolean get() = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE + +val Context.isTablet: Boolean get() = resources.configuration.smallestScreenWidthDp >= 600 \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt index 01bdaaafa..bc2f1bde9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt @@ -8,6 +8,6 @@ fun WindowInsetsCompat?.safeGetBottomInsets(): Int { return if (PreferenceUtil.isFullScreenMode) { return 0 } else { - this?.getInsets(WindowInsetsCompat.Type.systemBars())?.bottom ?: RetroUtil.getNavigationBarHeight() + this?.getInsets(WindowInsetsCompat.Type.systemBars())?.bottom ?: RetroUtil.navigationBarHeight } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt index 4be365c80..5bb4af92b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt @@ -161,7 +161,7 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment { try { file.delete() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt index 43dd94606..aa6d39d08 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt @@ -28,7 +28,7 @@ abstract class AbsRecyclerViewCustomGridSizeFragment private var sortOrder: String? = null private var currentLayoutRes: Int = 0 private val isLandscape: Boolean - get() = RetroUtil.isLandscape() + get() = RetroUtil.isLandscape val maxGridSize: Int get() = if (isLandscape) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt index b1731ed13..8ba01f9e5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt @@ -48,7 +48,7 @@ GenresFragment : AbsRecyclerViewFragment(), } override fun createLayoutManager(): LinearLayoutManager { - return if (RetroUtil.isLandscape()) { + return if (RetroUtil.isLandscape) { GridLayoutManager(activity, 4) } else { GridLayoutManager(activity, 2) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt index c5d0d87c5..dda396c94 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt @@ -64,9 +64,8 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de private val binding get() = _binding!! private var showClearHistoryOption = false - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - _binding = FragmentPlaylistDetailBinding.bind(view) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) when (args.type) { TOP_ARTISTS, RECENT_ARTISTS, @@ -81,6 +80,13 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de returnTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false) } } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + _binding = FragmentPlaylistDetailBinding.bind(view) + postponeEnterTransition() + view.doOnPreDraw { startPostponedEnterTransition() } mainActivity.setSupportActionBar(binding.toolbar) binding.progressIndicator.hide() when (args.type) { @@ -106,8 +112,6 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de }) binding.appBarLayout.statusBarForeground = MaterialShapeDrawable.createWithElevationOverlay(requireContext()) - postponeEnterTransition() - view.doOnPreDraw { startPostponedEnterTransition() } requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner) { if (!handleBackPress()) { remove() @@ -232,10 +236,10 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de GridLayoutManager(requireContext(), gridCount(), GridLayoutManager.VERTICAL, false) private fun gridCount(): Int { - if (RetroUtil.isTablet()) { - return if (RetroUtil.isLandscape()) 6 else 4 + if (RetroUtil.isTablet) { + return if (RetroUtil.isLandscape) 6 else 4 } - return if (RetroUtil.isLandscape()) 4 else 2 + return if (RetroUtil.isLandscape) 4 else 2 } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt index 8787f1cc8..d4eebd6d2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt @@ -67,7 +67,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p view.setOnTouchListener(FlingPlayBackController(requireContext())) setUpMiniPlayer() - if (RetroUtil.isTablet()) { + if (RetroUtil.isTablet) { binding.actionNext.show() binding.actionPrevious.show() } else { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index 74db742be..44db2f4d4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt @@ -205,7 +205,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play } override fun onBackPressed(): Boolean { - println("OK") var wasExpanded = false if (getQueuePanel().state == STATE_EXPANDED) { wasExpanded = getQueuePanel().state == STATE_EXPANDED diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt index be9a10b8a..d6b9bb126 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt @@ -74,7 +74,7 @@ class PlaylistsFragment : override fun onCreateMenu(menu: Menu, inflater: MenuInflater) { super.onCreateMenu(menu, inflater) val gridSizeItem: MenuItem = menu.findItem(R.id.action_grid_size) - if (RetroUtil.isLandscape()) { + if (RetroUtil.isLandscape) { gridSizeItem.setTitle(R.string.action_grid_size_land) } setupGridSizeMenu(gridSizeItem.subMenu) @@ -109,7 +109,7 @@ class PlaylistsFragment : 7 -> gridSizeMenu.findItem(R.id.action_grid_size_7).isChecked = true 8 -> gridSizeMenu.findItem(R.id.action_grid_size_8).isChecked = true } - val gridSize = if (RetroUtil.isLandscape()) 4 else 2 + val gridSize = if (RetroUtil.isLandscape) 4 else 2 if (gridSize < 8) { gridSizeMenu.findItem(R.id.action_grid_size_8).isVisible = false } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt index 4445d1e21..b0ada25df 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt @@ -128,7 +128,7 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment= 1) { - value = value / 1000; - index++; +object RetroUtil { + fun formatValue(value: Float): String { + var value = value + val arr = arrayOf("", "K", "M", "B", "T", "P", "E") + var index = 0 + while (value / 1000 >= 1) { + value /= 1000 + index++ + } + val decimalFormat = DecimalFormat("#.##") + return String.format("%s %s", decimalFormat.format(value.toDouble()), arr[index]) } - DecimalFormat decimalFormat = new DecimalFormat("#.##"); - return String.format("%s %s", decimalFormat.format(value), arr[index]); - } - public static float frequencyCount(int frequency) { - return (float) (frequency / 1000.0); - } - - public static Point getScreenSize(@NonNull Context c) { - Display display = null; - if (c.getSystemService(Context.WINDOW_SERVICE) != null) { - display = ((WindowManager) c.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); + fun frequencyCount(frequency: Int): Float { + return (frequency / 1000.0).toFloat() } - Point size = new Point(); - if (display != null) { - display.getSize(size); + + fun getScreenSize(c: Context): Point { + var display: Display? = null + if (c.getSystemService(Context.WINDOW_SERVICE) != null) { + display = (c.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay + } + val size = Point() + display?.getSize(size) + return size } - return size; - } - public static int getStatusBarHeight() { - int result = 0; - int resourceId = - App.Companion.getContext() - .getResources() - .getIdentifier("status_bar_height", "dimen", "android"); - if (resourceId > 0) { - result = App.Companion.getContext().getResources().getDimensionPixelSize(resourceId); - } - return result; - } - - public static int getNavigationBarHeight() { - int result = 0; - int resourceId = - App.Companion.getContext() - .getResources() - .getIdentifier("navigation_bar_height", "dimen", "android"); - if (resourceId > 0) { - result = App.Companion.getContext().getResources().getDimensionPixelSize(resourceId); - } - return result; - } - - @NonNull - public static Drawable getTintedVectorDrawable( - @NonNull Context context, @DrawableRes int id, @ColorInt int color) { - return TintHelper.createTintedDrawable( - getVectorDrawable(context.getResources(), id, context.getTheme()), color); - } - - @NonNull - public static Drawable getTintedVectorDrawable( - @NonNull Resources res, - @DrawableRes int resId, - @Nullable Resources.Theme theme, - @ColorInt int color) { - return TintHelper.createTintedDrawable(getVectorDrawable(res, resId, theme), color); - } - - @Nullable - public static Drawable getVectorDrawable( - @NonNull Resources res, @DrawableRes int resId, @Nullable Resources.Theme theme) { - return ResourcesCompat.getDrawable(res, resId, theme); - } - - public static boolean isLandscape() { - return App.Companion.getContext().getResources().getConfiguration().orientation - == Configuration.ORIENTATION_LANDSCAPE; - } - - public static boolean isTablet() { - return App.Companion.getContext().getResources().getConfiguration().smallestScreenWidthDp - >= 600; - } - - public static String getIpAddress(boolean useIPv4) { - try { - List interfaces = - Collections.list(NetworkInterface.getNetworkInterfaces()); - for (NetworkInterface intf : interfaces) { - List addrs = Collections.list(intf.getInetAddresses()); - for (InetAddress addr : addrs) { - if (!addr.isLoopbackAddress()) { - String sAddr = addr.getHostAddress(); - //boolean isIPv4 = InetAddressUtils.isIPv4Address(sAddr); - boolean isIPv4 = sAddr.indexOf(':') < 0; - if (useIPv4) { - if (isIPv4) return sAddr; - } else { - if (!isIPv4) { - int delim = sAddr.indexOf('%'); // drop ip6 zone suffix - if (delim < 0) { - return sAddr.toUpperCase(); - } else { - return sAddr.substring( - 0, - delim - ).toUpperCase(); - } - } + val statusBarHeight: Int + get() { + var result = 0 + val resourceId = getContext() + .resources + .getIdentifier("status_bar_height", "dimen", "android") + if (resourceId > 0) { + result = getContext().resources.getDimensionPixelSize(resourceId) } - } + return result } - } - } catch (Exception ignored) { + val navigationBarHeight: Int + get() { + var result = 0 + val resourceId = getContext() + .resources + .getIdentifier("navigation_bar_height", "dimen", "android") + if (resourceId > 0) { + result = getContext().resources.getDimensionPixelSize(resourceId) + } + return result + } + + fun getTintedVectorDrawable( + context: Context, @DrawableRes id: Int, @ColorInt color: Int + ): Drawable { + return TintHelper.createTintedDrawable( + getVectorDrawable(context.resources, id, context.theme), color) } - return ""; - } -} + + fun getTintedVectorDrawable( + res: Resources, + @DrawableRes resId: Int, + theme: Theme?, + @ColorInt color: Int + ): Drawable { + return TintHelper.createTintedDrawable(getVectorDrawable(res, resId, theme), color) + } + + private fun getVectorDrawable( + res: Resources, @DrawableRes resId: Int, theme: Theme? + ): Drawable? { + return ResourcesCompat.getDrawable(res, resId, theme) + } + + val isLandscape: Boolean + get() = (getContext().resources.configuration.orientation + == Configuration.ORIENTATION_LANDSCAPE) + val isTablet: Boolean + get() = (getContext().resources.configuration.smallestScreenWidthDp + >= 600) + + fun getIpAddress(useIPv4: Boolean): String? { + try { + val interfaces: List = + Collections.list(NetworkInterface.getNetworkInterfaces()) + for (intf in interfaces) { + val addrs: List = Collections.list(intf.inetAddresses) + for (addr in addrs) { + if (!addr.isLoopbackAddress) { + val sAddr = addr.hostAddress + + if (sAddr != null) { + val isIPv4 = sAddr.indexOf(':') < 0 + if (useIPv4) { + if (isIPv4) return sAddr + } else { + if (!isIPv4) { + val delim = sAddr.indexOf('%') // drop ip6 zone suffix + return if (delim < 0) { + sAddr.uppercase() + } else { + sAddr.substring( + 0, + delim + ).uppercase() + } + } + } + } else { + return null + } + + } + } + } + } catch (ignored: Exception) { + } + return "" + } +} \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt index 4d2cb5569..a00be5a93 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt @@ -12,7 +12,7 @@ class InsetsConstraintLayout @JvmOverloads constructor( defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr) { init { - if (!RetroUtil.isLandscape()) + if (!RetroUtil.isLandscape) drawAboveSystemBarsWithPadding() } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsLinearLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsLinearLayout.kt index 8f1f67534..dda7c6d06 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsLinearLayout.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsLinearLayout.kt @@ -12,7 +12,7 @@ class InsetsLinearLayout @JvmOverloads constructor( defStyleAttr: Int = 0 ) : LinearLayout(context, attrs, defStyleAttr) { init { - if (!RetroUtil.isLandscape()) + if (!RetroUtil.isLandscape) drawAboveSystemBarsWithPadding() } } \ No newline at end of file