Skip to content

Commit

Permalink
tag padding
Browse files Browse the repository at this point in the history
  • Loading branch information
crackededed committed Oct 16, 2024
1 parent bc9beaa commit b9d0053
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 10 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

android {
Expand All @@ -30,7 +30,7 @@ android {
minSdk = 21
targetSdk = 35
versionCode = 121
versionName = "2.37.0"
versionName = "2.37.1"
}

buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.games.GamesFragmentDirections
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.TwitchApiHelper
import com.github.andreyasadchy.xtra.util.convertDpToPixels
import com.github.andreyasadchy.xtra.util.gone
import com.github.andreyasadchy.xtra.util.loadImage
import com.github.andreyasadchy.xtra.util.prefs
Expand Down Expand Up @@ -126,6 +127,8 @@ class FollowedGamesAdapter(
))
}
}
val padding = context.convertDpToPixels(5f)
text.setPadding(padding, 0, padding, 0)
tagsLayout.addView(text)
}
tagsFlowLayout.referencedIds = ids.toIntArray()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.github.andreyasadchy.xtra.databinding.FragmentGamesListItemBinding
import com.github.andreyasadchy.xtra.model.ui.Game
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.TwitchApiHelper
import com.github.andreyasadchy.xtra.util.convertDpToPixels
import com.github.andreyasadchy.xtra.util.gone
import com.github.andreyasadchy.xtra.util.loadImage
import com.github.andreyasadchy.xtra.util.prefs
Expand Down Expand Up @@ -120,6 +121,8 @@ class GamesAdapter(
))
}
}
val padding = context.convertDpToPixels(5f)
text.setPadding(padding, 0, padding, 0)
tagsLayout.addView(text)
}
tagsFlowLayout.referencedIds = ids.toIntArray()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.github.andreyasadchy.xtra.ui.main.MainActivity
import com.github.andreyasadchy.xtra.ui.top.TopFragmentDirections
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.TwitchApiHelper
import com.github.andreyasadchy.xtra.util.convertDpToPixels
import com.github.andreyasadchy.xtra.util.gone
import com.github.andreyasadchy.xtra.util.loadImage
import com.github.andreyasadchy.xtra.util.prefs
Expand Down Expand Up @@ -186,6 +187,8 @@ class StreamsAdapter(
))
}
}
val padding = context.convertDpToPixels(5f)
text.setPadding(padding, 0, padding, 0)
tagsLayout.addView(text)
}
tagsFlowLayout.referencedIds = ids.toIntArray()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.main.MainActivity
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.TwitchApiHelper
import com.github.andreyasadchy.xtra.util.convertDpToPixels
import com.github.andreyasadchy.xtra.util.gone
import com.github.andreyasadchy.xtra.util.loadImage
import com.github.andreyasadchy.xtra.util.prefs
Expand Down Expand Up @@ -171,6 +172,8 @@ class StreamsCompactAdapter(
tags = arrayOf(tag),
))
}
val padding = context.convertDpToPixels(5f)
text.setPadding(padding, 0, padding, 0)
tagsLayout.addView(text)
}
tagsFlowLayout.referencedIds = ids.toIntArray()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import com.github.andreyasadchy.xtra.ui.games.GameMediaFragmentDirections
import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.main.MainActivity
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.FragmentUtils
import com.github.andreyasadchy.xtra.util.TwitchApiHelper
import com.github.andreyasadchy.xtra.util.convertDpToPixels
import com.github.andreyasadchy.xtra.util.gone
import com.github.andreyasadchy.xtra.util.loadImage
import com.github.andreyasadchy.xtra.util.prefs
import com.github.andreyasadchy.xtra.util.visible
import com.github.andreyasadchy.xtra.util.FragmentUtils

class VideosAdapter(
private val fragment: Fragment,
Expand Down Expand Up @@ -190,6 +191,8 @@ class VideosAdapter(
))
}
}
val padding = context.convertDpToPixels(5f)
text.setPadding(padding, 0, padding, 0)
tagsLayout.addView(text)
}
tagsFlowLayout.referencedIds = ids.toIntArray()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.main.MainActivity
import com.github.andreyasadchy.xtra.ui.videos.BaseVideosAdapter
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.FragmentUtils
import com.github.andreyasadchy.xtra.util.TwitchApiHelper
import com.github.andreyasadchy.xtra.util.convertDpToPixels
import com.github.andreyasadchy.xtra.util.gone
import com.github.andreyasadchy.xtra.util.loadImage
import com.github.andreyasadchy.xtra.util.prefs
import com.github.andreyasadchy.xtra.util.visible
import com.github.andreyasadchy.xtra.util.FragmentUtils

class ChannelVideosAdapter(
private val fragment: Fragment,
Expand Down Expand Up @@ -168,6 +169,8 @@ class ChannelVideosAdapter(
))
}
}
val padding = context.convertDpToPixels(5f)
text.setPadding(padding, 0, padding, 0)
tagsLayout.addView(text)
}
tagsFlowLayout.referencedIds = ids.toIntArray()
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
android-gradle-plugin = "8.6.1"
android-gradle-plugin = "8.7.1"
apollo = "3.8.5"
appcompat = "1.7.0"
checker-qual = "3.47.0"
checker-qual = "3.48.1"
coil = "2.7.0"
constraintlayout = "2.1.4"
core = "1.13.1"
coroutines = "1.9.0"
draglistview = "1.7.3"
fragment = "1.8.3"
fragment = "1.8.4"
glide = "4.16.0"
glide-webpdecoder = "2.6.4.16.0"
hilt = "2.52"
Expand All @@ -19,7 +19,7 @@ ksp = "2.0.20-1.0.25"
lifecycle = "2.8.6"
material = "1.12.0"
media3 = "1.4.1"
navigation = "2.8.1"
navigation = "2.8.2"
okhttp = "5.0.0-alpha.14"
okio = "3.9.1"
paging = "3.3.2"
Expand All @@ -28,8 +28,8 @@ retrofit = "2.11.0"
room = "2.6.1"
serialization = "1.7.3"
swiperefreshlayout = "1.1.0"
webkit = "1.12.0"
work = "2.10.0-alpha04"
webkit = "1.12.1"
work = "2.10.0-beta01"

[libraries]
apollo-runtime = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "apollo" }
Expand Down

0 comments on commit b9d0053

Please sign in to comment.