TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes.

Browse Source
This commit is contained in:
Anton Chekulaev 2020-08-19 13:38:49 +10:00
parent d30465c6ed
commit 2f09440355
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
View File

@ -11,11 +11,11 @@ import android.os.AsyncTask
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.support.v7.app.AppCompatDelegate
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.LinearLayout
import android.widget.Toast
import androidx.appcompat.app.AppCompatDelegate
import kotlinx.android.synthetic.main.activity_settings.*
import network.loki.messenger.BuildConfig
import network.loki.messenger.R
@ -115,9 +115,10 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
return themeFlag == Configuration.UI_MODE_NIGHT_YES;
}
//TODO Remove it.
private fun setDarkTheme(darkTheme: Boolean) {
// AppCompatDelegate.setDefaultNightMode(if (darkTheme) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO )
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO)
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {