Skip to content

Commit 1c7babc

Browse files
committed
adding a missing settings divider + minor code style tweaks
1 parent c214081 commit 1c7babc

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,7 @@ class MainActivity : SimpleActivity() {
179179
isEnabled = showRedoButton && mCurrentNote.type == NoteType.TYPE_TEXT.value
180180
icon?.alpha = if (isEnabled) 255 else 127
181181
}
182-
}
183182

184-
main_toolbar.menu.apply {
185183
findItem(R.id.rename_note).isVisible = multipleNotesExist
186184
findItem(R.id.open_note).isVisible = multipleNotesExist
187185
findItem(R.id.delete_note).isVisible = multipleNotesExist
@@ -556,7 +554,6 @@ class MainActivity : SimpleActivity() {
556554
private fun openSearch() {
557555
isSearchActive = true
558556
search_wrapper.fadeIn()
559-
animateTopBarColors(window.statusBarColor, getProperStatusBarColor())
560557
showKeyboard(searchQueryET)
561558

562559
currentNotesView()?.let { noteView ->
@@ -573,7 +570,6 @@ class MainActivity : SimpleActivity() {
573570
searchQueryET.text?.clear()
574571
isSearchActive = false
575572
search_wrapper.fadeOut()
576-
animateTopBarColors(window.statusBarColor, getProperBackgroundColor())
577573
}
578574

579575
private fun getWantedNoteIndex(wantedNoteId: Long?): Int {

app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
1313
import com.simplemobiletools.notes.pro.R
1414
import com.simplemobiletools.notes.pro.extensions.config
1515
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.*
16-
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder
1716
import kotlinx.android.synthetic.main.item_add_checklist.view.*
1817

1918
class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
2019
private val titles = mutableListOf<AppCompatEditText>()
21-
private val textColor = activity.getProperTextColor()
2220
private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup
2321

2422
init {

app/src/main/kotlin/com/simplemobiletools/notes/pro/models/Widget.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import androidx.room.PrimaryKey
77

88
@Entity(tableName = "widgets", indices = [(Index(value = ["widget_id"], unique = true))])
99
data class Widget(
10-
@PrimaryKey(autoGenerate = true) var id: Long?,
11-
@ColumnInfo(name = "widget_id") var widgetId: Int,
12-
@ColumnInfo(name = "note_id") var noteId: Long,
13-
@ColumnInfo(name = "widget_bg_color") var widgetBgColor: Int,
14-
@ColumnInfo(name = "widget_text_color") var widgetTextColor: Int,
15-
@ColumnInfo(name = "widget_show_title") var widgetShowTitle: Boolean)
10+
@PrimaryKey(autoGenerate = true) var id: Long?,
11+
@ColumnInfo(name = "widget_id") var widgetId: Int,
12+
@ColumnInfo(name = "note_id") var noteId: Long,
13+
@ColumnInfo(name = "widget_bg_color") var widgetBgColor: Int,
14+
@ColumnInfo(name = "widget_text_color") var widgetTextColor: Int,
15+
@ColumnInfo(name = "widget_show_title") var widgetShowTitle: Boolean
16+
)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,10 @@
306306

307307
</RelativeLayout>
308308

309+
<include
310+
android:id="@+id/settings_startup_divider"
311+
layout="@layout/divider" />
312+
309313
<TextView
310314
android:id="@+id/settings_saving_label"
311315
style="@style/SettingsSectionLabelStyle"

app/src/main/res/menu/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:id="@+id/undo"
2626
android:icon="@drawable/ic_undo_vector"
2727
android:title="@string/undo"
28-
app:showAsAction="ifRoom" />
28+
app:showAsAction="always" />
2929
<item
3030
android:id="@+id/redo"
3131
android:icon="@drawable/ic_redo_vector"

0 commit comments

Comments
 (0)