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.

Sign up for GitHub

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

Fix padding when no transport type #944

Merged
merged 2 commits into from
Nov 1, 2024
Merged

Fix padding when no transport type #944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9149209
Fix padding when no transport type
Altonss May 12, 2024
13dd63e
Merge branch 'grote:master' into fixUI-noProductInfo
Altonss Oct 11, 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
10 changes: 7 additions & 3 deletions app/src/main/java/de/grobox/transportr/ui/LineView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,17 @@ class LineView(context: Context, attr: AttributeSet?) : AppCompatTextView(contex
@Suppress("DEPRECATION")
setBackgroundDrawable(backgroundDrawable)

// correct padding that gets lost when setting background
setPadding(0, dpToPx(context, 2), dpToPx(context, 4), dpToPx(context, 2))

// product icon
if (line.product != null) {
// correct padding that gets lost when setting background
setPadding(0, dpToPx(context, 2), dpToPx(context, 4), dpToPx(context, 2))

setDrawable(getDrawableForProduct(line.product), foregroundColor)
}
else{
// correct padding that gets lost when setting background
setPadding(dpToPx(context, 4), dpToPx(context, 2), dpToPx(context, 4), dpToPx(context, 2))
}

// set colored label
text = line.label
Expand Down
Loading