Skip to content

Fixed padding for single line view #18

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

Merged
merged 1 commit into from
Sep 1, 2016
Merged

Fixed padding for single line view #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
}

private fun showAllBottomNote() = mContext.getString(R.string.show_all)

private fun monoTypeface() = MonoFontCache.getInstance(mContext).typeface

// - View holder
Expand Down Expand Up @@ -230,6 +230,12 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter

override fun getItemCount() = mLines.size

private fun Int.isFirst() = this == 0
private fun Int.isLast() = this == itemCount - 1
private fun Int.isJustFirst() = isFirst() && !isLast()
private fun Int.isJustLast() = isLast() && !isFirst()
private fun Int.isBorder() = isFirst() || isLast()

// - Helpers (for view holder)

private fun setupLine(position: Int, line: String, holder: ViewHolder) {
Expand Down Expand Up @@ -266,13 +272,10 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
}

private fun addExtraPadding(position: Int, holder: ViewHolder) {
val dp8 = dpToPx(mContext, 8)
val isFirst = position == 0
val isLast = position == itemCount - 1

if (isFirst || isLast) {
val topPadding = if (isFirst) dp8 else 0
val bottomPadding = if (isLast) dp8 else 0
if (position.isBorder()) {
val dp8 = dpToPx(mContext, 8)
val topPadding = if (position.isJustFirst()) dp8 else 0
val bottomPadding = if (position.isJustLast()) dp8 else 0
holder.tvLineNum.setPadding(0, topPadding, 0, bottomPadding)
holder.tvLineContent.setPadding(0, topPadding, 0, bottomPadding)
} else {
Expand Down