Skip to content

Commit b101a17

Browse files
committed
allow clicking on the top strip items
1 parent 0672614 commit b101a17

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ class MainActivity : SimpleActivity() {
9898
searchClearBtn = findViewById(R.id.search_clear)
9999

100100
initViewPager(intent.getLongExtra(OPEN_NOTE_ID, -1L))
101-
pager_title_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
102-
pager_title_strip.layoutParams.height =
103-
(pager_title_strip.height + resources.getDimension(R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt()
101+
pager_tab_strip.drawFullUnderline = false
102+
pager_tab_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
103+
pager_tab_strip.layoutParams.height =
104+
(pager_tab_strip.height + resources.getDimension(R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt()
104105
checkWhatsNewDialog()
105106
checkIntents(intent)
106107

@@ -129,11 +130,12 @@ class MainActivity : SimpleActivity() {
129130
}
130131

131132
refreshMenuItems()
132-
pager_title_strip.apply {
133+
pager_tab_strip.apply {
133134
setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
134135
setGravity(Gravity.CENTER_VERTICAL)
135136
setNonPrimaryAlpha(0.4f)
136-
setTextColor(getProperTextColor())
137+
setTextColor(getProperPrimaryColor())
138+
tabIndicatorColor = getProperPrimaryColor()
137139
}
138140
updateTextColors(view_pager)
139141

@@ -199,7 +201,7 @@ class MainActivity : SimpleActivity() {
199201
!config.autosaveNotes && showSaveButton && (::mCurrentNote.isInitialized && mCurrentNote.type == NoteType.TYPE_TEXT.value)
200202
}
201203

202-
pager_title_strip.beVisibleIf(multipleNotesExist)
204+
pager_tab_strip.beVisibleIf(multipleNotesExist)
203205
}
204206

205207
private fun setupOptionsMenu() {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@
2929
android:layout_width="match_parent"
3030
android:layout_height="match_parent">
3131

32-
<androidx.viewpager.widget.PagerTitleStrip
33-
android:id="@+id/pager_title_strip"
32+
<androidx.viewpager.widget.PagerTabStrip
33+
android:id="@+id/pager_tab_strip"
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
3636
android:layout_gravity="top"
37+
android:background="@null"
3738
android:paddingStart="@dimen/activity_margin"
3839
android:paddingEnd="@dimen/activity_margin" />
3940

0 commit comments

Comments
 (0)