Commit 558d915

committed

Change some functions to property syntax

1 parent 8f993ed commit 558d915Copy full SHA for 558d915

File tree

+15

-17

lines changed

+15

-17

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,13 +130,12 @@ class MainActivity: AppCompatActivity() {`
`130`	`130`	`// Returns Filter object`
`131`	`131`	`override fun getFilter() = object: Filter() {`
`132`	`132`	`// Filters the wifiEntries ArrayList with the qeury from the SearchView, and sets the results.`
`133`		`- override fun performFiltering(constraint: CharSequence): FilterResults {`
`134`		`- return FilterResults().apply {`
`135`		`- values = ArrayList<WifiEntry>().apply {`
`136`		`- wifiEntries.filterTo(this) { it.title.contains(constraint, true) }`
	`133`	`+ override fun performFiltering(constraint: CharSequence) =`
	`134`	`+ FilterResults().apply {`
	`135`	`+ values = ArrayList<WifiEntry>().apply {`
	`136`	`+ wifiEntries.filterTo(this) { it.title.contains(constraint, true) }`
	`137`	`+ }`
`137`	`138`	`}`
`138`		`- }`
`139`		`- }`
`140`	`139`
`141`	`140`	`// Publishes the filtered results`
`142`	`141`	`override fun publishResults(constraint: CharSequence, results: FilterResults) {`

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,13 @@ fun setThemeFromSharedPrefs(prefs: SharedPreferences) {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// Returns night mode constant from string`
`19`		`-fun getThemeFromPreferenceString(value: String): Int {`
`20`		`- return when (value) {`
`21`		`- "Light" -> AppCompatDelegate.MODE_NIGHT_NO`
`22`		`- "Dark" -> AppCompatDelegate.MODE_NIGHT_YES`
`23`		`- "System" -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM`
`24`		`- else -> {`
`25`		`- Log.w(TAG, "Invalid theme set in shared preferences! Using system theme.")`
`26`		`- AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM`
`27`		`- }`
`28`		`- }`
`29`		`-}`
	`19`	`+fun getThemeFromPreferenceString(value: String) =`
	`20`	`+ when (value) {`
	`21`	`+ "Light" -> AppCompatDelegate.MODE_NIGHT_NO`
	`22`	`+ "Dark" -> AppCompatDelegate.MODE_NIGHT_YES`
	`23`	`+ "System" -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM`
	`24`	`+ else -> {`
	`25`	`+ Log.w(TAG, "Invalid theme set in shared preferences! Using system theme.")`
	`26`	`+ AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM`
	`27`	`+ }`
	`28`	`+ }`

Comments

(0)