Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 4939153

Browse files
committed
fix: bundle JetBrainsMono for monospace use cases
1 parent 936f933 commit 4939153

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

app/src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55

66
package app.passwordstore.ui.adapters
77

8-
import android.graphics.Typeface
98
import android.text.method.PasswordTransformationMethod
109
import android.view.LayoutInflater
1110
import android.view.View
1211
import android.view.ViewGroup
1312
import androidx.core.content.ContextCompat
13+
import androidx.core.content.res.ResourcesCompat
1414
import androidx.recyclerview.widget.RecyclerView
1515
import app.passwordstore.R
1616
import app.passwordstore.data.passfile.Totp
1717
import app.passwordstore.data.password.FieldItem
1818
import app.passwordstore.databinding.ItemFieldBinding
19+
import app.passwordstore.ui.compose.R as composeR
1920
import com.google.android.material.textfield.TextInputLayout
2021

2122
class FieldItemAdapter(
@@ -84,7 +85,11 @@ class FieldItemAdapter(
8485
null
8586
}
8687
if (fieldItem.key == FieldItem.ItemType.PASSWORD.type) {
87-
typeface = Typeface.create("monospace", Typeface.NORMAL)
88+
typeface =
89+
ResourcesCompat.getFont(
90+
binding.root.context,
91+
composeR.font.jetbrainsmono_nl_regular,
92+
)
8893
}
8994
setOnClickListener { copyTextToClipboard(itemText.text.toString()) }
9095
}

app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
android:layout_marginStart="@dimen/activity_horizontal_margin"
159159
android:layout_marginTop="16dp"
160160
android:layout_marginEnd="@dimen/activity_horizontal_margin"
161-
android:fontFamily="monospace"
161+
android:fontFamily="@font/jetbrainsmono_nl_regular"
162162
android:gravity="center_horizontal"
163163
android:textIsSelectable="true"
164164
android:textSize="10sp"
Binary file not shown.

0 commit comments

Comments
 (0)