fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-15 07:52:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

adding a missing settings divider + minor code style tweaks

Browse Source
This commit is contained in:
tibbi 2023-01-29 23:25:37 +01:00
parent c21408197e
commit 1c7babc410
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,9 +179,7 @@ class MainActivity : SimpleActivity() {
isEnabled = showRedoButton && mCurrentNote.type == NoteType.TYPE_TEXT.value isEnabled = showRedoButton && mCurrentNote.type == NoteType.TYPE_TEXT.value
icon?.alpha = if (isEnabled) 255 else 127 icon?.alpha = if (isEnabled) 255 else 127
} }
}
main_toolbar.menu.apply {
findItem(R.id.rename_note).isVisible = multipleNotesExist findItem(R.id.rename_note).isVisible = multipleNotesExist
findItem(R.id.open_note).isVisible = multipleNotesExist findItem(R.id.open_note).isVisible = multipleNotesExist
findItem(R.id.delete_note).isVisible = multipleNotesExist findItem(R.id.delete_note).isVisible = multipleNotesExist
@ -556,7 +554,6 @@ class MainActivity : SimpleActivity() {
private fun openSearch() { private fun openSearch() {
isSearchActive = true isSearchActive = true
search_wrapper.fadeIn() search_wrapper.fadeIn()
animateTopBarColors(window.statusBarColor, getProperStatusBarColor())
showKeyboard(searchQueryET) showKeyboard(searchQueryET)
currentNotesView()?.let { noteView -> currentNotesView()?.let { noteView ->
@ -573,7 +570,6 @@ class MainActivity : SimpleActivity() {
searchQueryET.text?.clear() searchQueryET.text?.clear()
isSearchActive = false isSearchActive = false
search_wrapper.fadeOut() search_wrapper.fadeOut()
animateTopBarColors(window.statusBarColor, getProperBackgroundColor())
} }
private fun getWantedNoteIndex(wantedNoteId: Long?): Int { private fun getWantedNoteIndex(wantedNoteId: Long?): Int {

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

@ -13,12 +13,10 @@ import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.extensions.config import com.simplemobiletools.notes.pro.extensions.config
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.* import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.*
import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.dialog_holder
import kotlinx.android.synthetic.main.item_add_checklist.view.* import kotlinx.android.synthetic.main.item_add_checklist.view.*
class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) { class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayList<String>) -> Unit) {
private val titles = mutableListOf<AppCompatEditText>() private val titles = mutableListOf<AppCompatEditText>()
private val textColor = activity.getProperTextColor()
private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup private val view: ViewGroup = activity.layoutInflater.inflate(R.layout.dialog_new_checklist_item, null) as ViewGroup
init { init {

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

@ -7,9 +7,10 @@ import androidx.room.PrimaryKey
@Entity(tableName = "widgets", indices = [(Index(value = ["widget_id"], unique = true))]) @Entity(tableName = "widgets", indices = [(Index(value = ["widget_id"], unique = true))])
data class Widget( data class Widget(
@PrimaryKey(autoGenerate = true) var id: Long?, @PrimaryKey(autoGenerate = true) var id: Long?,
@ColumnInfo(name = "widget_id") var widgetId: Int, @ColumnInfo(name = "widget_id") var widgetId: Int,
@ColumnInfo(name = "note_id") var noteId: Long, @ColumnInfo(name = "note_id") var noteId: Long,
@ColumnInfo(name = "widget_bg_color") var widgetBgColor: Int, @ColumnInfo(name = "widget_bg_color") var widgetBgColor: Int,
@ColumnInfo(name = "widget_text_color") var widgetTextColor: Int, @ColumnInfo(name = "widget_text_color") var widgetTextColor: Int,
@ColumnInfo(name = "widget_show_title") var widgetShowTitle: Boolean) @ColumnInfo(name = "widget_show_title") var widgetShowTitle: Boolean
)

4
app/src/main/res/layout/activity_settings.xml
View File

@ -306,6 +306,10 @@
</RelativeLayout> </RelativeLayout>
<include
android:id="@+id/settings_startup_divider"
layout="@layout/divider" />
<TextView <TextView
android:id="@+id/settings_saving_label" android:id="@+id/settings_saving_label"
style="@style/SettingsSectionLabelStyle" style="@style/SettingsSectionLabelStyle"

2
app/src/main/res/menu/menu.xml
View File

@ -25,7 +25,7 @@
android:id="@+id/undo" android:id="@+id/undo"
android:icon="@drawable/ic_undo_vector" android:icon="@drawable/ic_undo_vector"
android:title="@string/undo" android:title="@string/undo"
app:showAsAction="ifRoom" /> app:showAsAction="always" />
<item <item
android:id="@+id/redo" android:id="@+id/redo"
android:icon="@drawable/ic_redo_vector" android:icon="@drawable/ic_redo_vector"