Commit bde4c3f5 authored by hazuki's avatar hazuki
Browse files

Fix preference bug

parent 2090ced6
No related merge requests found
Showing with 189 additions and 198 deletions
+189 -198
......@@ -146,6 +146,4 @@ dependencies {
implementation Libs.dagger_android
implementation Libs.dagger_android_support
kapt Libs.dagger_android_processor
implementation Libs.kvs_schema
}
......@@ -28,8 +28,8 @@ import android.widget.Toast
import androidx.fragment.app.FragmentActivity
import jp.hazuki.yuzubrowser.browser.BrowserActivity
import jp.hazuki.yuzubrowser.legacy.Constants.intent.EXTRA_OPEN_FROM_YUZU
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.utils.WebUtils
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.utils.isUrl
import jp.hazuki.yuzubrowser.ui.utils.makeUrlFromQuery
......@@ -65,7 +65,7 @@ class HandleIntentActivity : FragmentActivity() {
} else if (Intent.ACTION_WEB_SEARCH == action) {
val query = intent.getStringExtra(SearchManager.QUERY)
if (query != null) {
val url = WebUtils.makeSearchUrlFromQuery(query, AppData.search_url.get(), "%s")
val url = WebUtils.makeSearchUrlFromQuery(query, AppPrefs.search_url.get(), "%s")
if (!TextUtils.isEmpty(url)) {
startBrowser(url, packageName == intent.getStringExtra(Browser.EXTRA_APPLICATION_ID), false)
return
......@@ -79,7 +79,7 @@ class HandleIntentActivity : FragmentActivity() {
} else {
var text = WebUtils.extractionUrl(query)
if (query == text) {
text = query.makeUrlFromQuery(AppData.search_url.get(), "%s")
text = query.makeUrlFromQuery(AppPrefs.search_url.get(), "%s")
}
startBrowser(text, false, false)
}
......
......@@ -37,6 +37,7 @@ import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.utils.CrashlyticsUtils
import jp.hazuki.yuzubrowser.provider.ProviderManager
import jp.hazuki.yuzubrowser.ui.BrowserApplication
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import javax.inject.Inject
......@@ -68,9 +69,9 @@ class YuzuBrowserApplication : DaggerApplication(), BrowserApplication, HasSuppo
Logger.d(TAG, "onCreate()")
browserState.isNeedLoad = false
ErrorReportServer.initialize(this)
AppData.load(this, moshi, abpDatabase)
ErrorReportServer.setDetailedLog(AppData.detailed_log.get())
if (AppData.slow_rendering.get()) {
AppData.init(this, moshi, abpDatabase)
ErrorReportServer.setDetailedLog(AppPrefs.detailed_log.get())
if (AppPrefs.slow_rendering.get()) {
WebView.enableSlowWholeDocumentDraw()
}
Logger.isDebug = BuildConfig.DEBUG
......
......@@ -30,7 +30,6 @@ import jp.hazuki.yuzubrowser.provider.SuggestProviderBridge
import jp.hazuki.yuzubrowser.search.di.SearchJsonAdapterFactory
import jp.hazuki.yuzubrowser.ui.BrowserApplication
import jp.hazuki.yuzubrowser.ui.provider.ISuggestProvider
import jp.hazuki.yuzubrowser.ui.settings.UiPrefs
import jp.hazuki.yuzubrowser.webview.kotshi.WebViewJsonAdapterFactory
import okhttp3.OkHttpClient
import java.util.concurrent.TimeUnit
......@@ -94,12 +93,6 @@ object AppModule {
return SuggestProviderBridge()
}
@Provides
@JvmStatic
fun provideUiPrefs(context: Context): UiPrefs {
return UiPrefs.get(context)
}
@Provides
@Singleton
@JvmStatic
......
......@@ -33,12 +33,12 @@ import dagger.android.DaggerContentProvider
import jp.hazuki.yuzubrowser.BuildConfig
import jp.hazuki.yuzubrowser.ErrorReportServer
import jp.hazuki.yuzubrowser.core.utility.log.Logger
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.search.model.SearchSuggestModel
import jp.hazuki.yuzubrowser.search.model.suggest.ISuggest
import jp.hazuki.yuzubrowser.search.model.suggest.SuggestBing
import jp.hazuki.yuzubrowser.search.model.suggest.SuggestDuckDuckGo
import jp.hazuki.yuzubrowser.search.model.suggest.SuggestGoogle
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import okhttp3.OkHttpClient
import okhttp3.Request
import java.io.IOException
......@@ -60,7 +60,7 @@ class SuggestProvider : DaggerContentProvider() {
super.onCreate()
val context = context ?: throw IllegalStateException()
mOpenHelper = DatabaseHelper(context)
mSuggestType = AppData.search_suggest_engine.get()
mSuggestType = AppPrefs.search_suggest_engine.get()
mSuggestEngine = getSuggestEngine(mSuggestType)
return true
}
......@@ -145,8 +145,8 @@ class SuggestProvider : DaggerContentProvider() {
@Throws(UnknownHostException::class)
private fun getSuggests(query: String): MutableList<SearchSuggestModel.SuggestModel>? {
if (AppData.search_suggest_engine.get() != mSuggestType) {
mSuggestType = AppData.search_suggest_engine.get()
if (AppPrefs.search_suggest_engine.get() != mSuggestType) {
mSuggestType = AppPrefs.search_suggest_engine.get()
mSuggestEngine = getSuggestEngine(mSuggestType)
}
......
......@@ -66,7 +66,6 @@ import jp.hazuki.yuzubrowser.legacy.reader.ReaderActivity
import jp.hazuki.yuzubrowser.legacy.readitlater.ReadItLaterActivity
import jp.hazuki.yuzubrowser.legacy.resblock.ResourceBlockListActivity
import jp.hazuki.yuzubrowser.legacy.settings.activity.MainSettingsActivity
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.settings.preference.ClearBrowserDataAlertDialog
import jp.hazuki.yuzubrowser.legacy.settings.preference.ProxySettingDialog
import jp.hazuki.yuzubrowser.legacy.speeddial.view.SpeedDialSettingActivity
......@@ -83,6 +82,7 @@ import jp.hazuki.yuzubrowser.search.domain.makeGoogleImageSearch
import jp.hazuki.yuzubrowser.ui.BrowserApplication
import jp.hazuki.yuzubrowser.ui.dialog.SeekBarDialog
import jp.hazuki.yuzubrowser.ui.extensions.decodePunyCodeUrl
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.utils.PackageUtils
import jp.hazuki.yuzubrowser.ui.utils.makeUrlFromQuery
import jp.hazuki.yuzubrowser.ui.widget.ContextMenuTitleView
......@@ -473,7 +473,7 @@ class ActionExecutor(
}
SingleAction.WEB_RELOAD -> controller.getTab(actionTarget).mWebView.reload()
SingleAction.WEB_STOP -> controller.getTab(actionTarget).mWebView.stopLoading()
SingleAction.GO_HOME -> controller.loadUrl(controller.getTab(actionTarget), AppData.home_page.get())
SingleAction.GO_HOME -> controller.loadUrl(controller.getTab(actionTarget), AppPrefs.home_page.get())
SingleAction.ZOOM_IN -> controller.getTab(actionTarget).mWebView.zoomIn()
SingleAction.ZOOM_OUT -> controller.getTab(actionTarget).mWebView.zoomOut()
SingleAction.PAGE_UP -> controller.getTab(actionTarget).mWebView.pageUp(false)
......@@ -530,9 +530,9 @@ class ActionExecutor(
web.reload()
}
SingleAction.TOGGLE_COOKIE -> {
val cookie = !AppData.accept_cookie.get()
AppData.accept_cookie.set(cookie)
AppData.commit(controller.applicationContextInfo, AppData.accept_cookie)
val cookie = !AppPrefs.accept_cookie.get()
AppPrefs.accept_cookie.set(cookie)
AppPrefs.commit(controller.applicationContextInfo, AppPrefs.accept_cookie)
CookieManager.getInstance().setAcceptCookie(cookie)
Toast.makeText(controller.applicationContextInfo, if (cookie) R.string.toggle_enable else R.string.toggle_disable, Toast.LENGTH_SHORT).show()
}
......@@ -682,12 +682,12 @@ class ActionExecutor(
controller.loadUrl(tab, url)
}
}
SingleAction.NEW_TAB -> controller.openInNewTab(AppData.home_page.get(), TabType.DEFAULT)
SingleAction.NEW_TAB -> controller.openInNewTab(AppPrefs.home_page.get(), TabType.DEFAULT)
SingleAction.CLOSE_TAB -> if (!controller.removeTab(actionTarget)) {
checkAndRun((action as CloseTabSingleAction).defaultAction, target)
}
SingleAction.CLOSE_ALL -> {
controller.openInNewTab(AppData.home_page.get(), TabType.DEFAULT)
controller.openInNewTab(AppPrefs.home_page.get(), TabType.DEFAULT)
for (i in controller.tabManager.lastTabNo - 1 downTo 0) {
controller.removeTab(i, false)
}
......@@ -763,7 +763,7 @@ class ActionExecutor(
Toast.makeText(controller.applicationContextInfo, R.string.clipboard_empty, Toast.LENGTH_SHORT).show()
return true
}
controller.loadUrl(controller.getTab(actionTarget), text.makeUrlFromQuery(AppData.search_url.get(), "%s"), (action as PasteGoSingleAction).targetTab, TabType.WINDOW)
controller.loadUrl(controller.getTab(actionTarget), text.makeUrlFromQuery(AppPrefs.search_url.get(), "%s"), (action as PasteGoSingleAction).targetTab, TabType.WINDOW)
}
SingleAction.SHOW_BOOKMARK -> {
val intent = Intent(controller.applicationContextInfo, BookmarkActivity::class.java)
......@@ -820,7 +820,7 @@ class ActionExecutor(
.show()
SingleAction.OPEN_LINK_SETTING -> AlertDialog.Builder(controller.activity)
.setItems(R.array.pref_newtab_list
) { _, which -> AppData.newtab_link.set(controller.resourcesByInfo.getIntArray(R.array.pref_newtab_values)[which]) }
) { _, which -> AppPrefs.newtab_link.set(controller.resourcesByInfo.getIntArray(R.array.pref_newtab_values)[which]) }
.show()
SingleAction.USERAGENT_SETTING -> {
val uaIntent = Intent(controller.applicationContextInfo, UserAgentListActivity::class.java)
......
......@@ -100,6 +100,7 @@ import jp.hazuki.yuzubrowser.legacy.webrtc.core.WebRtcRequest
import jp.hazuki.yuzubrowser.search.presentation.search.SearchActivity
import jp.hazuki.yuzubrowser.ui.*
import jp.hazuki.yuzubrowser.ui.extensions.createIntentFilter
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.theme.ThemeData
import jp.hazuki.yuzubrowser.ui.utils.makeUrl
import jp.hazuki.yuzubrowser.ui.utils.makeUrlFromQuery
......@@ -133,7 +134,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
override fun run() {
tabManagerIn.saveData()
val delay = AppData.auto_tab_save_delay.get()
val delay = AppPrefs.auto_tab_save_delay.get()
if (delay > 0)
handler.postDelayed(this, (delay * 1000).toLong())
}
......@@ -222,7 +223,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
browserState = (applicationContext as BrowserApplication).browserState
if (browserState.isNeedLoad) {
AppData.load(this, moshi, abpDatabase)
AppData.init(this, moshi, abpDatabase)
browserState.isNeedLoad = false
}
......@@ -283,7 +284,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
if (tabManagerIn.isEmpty) {
val tab = addNewTab(TabType.DEFAULT)
setCurrentTab(0)
loadUrl(tab, AppData.home_page.get())
loadUrl(tab, AppPrefs.home_page.get())
}
toolbar.notifyChangeWebState()
......@@ -303,7 +304,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
override fun onStart() {
super.onStart()
if (AppData.auto_tab_save_delay.get() > 0)
if (AppPrefs.auto_tab_save_delay.get() > 0)
handler.post(saveTabsRunnable)
if (isActivityPaused) {
......@@ -317,8 +318,8 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
WebViewProxy.setProxy(applicationContext, AppData.proxy_set.get(), AppData.proxy_address.get(),
AppData.proxy_https_set.get(), AppData.proxy_https_address.get())
WebViewProxy.setProxy(applicationContext, AppPrefs.proxy_set.get(), AppPrefs.proxy_address.get(),
AppPrefs.proxy_https_set.get(), AppPrefs.proxy_https_address.get())
connectionStateMonitor.enable(this)
......@@ -351,7 +352,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
if (!checkBrowserPermission()) {
ui { requestBrowserPermissions(asyncPermissions) }
}
if (AppData.ad_block.get()) {
if (AppPrefs.ad_block.get()) {
ui {
if (abpDatabase.abpDao().getAll().checkNeedUpdate()) {
AbpUpdateService.updateAll(this@BrowserActivity)
......@@ -382,7 +383,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
return
}
if (AppData.pause_web_background.get()) {
if (AppPrefs.pause_web_background.get()) {
isActivityPaused = true
val tab = tabManagerIn.currentTabData
......@@ -505,7 +506,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
forceDestroy = data.getBooleanExtra(Constants.intent.EXTRA_FORCE_DESTROY, false)
restartBrowser()
} else {
AppData.load(applicationContext, moshi, abpDatabase)
AppData.init(applicationContext, moshi, abpDatabase)
onPreferenceReset()
}
}
......@@ -513,21 +514,21 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
if (resultCode != RESULT_OK || data == null) return
val ua = data.getStringExtra(Intent.EXTRA_TEXT)
val tab = tabManagerIn.currentTabData
tab.mWebView.webSettings.userAgentString = if (ua.isNullOrEmpty() && AppData.fake_chrome.get()) getFakeChromeUserAgent() else ua
tab.mWebView.webSettings.userAgentString = if (ua.isNullOrEmpty() && AppPrefs.fake_chrome.get()) getFakeChromeUserAgent() else ua
tab.mWebView.reload()
}
BrowserController.REQUEST_DEFAULT_USERAGENT -> {
if (resultCode != RESULT_OK || data == null) return
val ua = data.getStringExtra(Intent.EXTRA_TEXT)
AppData.user_agent.set(ua)
val browserUA = if (ua.isNullOrEmpty() && AppData.fake_chrome.get()) getFakeChromeUserAgent() else ua
AppData.commit(this, AppData.user_agent)
AppPrefs.user_agent.set(ua)
val browserUA = if (ua.isNullOrEmpty() && AppPrefs.fake_chrome.get()) getFakeChromeUserAgent() else ua
AppPrefs.commit(this, AppPrefs.user_agent)
for (tabData in tabManagerIn.loadedData) {
tabData.mWebView.webSettings.userAgentString = browserUA
tabData.mWebView.reload()
}
}
BrowserController.REQUEST_USERJS_SETTING -> webClient.resetUserScript(AppData.userjs_enable.get())
BrowserController.REQUEST_USERJS_SETTING -> webClient.resetUserScript(AppPrefs.userjs_enable.get())
BrowserController.REQUEST_WEB_ENCODE_SETTING -> {
if (resultCode != RESULT_OK || data == null) return
val encoding = data.getStringExtra(Intent.EXTRA_TEXT) ?: return
......@@ -574,14 +575,14 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
when (keyCode) {
KeyEvent.KEYCODE_VOLUME_UP -> if (AppData.volume_default_playing.get() && (getSystemService(Context.AUDIO_SERVICE) as AudioManager).isMusicActive) {
KeyEvent.KEYCODE_VOLUME_UP -> if (AppPrefs.volume_default_playing.get() && (getSystemService(Context.AUDIO_SERVICE) as AudioManager).isMusicActive) {
return super.onKeyDown(keyCode, event)
} else if (webCustomViewHandler?.isCustomViewShowing != true) {
if (userActionManager.onVolumeKey(true))
return true
}
KeyEvent.KEYCODE_VOLUME_DOWN -> if (AppData.volume_default_playing.get() && (getSystemService(Context.AUDIO_SERVICE) as AudioManager).isMusicActive) {
KeyEvent.KEYCODE_VOLUME_DOWN -> if (AppPrefs.volume_default_playing.get() && (getSystemService(Context.AUDIO_SERVICE) as AudioManager).isMusicActive) {
return super.onKeyDown(keyCode, event)
} else if (webCustomViewHandler?.isCustomViewShowing != true) {
......@@ -610,7 +611,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
if (menuWindow.isShowing) {
menuWindow.dismiss()
} else {
menuWindow.show(findViewById(R.id.superFrameLayout), OpenOptionsMenuAction.getGravity(AppData.menu_btn_list_mode.get()))
menuWindow.show(findViewById(R.id.superFrameLayout), OpenOptionsMenuAction.getGravity(AppPrefs.menu_btn_list_mode.get()))
}
return true
}
......@@ -676,7 +677,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
if (Constants.intent.ACTION_NEW_TAB == action) {
tabListView?.close()
openInNewTab(AppData.home_page.get(), TabType.DEFAULT)
openInNewTab(AppPrefs.home_page.get(), TabType.DEFAULT)
return false
}
if (intent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY != 0) {
......@@ -720,7 +721,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
userActionManager.onPreferenceReset()
CrashlyticsUtils.setWebViewMode()
ThemeData.createInstanceIfNeed(applicationContext, AppData.theme_setting.get())?.let { themeData ->
ThemeData.createInstanceIfNeed(applicationContext, AppPrefs.theme_setting.get())?.let { themeData ->
toolbar.onThemeChanged(themeData)
userActionManager.onThemeChanged(themeData)
toolbar.notifyChangeWebState()
......@@ -740,23 +741,23 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
webViewFastScroller.handlePressedColor = themeData.tabAccentColor
}
}
superFrameLayout.setWhiteBackgroundMode(AppData.whiteBackground.get())
superFrameLayout.setWhiteBackgroundMode(AppPrefs.whiteBackground.get())
menuWindow = MenuWindow(this, MenuActionManager.getInstance(applicationContext).browser_activity.list, actionController, iconManager)
webClient.onPreferenceReset()
isEnableQuickControl = AppData.qc_enable.get()
requestedOrientation = AppData.oritentation.get()
isFullscreenMode = AppData.fullscreen.get()
isEnableMultiFingerGesture = AppData.multi_finger_gesture.get()
isEnableQuickControl = AppPrefs.qc_enable.get()
requestedOrientation = AppPrefs.oritentation.get()
isFullscreenMode = AppPrefs.fullscreen.get()
isEnableMultiFingerGesture = AppPrefs.multi_finger_gesture.get()
userActionManager.setEnableGesture(webGestureOverlayView)
if (AppData.keep_screen_on.get())
if (AppPrefs.keep_screen_on.get())
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
else
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
val touchScrollbar = AppData.touch_scrollbar.get()
val touchScrollbar = AppPrefs.touch_scrollbar.get()
if (touchScrollbar >= 0) {
webViewFastScroller.setScrollEnabled(true)
webViewFastScroller.isShowLeft = touchScrollbar == 1
......@@ -764,7 +765,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
webViewFastScroller.setScrollEnabled(false)
}
ErrorReport.setDetailedLog(AppData.detailed_log.get())
ErrorReport.setDetailedLog(AppPrefs.detailed_log.get())
}
override fun getTabOrNull(target: Int): MainTabData? = tabManagerIn[target]
......@@ -820,7 +821,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
private fun addTab(index: Int, tab: MainTabData) {
tabManager.addTab(index, tab)
if (AppData.save_closed_tab.get()) {
if (AppPrefs.save_closed_tab.get()) {
closedTabs?.poll()
}
}
......@@ -843,7 +844,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
val oldWeb = oldData.mWebView
if (AppData.save_closed_tab.get()) {
if (AppPrefs.save_closed_tab.get()) {
val outState = Bundle()
oldWeb.saveState(outState)
outState.putInt(TAB_TYPE, oldData.tabType)
......@@ -863,13 +864,13 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
private fun getNewTabNo(no: Int, oldData: MainTabData): Int {
if (AppData.move_to_parent.get() && oldData.tabType == TabType.WINDOW && oldData.parent != 0L) {
if (AppPrefs.move_to_parent.get() && oldData.tabType == TabType.WINDOW && oldData.parent != 0L) {
val newNo = tabManagerIn.searchParentTabNo(oldData.parent)
if (newNo >= 0) {
return newNo
}
}
return if (AppData.move_to_left_tab.get()) {
return if (AppPrefs.move_to_left_tab.get()) {
if (no == 0) 1 else no - 1
} else {
if (no == tabManagerIn.lastTabNo) no - 1 else no + 1
......@@ -921,7 +922,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
override fun requestAddTab() {
openInNewTab(AppData.home_page.get(), TabType.DEFAULT)
openInNewTab(AppPrefs.home_page.get(), TabType.DEFAULT)
}
override fun requestMoveTab(positionFrom: Int, positionTo: Int) {
......@@ -933,7 +934,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
override fun requestCloseAllTab() {
openInNewTab(AppData.home_page.get(), TabType.DEFAULT)
openInNewTab(AppPrefs.home_page.get(), TabType.DEFAULT)
for (i in tabManagerIn.lastTabNo - 1 downTo 0) {
removeTab(i, false)
}
......@@ -999,7 +1000,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
override fun restoreTab() {
val bundle = closedTabs?.poll()
if (bundle == null) {
if (AppData.save_closed_tab.get())
if (AppPrefs.save_closed_tab.get())
Toast.makeText(applicationContext, R.string.tab_restored_failed, Toast.LENGTH_SHORT).show()
else
Toast.makeText(applicationContext, R.string.tab_restored_setting_error, Toast.LENGTH_LONG).show()
......@@ -1058,7 +1059,7 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
if (webCustomViewHandler == null) {
webCustomViewHandler = WebCustomViewHandler(fullscreenLayout)
}
webCustomViewHandler!!.showCustomView(this, view, AppData.web_customview_oritentation.get(), callback)
webCustomViewHandler!!.showCustomView(this, view, AppPrefs.web_customview_oritentation.get(), callback)
}
override fun hideCustomView() {
......@@ -1139,9 +1140,9 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
handler.removeCallbacks(saveTabsRunnable)
if (AppData.save_last_tabs.get() && finish_clear and 0x1000 == 0) {
if (AppPrefs.save_last_tabs.get() && finish_clear and 0x1000 == 0) {
tabManagerIn.saveData()
} else if (AppData.save_pinned_tabs.get()) {
} else if (AppPrefs.save_pinned_tabs.get()) {
tabManagerIn.clearExceptPinnedTab()
tabManagerIn.saveData()
} else {
......@@ -1159,14 +1160,14 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
private fun addNewTab(@WebViewType cacheType: Int, @TabType type: Int): MainTabData {
val web = makeWebView(cacheType)
// TODO: Restore this when Google fixes the bug where the WebView is blank after calling onPause followed by onResume.
// if (AppData.pause_web_tab_change.get())
// if (AppPrefs.pause_web_tab_change.get())
// web.onPause();
val tab = tabManagerIn.add(web, type)
if (ThemeData.isEnabled())
tab.onMoveTabToBackground(resources, theme)
toolbar.notifyChangeWebState()
if (AppData.toolbar_auto_open.get()) expandToolbar()
if (AppPrefs.toolbar_auto_open.get()) expandToolbar()
return tab
}
......@@ -1188,11 +1189,11 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
web.webView.setWillNotCacheDrawing(true)
}
webClient.initWebSetting(web)
val enableCookie = if (AppData.private_mode.get())
AppData.accept_cookie.get() && AppData.accept_cookie_private.get()
val enableCookie = if (AppPrefs.private_mode.get())
AppPrefs.accept_cookie.get() && AppPrefs.accept_cookie_private.get()
else
AppData.accept_cookie.get()
web.setAcceptThirdPartyCookies(CookieManager.getInstance(), enableCookie && AppData.accept_third_cookie.get())
AppPrefs.accept_cookie.get()
web.setAcceptThirdPartyCookies(CookieManager.getInstance(), enableCookie && AppPrefs.accept_third_cookie.get())
return web
}
......@@ -1436,27 +1437,27 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
field = isPrivate
val noPrivate = !isPrivate
val enableCookie = if (isPrivate)
AppData.accept_cookie.get() && AppData.accept_cookie_private.get()
AppPrefs.accept_cookie.get() && AppPrefs.accept_cookie_private.get()
else
AppData.accept_cookie.get()
AppPrefs.accept_cookie.get()
webClient.isEnableHistory = noPrivate && AppData.save_history.get()
webClient.isEnableHistory = noPrivate && AppPrefs.save_history.get()
CookieManager.getInstance().setAcceptCookie(enableCookie)
tabManagerIn.loadedData.forEach {
val settings = it.mWebView.webSettings
it.mWebView.setAcceptThirdPartyCookies(
CookieManager.getInstance(), enableCookie && AppData.accept_third_cookie.get())
CookieManager.getInstance(), enableCookie && AppPrefs.accept_third_cookie.get())
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
@Suppress("DEPRECATION")
settings.saveFormData = noPrivate && AppData.save_formdata.get()
settings.saveFormData = noPrivate && AppPrefs.save_formdata.get()
}
settings.databaseEnabled = noPrivate && AppData.web_db.get()
settings.domStorageEnabled = noPrivate && AppData.web_dom_db.get()
settings.geolocationEnabled = noPrivate && AppData.web_geolocation.get()
settings.appCacheEnabled = noPrivate && AppData.web_app_cache.get()
settings.databaseEnabled = noPrivate && AppPrefs.web_db.get()
settings.domStorageEnabled = noPrivate && AppPrefs.web_dom_db.get()
settings.geolocationEnabled = noPrivate && AppPrefs.web_geolocation.get()
settings.appCacheEnabled = noPrivate && AppPrefs.web_app_cache.get()
settings.setAppCachePath(appCacheFilePath)
}
......@@ -1575,10 +1576,10 @@ class BrowserActivity : BrowserBaseActivity(), BrowserController, FinishAlertDia
}
override var isEnableFlick: Boolean
get() = AppData.flick_enable.get()
get() = AppPrefs.flick_enable.get()
set(value) {
AppData.flick_enable.set(value)
AppData.commit(applicationContext, AppData.flick_enable)
AppPrefs.flick_enable.set(value)
AppPrefs.commit(applicationContext, AppPrefs.flick_enable)
}
override var isEnableUserScript: Boolean
......
......@@ -74,9 +74,7 @@ import jp.hazuki.yuzubrowser.legacy.readitlater.ReadItLaterActivity
import jp.hazuki.yuzubrowser.legacy.resblock.ResourceBlockListActivity
import jp.hazuki.yuzubrowser.legacy.resblock.ResourceBlockManager
import jp.hazuki.yuzubrowser.legacy.resblock.ResourceChecker
import jp.hazuki.yuzubrowser.legacy.settings.PreferenceConstants
import jp.hazuki.yuzubrowser.legacy.settings.activity.MainSettingsActivity
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.speeddial.SpeedDialAsyncManager
import jp.hazuki.yuzubrowser.legacy.speeddial.SpeedDialHtml
import jp.hazuki.yuzubrowser.legacy.tab.manager.MainTabData
......@@ -92,6 +90,8 @@ import jp.hazuki.yuzubrowser.legacy.webkit.WebUploadHandler
import jp.hazuki.yuzubrowser.legacy.webrtc.WebRtcPermission
import jp.hazuki.yuzubrowser.ui.BrowserApplication
import jp.hazuki.yuzubrowser.ui.dialog.JsAlertDialog
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.settings.PreferenceConstants
import jp.hazuki.yuzubrowser.ui.theme.ThemeData
import jp.hazuki.yuzubrowser.webview.CustomWebChromeClient
import jp.hazuki.yuzubrowser.webview.CustomWebView
......@@ -184,24 +184,24 @@ class WebClient(
fun onPreferenceReset() {
patternManager.load(activity.applicationContext)
webViewRenderingManager.onPreferenceReset(
AppData.rendering.get(),
AppData.night_mode_color.get(),
AppData.night_mode_bright.get())
AppPrefs.rendering.get(),
AppPrefs.night_mode_color.get(),
AppPrefs.night_mode_bright.get())
isEnableHistory = !AppData.private_mode.get() && AppData.save_history.get()
isEnableHistory = !AppPrefs.private_mode.get() && AppPrefs.save_history.get()
resourceCheckerList = if (AppData.resblock_enable.get()) {
resourceCheckerList = if (AppPrefs.resblock_enable.get()) {
ResourceBlockManager(activity.applicationContext).list
} else {
null
}
adBlockController = if (AppData.ad_block.get()) {
adBlockController = if (AppPrefs.ad_block.get()) {
AdBlockController(activity.applicationContext, abpDatabase.abpDao())
} else {
null
}
if (AppData.mining_protect.get()) {
if (AppPrefs.mining_protect.get()) {
if (miningProtector == null) {
miningProtector = MiningProtector()
}
......@@ -224,20 +224,20 @@ class WebClient(
controller.toolbarManager.notifyChangeWebState(it)
}
val cookie = if (AppData.private_mode.get())
AppData.accept_cookie.get() && AppData.accept_cookie_private.get()
val cookie = if (AppPrefs.private_mode.get())
AppPrefs.accept_cookie.get() && AppPrefs.accept_cookie_private.get()
else
AppData.accept_cookie.get()
AppPrefs.accept_cookie.get()
val cookieManager = CookieManager.getInstance()
cookieManager.setAcceptCookie(cookie)
val thirdCookie = cookie && AppData.accept_third_cookie.get()
val thirdCookie = cookie && AppPrefs.accept_third_cookie.get()
controller.tabManager.loadedData.forEach {
it.mWebView.setAcceptThirdPartyCookies(cookieManager, thirdCookie)
}
resetUserScript(AppData.userjs_enable.get())
resetUserScript(AppPrefs.userjs_enable.get())
}
fun initWebSetting(web: CustomWebView) {
......@@ -259,44 +259,44 @@ class WebClient(
setting.setNeedInitialFocus(false)
setting.defaultFontSize = 16
setting.defaultFixedFontSize = 13
setting.minimumLogicalFontSize = AppData.minimum_font.get()
setting.minimumFontSize = AppData.minimum_font.get()
setting.minimumLogicalFontSize = AppPrefs.minimum_font.get()
setting.minimumFontSize = AppPrefs.minimum_font.get()
setting.mixedContentMode = AppData.mixed_content.get()
setting.setSupportMultipleWindows(AppData.newtab_blank.get() != BrowserManager.LOAD_URL_TAB_CURRENT)
setting.textZoom = AppData.text_size.get()
setting.javaScriptEnabled = AppData.javascript.get()
setting.mixedContentMode = AppPrefs.mixed_content.get()
setting.setSupportMultipleWindows(AppPrefs.newtab_blank.get() != BrowserManager.LOAD_URL_TAB_CURRENT)
setting.textZoom = AppPrefs.text_size.get()
setting.javaScriptEnabled = AppPrefs.javascript.get()
setting.allowContentAccess = AppData.allow_content_access.get()
setting.allowFileAccess = AppData.file_access.get() == PreferenceConstants.FILE_ACCESS_ENABLE
setting.defaultTextEncodingName = AppData.default_encoding.get()
if (AppData.user_agent.get().isNullOrEmpty()) {
if (AppData.fake_chrome.get()) {
setting.allowContentAccess = AppPrefs.allow_content_access.get()
setting.allowFileAccess = AppPrefs.file_access.get() == PreferenceConstants.FILE_ACCESS_ENABLE
setting.defaultTextEncodingName = AppPrefs.default_encoding.get()
if (AppPrefs.user_agent.get().isNullOrEmpty()) {
if (AppPrefs.fake_chrome.get()) {
setting.userAgentString = activity.getFakeChromeUserAgent()
}
} else {
setting.userAgentString = AppData.user_agent.get()
}
setting.loadWithOverviewMode = AppData.load_overview.get()
setting.useWideViewPort = AppData.web_wideview.get()
setting.displayZoomButtons = AppData.show_zoom_button.get()
setting.cacheMode = AppData.web_cache.get()
setting.javaScriptCanOpenWindowsAutomatically = AppData.web_popup.get()
setting.layoutAlgorithm = WebSettings.LayoutAlgorithm.valueOf(AppData.layout_algorithm.get())
setting.loadsImagesAutomatically = !AppData.block_web_images.get()
val noPrivate = !AppData.private_mode.get()
setting.databaseEnabled = noPrivate && AppData.web_db.get()
setting.domStorageEnabled = noPrivate && AppData.web_dom_db.get()
setting.geolocationEnabled = noPrivate && AppData.web_geolocation.get()
setting.appCacheEnabled = noPrivate && AppData.web_app_cache.get()
setting.userAgentString = AppPrefs.user_agent.get()
}
setting.loadWithOverviewMode = AppPrefs.load_overview.get()
setting.useWideViewPort = AppPrefs.web_wideview.get()
setting.displayZoomButtons = AppPrefs.show_zoom_button.get()
setting.cacheMode = AppPrefs.web_cache.get()
setting.javaScriptCanOpenWindowsAutomatically = AppPrefs.web_popup.get()
setting.layoutAlgorithm = WebSettings.LayoutAlgorithm.valueOf(AppPrefs.layout_algorithm.get())
setting.loadsImagesAutomatically = !AppPrefs.block_web_images.get()
val noPrivate = !AppPrefs.private_mode.get()
setting.databaseEnabled = noPrivate && AppPrefs.web_db.get()
setting.domStorageEnabled = noPrivate && AppPrefs.web_dom_db.get()
setting.geolocationEnabled = noPrivate && AppPrefs.web_geolocation.get()
setting.appCacheEnabled = noPrivate && AppPrefs.web_app_cache.get()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
setting.safeBrowsingEnabled = AppData.safe_browsing.get()
setting.safeBrowsingEnabled = AppPrefs.safe_browsing.get()
} else {
@Suppress("DEPRECATION")
setting.saveFormData = noPrivate && AppData.save_formdata.get()
setting.saveFormData = noPrivate && AppPrefs.save_formdata.get()
}
setting.setAppCachePath(activity.appCacheFilePath)
......@@ -309,7 +309,7 @@ class WebClient(
webViewTheme = CustomWebView.WebViewTheme(color, isDark)
}
web.setWebViewTheme(webViewTheme)
web.swipeEnable = AppData.pull_to_refresh.get()
web.swipeEnable = AppPrefs.pull_to_refresh.get()
//if add to this, should also add to AbstractCacheWebView#settingWebView
}
......@@ -319,7 +319,7 @@ class WebClient(
controller.performNewTabLink(BrowserManager.LOAD_URL_TAB_NEW_RIGHT, tab, url, TabType.WINDOW)
return
}
val newUrl = if (AppData.file_access.get() == PreferenceConstants.FILE_ACCESS_SAFER && URLUtil.isFileUrl(url))
val newUrl = if (AppPrefs.file_access.get() == PreferenceConstants.FILE_ACCESS_SAFER && URLUtil.isFileUrl(url))
safeFileProvider.convertToSaferUrl(url)
else
url
......@@ -348,7 +348,7 @@ class WebClient(
override fun shouldOverrideUrlLoading(web: CustomWebView, url: String, uri: Uri): Boolean {
val data = controller.getTabOrNull(web) ?: return true
if (AppData.file_access.get() == PreferenceConstants.FILE_ACCESS_SAFER && URLUtil.isFileUrl(url)) {
if (AppPrefs.file_access.get() == PreferenceConstants.FILE_ACCESS_SAFER && URLUtil.isFileUrl(url)) {
controller.loadUrl(data, safeFileProvider.convertToSaferUrl(url))
return true
}
......@@ -367,7 +367,7 @@ class WebClient(
override fun onPageStarted(web: CustomWebView, url: String, favicon: Bitmap?) {
val data = controller.getTabOrNull(web) ?: return
if (AppData.toolbar_auto_open.get()) {
if (AppPrefs.toolbar_auto_open.get()) {
controller.expandToolbar()
data.mWebView.isNestedScrollingEnabledMethod = false
}
......@@ -392,7 +392,7 @@ class WebClient(
data.onStartPage()
if (AppData.save_tabs_for_crash.get())
if (AppPrefs.save_tabs_for_crash.get())
controller.tabManager.saveData()
controller.tabManager.removeThumbnailCache(url)
......@@ -427,7 +427,7 @@ class WebClient(
controller.tabManager.takeThumbnailIfNeeded(data)
if (AppData.save_tabs_for_crash.get())
if (AppPrefs.save_tabs_for_crash.get())
controller.tabManager.saveData()
if (speedDialManager.isNeedUpdate(data.originalUrl)) {
......@@ -503,7 +503,7 @@ class WebClient(
}
override fun onReceivedSslError(web: CustomWebView, handler: SslErrorHandler, error: SslError) {
if (!AppData.ssl_error_alert.get()) {
if (!AppPrefs.ssl_error_alert.get()) {
handler.cancel()
return
}
......@@ -663,7 +663,7 @@ class WebClient(
return
}
when (AppData.download_action.get()) {
when (AppPrefs.download_action.get()) {
PreferenceConstants.DOWNLOAD_DO_NOTHING -> {
}
PreferenceConstants.DOWNLOAD_AUTO -> if (WebDownloadUtils.shouldOpen(contentDisposition)) {
......@@ -762,7 +762,7 @@ class WebClient(
override fun onCreateWindow(view: CustomWebView, isDialog: Boolean, isUserGesture: Boolean, resultMsg: Message): Boolean {
controller.checkNewTabLink(AppData.newtab_blank.get(), resultMsg.obj as WebView.WebViewTransport)
controller.checkNewTabLink(AppPrefs.newtab_blank.get(), resultMsg.obj as WebView.WebViewTransport)
resultMsg.sendToTarget()
return true
}
......@@ -876,7 +876,7 @@ class WebClient(
override fun onPermissionRequest(request: PermissionRequest) {
controller.activity.runOnUiThread {
if (AppData.webRtc.get()) {
if (AppPrefs.webRtc.get()) {
WebRtcPermission.getInstance(controller.applicationContextInfo).requestPermission(request, controller.webRtcRequest)
} else {
request.deny()
......@@ -963,11 +963,11 @@ class WebClient(
}
"speeddial" -> return false
"home" -> {
if ("yuzu:home".equals(AppData.home_page.get(), ignoreCase = true) || "yuzu://home".equals(AppData.home_page.get(), ignoreCase = true)) {
AppData.home_page.set("about:blank")
AppData.commit(activity, AppData.home_page)
if ("yuzu:home".equals(AppPrefs.home_page.get(), ignoreCase = true) || "yuzu://home".equals(AppPrefs.home_page.get(), ignoreCase = true)) {
AppPrefs.home_page.set("about:blank")
AppPrefs.commit(activity, AppPrefs.home_page)
}
controller.loadUrl(data, AppData.home_page.get())
controller.loadUrl(data, AppPrefs.home_page.get())
return true
}
"resblock" -> intent = Intent(activity, ResourceBlockListActivity::class.java)
......@@ -1032,7 +1032,7 @@ class WebClient(
}
}
if (AppData.share_unknown_scheme.get()) {
if (AppPrefs.share_unknown_scheme.get()) {
if (WebUtils.isOverrideScheme(uri)) {
val intent = Intent(Intent.ACTION_VIEW, uri)
val info = activity.packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
......@@ -1106,9 +1106,9 @@ class WebClient(
private fun getNewTabPerformType(tab: MainTabData): Int {
return if ((tab.originalUrl ?: tab.url ?: "").isSpeedDial()) {
AppData.newtab_speeddial.get()
AppPrefs.newtab_speeddial.get()
} else {
AppData.newtab_link.get()
AppPrefs.newtab_link.get()
}
}
......
......@@ -30,7 +30,6 @@ import jp.hazuki.yuzubrowser.core.utility.extensions.getResColor
import jp.hazuki.yuzubrowser.legacy.R
import jp.hazuki.yuzubrowser.legacy.action.manager.ActionController
import jp.hazuki.yuzubrowser.legacy.action.manager.ActionIconManager
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.tab.manager.MainTabData
import jp.hazuki.yuzubrowser.legacy.toolbar.SubToolbar
import jp.hazuki.yuzubrowser.legacy.toolbar.ToolbarManager
......@@ -47,6 +46,7 @@ import jp.hazuki.yuzubrowser.legacy.toolbar.ToolbarManager.Companion.LOCATION_UN
import jp.hazuki.yuzubrowser.legacy.toolbar.ToolbarManager.Companion.LOCATION_WEB
import jp.hazuki.yuzubrowser.legacy.toolbar.main.*
import jp.hazuki.yuzubrowser.legacy.utils.view.tab.TabLayout
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.theme.ThemeData
import jp.hazuki.yuzubrowser.webview.CustomWebView
import kotlinx.android.extensions.LayoutContainer
......@@ -54,7 +54,7 @@ import kotlinx.android.synthetic.main.browser_activity.*
open class BrowserToolbarManager(context: Context, override val containerView: View, controller: ActionController, iconManager: ActionIconManager, requestCallback: RequestCallback) : ToolbarManager, LayoutContainer {
override val tabBar = TabBar(context, controller, iconManager, requestCallback)
override val urlBar = if (AppData.toolbar_url_box.get()) WhiteUrlBar(context, controller, iconManager, requestCallback) else UrlBar(context, controller, iconManager, requestCallback)
override val urlBar = if (AppPrefs.toolbar_url_box.get()) WhiteUrlBar(context, controller, iconManager, requestCallback) else UrlBar(context, controller, iconManager, requestCallback)
override val progressBar = ProgressToolBar(context, requestCallback)
override val customBar = CustomToolbar(context, controller, iconManager, requestCallback)
private var mIsWebToolbarCombined = false
......@@ -160,15 +160,15 @@ open class BrowserToolbarManager(context: Context, override val containerView: V
customBar.onPreferenceReset()
val params = topToolbar.layoutParams as AppBarLayout.LayoutParams
params.scrollFlags = if (AppData.snap_toolbar.get()) {
params.scrollFlags = if (AppPrefs.snap_toolbar.get()) {
(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
or AppBarLayout.LayoutParams.SCROLL_FLAG_SNAP)
} else {
AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
}
bottomOverlayToolbar.background.alpha = AppData.overlay_bottom_alpha.get()
bottomAlwaysOverlayToolbar.background.alpha = AppData.overlay_bottom_alpha.get()
bottomOverlayToolbar.background.alpha = AppPrefs.overlay_bottom_alpha.get()
bottomAlwaysOverlayToolbar.background.alpha = AppPrefs.overlay_bottom_alpha.get()
}
override fun onThemeChanged(themeData: ThemeData?) {
......@@ -199,8 +199,8 @@ open class BrowserToolbarManager(context: Context, override val containerView: V
bottomToolbarAlwaysLayout.setBackgroundResource(R.color.deep_gray)
}
bottomOverlayToolbar.background.alpha = AppData.overlay_bottom_alpha.get()
bottomAlwaysOverlayToolbar.background.alpha = AppData.overlay_bottom_alpha.get()
bottomOverlayToolbar.background.alpha = AppPrefs.overlay_bottom_alpha.get()
bottomAlwaysOverlayToolbar.background.alpha = AppPrefs.overlay_bottom_alpha.get()
for (i in 0 until bottomToolbarAlwaysLayout.childCount) {
(bottomOverlayToolbar.getChildAt(i) as? SubToolbar)?.run {
......@@ -323,7 +323,7 @@ open class BrowserToolbarManager(context: Context, override val containerView: V
}
override fun onWebViewTapUp() {
if (topToolbar.height == 0 && AppData.snap_toolbar.get()) {
if (topToolbar.height == 0 && AppPrefs.snap_toolbar.get()) {
val trans = bottomOverlayLayout.translationY
val animator: ObjectAnimator
var duration: Int
......@@ -342,4 +342,4 @@ open class BrowserToolbarManager(context: Context, override val containerView: V
animator.start()
}
}
}
\ No newline at end of file
}
......@@ -37,8 +37,8 @@ import jp.hazuki.yuzubrowser.legacy.gesture.GestureManager
import jp.hazuki.yuzubrowser.legacy.gesture.multiFinger.data.MultiFingerGestureManager
import jp.hazuki.yuzubrowser.legacy.gesture.multiFinger.detector.MultiFingerGestureDetector
import jp.hazuki.yuzubrowser.legacy.gesture.multiFinger.detector.MultiFingerGestureInfo
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.utils.extensions.setClipboardWithToast
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.theme.ThemeData
import jp.hazuki.yuzubrowser.ui.widget.MultiTouchGestureDetector
import jp.hazuki.yuzubrowser.webview.CustomOnCreateContextMenuListener
......@@ -82,8 +82,8 @@ class UserActionManager(private val context: Context, private val browser: Brows
multiFingerGestureManager = MultiFingerGestureManager(context)
if (multiFingerGestureDetector == null)
multiFingerGestureDetector = MultiFingerGestureDetector(context, this)
multiFingerGestureDetector!!.setShowName(AppData.multi_finger_gesture_show_name.get())
multiFingerGestureDetector!!.setSensitivity(AppData.multi_finger_gesture_sensitivity.get())
multiFingerGestureDetector!!.setShowName(AppPrefs.multi_finger_gesture_show_name.get())
multiFingerGestureDetector!!.setSensitivity(AppPrefs.multi_finger_gesture_sensitivity.get())
} else {
if (multiFingerGestureManager == null)
multiFingerGestureManager = null
......@@ -94,11 +94,11 @@ class UserActionManager(private val context: Context, private val browser: Brows
}
fun setEnableGesture(gestureLayout: GestureFrameLayout) {
if (AppData.gesture_enable_web.get()) {
if (AppPrefs.gesture_enable_web.get()) {
mWebGestureManager = GestureManager.getInstance(context.applicationContext, GestureManager.GESTURE_TYPE_WEB).apply { load() }
gestureLayout.isEnabled = true
gestureLayout.setGestureVisible(AppData.gesture_line_web.get())
gestureLayout.setGestureVisible(AppPrefs.gesture_line_web.get())
gestureLayout.removeAllOnGestureListeners()
gestureLayout.removeAllOnGesturePerformedListeners()
......@@ -323,10 +323,10 @@ class UserActionManager(private val context: Context, private val browser: Brows
val tab = browser.currentTabData ?: return false
if (e1.pointerCount <= 1 || e2.pointerCount <= 1) {
if (!AppData.flick_enable.get())
if (!AppPrefs.flick_enable.get())
return false
if (AppData.flick_disable_scroll.get() && tab.isMoved)
if (AppPrefs.flick_disable_scroll.get() && tab.isMoved)
return false
val dx = Math.abs(velocityX)
......@@ -335,14 +335,14 @@ class UserActionManager(private val context: Context, private val browser: Brows
if (dy > dx)
return false
if (dx < AppData.flick_sensitivity_speed.get() * 100)
if (dx < AppPrefs.flick_sensitivity_speed.get() * 100)
return false
if (Math.abs(dist) < AppData.flick_sensitivity_distance.get() * 10)
if (Math.abs(dist) < AppPrefs.flick_sensitivity_distance.get() * 10)
return false
if (e2.eventTime - e1.eventTime > 300L)
return false
if (AppData.flick_edge.get()) {
if (AppPrefs.flick_edge.get()) {
val x = e1.x
val slop = browser.resourcesByInfo.getDimension(R.dimen.flick_slop).toInt()
......@@ -358,7 +358,7 @@ class UserActionManager(private val context: Context, private val browser: Brows
else
controller.run(manager.flick_right.action)
} else {
if (!AppData.webswipe_enable.get())
if (!AppPrefs.webswipe_enable.get())
return false
val manager = WebSwipeActionManager.getInstance(browser.applicationContextInfo)
......@@ -368,8 +368,8 @@ class UserActionManager(private val context: Context, private val browser: Brows
val distY0 = e2.getY(0) - e1.getY(0)
val distY1 = e2.getY(1) - e1.getY(1)
val senseSpeed = AppData.webswipe_sensitivity_speed.get() * 100
val senseDist = AppData.webswipe_sensitivity_distance.get() * 10
val senseSpeed = AppPrefs.webswipe_sensitivity_speed.get() * 100
val senseDist = AppPrefs.webswipe_sensitivity_distance.get() * 10
if (checkWebSwipe(senseSpeed, senseDist, velocityX, distX0, distX1)) {
if (checkWebSwipe(senseSpeed, senseDist, velocityY, distY0, distY1))
......@@ -433,7 +433,7 @@ class UserActionManager(private val context: Context, private val browser: Brows
override fun onDoubleTapScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float) = false
override fun onDoubleTapFling(e1: MotionEvent?, e2: MotionEvent?, velocityX: Float, velocityY: Float): Boolean {
if (!AppData.double_tap_flick_enable.get())
if (!AppPrefs.double_tap_flick_enable.get())
return false
if (e1 == null || e2 == null)
......@@ -454,9 +454,9 @@ class UserActionManager(private val context: Context, private val browser: Brows
val returnValue: Boolean
if (dy > dx) {
if (dy < AppData.double_tap_flick_sensitivity_speed.get() * 100)
if (dy < AppPrefs.double_tap_flick_sensitivity_speed.get() * 100)
return false
if (Math.abs(distY) < AppData.double_tap_flick_sensitivity_distance.get() * 10)
if (Math.abs(distY) < AppPrefs.double_tap_flick_sensitivity_distance.get() * 10)
return false
returnValue = if (distY < 0)
......@@ -464,9 +464,9 @@ class UserActionManager(private val context: Context, private val browser: Brows
else
controller.run(manager.flick_down.action)
} else {
if (dx < AppData.double_tap_flick_sensitivity_speed.get() * 100)
if (dx < AppPrefs.double_tap_flick_sensitivity_speed.get() * 100)
return false
if (Math.abs(distX) < AppData.double_tap_flick_sensitivity_distance.get() * 10)
if (Math.abs(distX) < AppPrefs.double_tap_flick_sensitivity_distance.get() * 10)
return false
returnValue = if (distX < 0)
......@@ -480,4 +480,4 @@ class UserActionManager(private val context: Context, private val browser: Brows
return false
}
}
}
\ No newline at end of file
}
......@@ -32,7 +32,6 @@ import jp.hazuki.yuzubrowser.browser.BrowserActivity;
import jp.hazuki.yuzubrowser.core.utility.utils.ArrayUtils;
import jp.hazuki.yuzubrowser.favicon.FaviconManager;
import jp.hazuki.yuzubrowser.legacy.R;
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData;
import jp.hazuki.yuzubrowser.legacy.tab.manager.MainTabData;
import jp.hazuki.yuzubrowser.legacy.tab.manager.TabCache;
import jp.hazuki.yuzubrowser.legacy.tab.manager.TabFaviconManager;
......@@ -40,6 +39,7 @@ import jp.hazuki.yuzubrowser.legacy.tab.manager.TabIndexData;
import jp.hazuki.yuzubrowser.legacy.tab.manager.TabManager;
import jp.hazuki.yuzubrowser.legacy.tab.manager.TabStorage;
import jp.hazuki.yuzubrowser.legacy.tab.manager.ThumbnailManager;
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs;
import jp.hazuki.yuzubrowser.ui.theme.ThemeData;
import jp.hazuki.yuzubrowser.webview.CustomWebView;
import jp.hazuki.yuzubrowser.webview.WebViewFactory;
......@@ -60,7 +60,7 @@ public class CacheTabManager implements TabManager, TabCache.OnCacheOverFlowList
CacheTabManager(BrowserActivity activity, WebViewFactory factory, FaviconManager faviconManager) {
mWebBrowser = activity;
mTabCache = new TabCache<>(AppData.tabs_cache_number.get(), this);
mTabCache = new TabCache<>(AppPrefs.tabs_cache_number.get(), this);
mTabStorage = new TabStorage(activity, factory);
this.faviconManager = faviconManager;
mTabView = new ArrayList<>();
......@@ -322,7 +322,7 @@ public class CacheTabManager implements TabManager, TabCache.OnCacheOverFlowList
@Override
public void onPreferenceReset() {
synchronized (mTabCache) {
mTabCache.setSize(AppData.tabs_cache_number.get());
mTabCache.setSize(AppPrefs.tabs_cache_number.get());
}
onLayoutCreated();
}
......
......@@ -25,10 +25,10 @@ import jp.hazuki.yuzubrowser.legacy.action.manager.ActionController
import jp.hazuki.yuzubrowser.legacy.action.manager.ActionIconManager
import jp.hazuki.yuzubrowser.legacy.action.manager.TabActionManager
import jp.hazuki.yuzubrowser.legacy.browser.BrowserController
import jp.hazuki.yuzubrowser.legacy.settings.container.ToolbarVisibilityContainer
import jp.hazuki.yuzubrowser.legacy.tab.manager.MainTabData
import jp.hazuki.yuzubrowser.legacy.toolbar.main.RequestCallback
import jp.hazuki.yuzubrowser.legacy.utils.view.tab.TabLayout
import jp.hazuki.yuzubrowser.ui.settings.container.ToolbarVisibilityContainer
class Toolbar(context: Context, root: View, private val controller: BrowserController, private val actionController: ActionController, iconManager: ActionIconManager) : BrowserToolbarManager(context, root, actionController, iconManager, object : RequestCallback {
override fun shouldShowToolbar(visibility: ToolbarVisibilityContainer, tabData: MainTabData?, config: Configuration?): Boolean {
......@@ -98,4 +98,4 @@ class Toolbar(context: Context, root: View, private val controller: BrowserContr
targetInfoCache.target = id
actionController.run(tabActionManager.tab_down.action, targetInfoCache)
}
}
\ No newline at end of file
}
......@@ -119,8 +119,6 @@ dependencies {
implementation Libs.kotlin_anko_commons
implementation Libs.kotlin_anko_sql
implementation Libs.kvs_schema
implementation Libs.dagger2
annotationProcessor Libs.dagger2_compiler
kapt Libs.dagger2_compiler
......
......@@ -47,7 +47,7 @@ open class ActionManager {
fun load(context: Context): Boolean {
for (actions in actionFileList) {
if (!actions.load(context)) {
Logger.e(TAG, "load failed")
Logger.e(TAG, "init failed")
return false
}
}
......
......@@ -28,8 +28,8 @@ import jp.hazuki.yuzubrowser.core.utility.utils.externalUserDirectory
import jp.hazuki.yuzubrowser.legacy.R
import jp.hazuki.yuzubrowser.legacy.action.SingleAction
import jp.hazuki.yuzubrowser.legacy.action.view.ActionActivity
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.ui.app.StartActivityInfo
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import java.io.File
import java.io.IOException
......@@ -39,7 +39,7 @@ class SaveScreenshotSingleAction : SingleAction, Parcelable {
private set
val type: Int
get() = if (AppData.slow_rendering.get()) mSsType else SS_TYPE_PART
get() = if (AppPrefs.slow_rendering.get()) mSsType else SS_TYPE_PART
@Throws(IOException::class)
constructor(id: Int, reader: JsonReader?) : super(id) {
......@@ -96,7 +96,7 @@ class SaveScreenshotSingleAction : SingleAction, Parcelable {
captureAllCheckBox.isChecked = mSsType == SS_TYPE_ALL
if (AppData.slow_rendering.get()) {
if (AppPrefs.slow_rendering.get()) {
captureAllCheckBox.isEnabled = true
view.findViewById<View>(R.id.captureAllErrorTextView).visibility = View.GONE
}
......
......@@ -26,15 +26,15 @@ import com.squareup.moshi.JsonWriter
import jp.hazuki.yuzubrowser.legacy.R
import jp.hazuki.yuzubrowser.legacy.action.SingleAction
import jp.hazuki.yuzubrowser.legacy.action.view.ActionActivity
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.ui.app.StartActivityInfo
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import java.io.IOException
class ShareScreenshotSingleAction : SingleAction, Parcelable {
private var mSsType: Int = SS_TYPE_PART
val type: Int
get() = if (AppData.slow_rendering.get()) mSsType else SS_TYPE_PART
get() = if (AppPrefs.slow_rendering.get()) mSsType else SS_TYPE_PART
@Throws(IOException::class)
constructor(id: Int, reader: JsonReader?) : super(id) {
......@@ -84,7 +84,7 @@ class ShareScreenshotSingleAction : SingleAction, Parcelable {
captureAllCheckBox.isChecked = mSsType == SS_TYPE_ALL
if (AppData.slow_rendering.get()) {
if (AppPrefs.slow_rendering.get()) {
captureAllCheckBox.isEnabled = true
view.findViewById<View>(R.id.captureAllErrorTextView).visibility = View.GONE
}
......@@ -117,4 +117,4 @@ class ShareScreenshotSingleAction : SingleAction, Parcelable {
}
}
}
}
\ No newline at end of file
}
......@@ -26,9 +26,9 @@ import jp.hazuki.yuzubrowser.legacy.action.item.CustomSingleAction
import jp.hazuki.yuzubrowser.legacy.action.item.WebScrollSingleAction
import jp.hazuki.yuzubrowser.legacy.action.item.startactivity.StartActivitySingleAction
import jp.hazuki.yuzubrowser.legacy.browser.BrowserInfo
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.utils.graphics.SimpleLayerDrawable
import jp.hazuki.yuzubrowser.legacy.utils.graphics.TabListActionTextDrawable
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
class ActionIconManager(val info: BrowserInfo) {
......@@ -188,7 +188,7 @@ class ActionIconManager(val info: BrowserInfo) {
info.resourcesByInfo.getDrawable(R.drawable.ic_gesture_white_disable_24px, info.themeByInfo)
}
SingleAction.TOGGLE_FLICK -> {
return if (AppData.flick_enable.get())
return if (AppPrefs.flick_enable.get())
info.resourcesByInfo.getDrawable(R.drawable.ic_gesture_white_24dp, info.themeByInfo)
else
info.resourcesByInfo.getDrawable(R.drawable.ic_gesture_white_disable_24px, info.themeByInfo)
......
......@@ -29,10 +29,10 @@ import jp.hazuki.yuzubrowser.core.utility.log.Logger
import jp.hazuki.yuzubrowser.legacy.Constants
import jp.hazuki.yuzubrowser.legacy.R
import jp.hazuki.yuzubrowser.legacy.action.*
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.ui.app.OnActivityResultListener
import jp.hazuki.yuzubrowser.ui.app.StartActivityInfo
import jp.hazuki.yuzubrowser.ui.app.ThemeActivity
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.ui.widget.recycler.OnRecyclerListener
import kotlinx.android.synthetic.main.action_activity.*
......@@ -53,8 +53,8 @@ class ActionActivity : ThemeActivity(), OnRecyclerListener {
val intent = intent ?: throw NullPointerException("intent is null")
if (ACTION_ALL_ACTION == intent.action) {
val fullscreen = intent.getBooleanExtra(Constants.intent.EXTRA_MODE_FULLSCREEN, AppData.fullscreen.get())
val orientation = intent.getIntExtra(Constants.intent.EXTRA_MODE_ORIENTATION, AppData.oritentation.get())
val fullscreen = intent.getBooleanExtra(Constants.intent.EXTRA_MODE_FULLSCREEN, AppPrefs.fullscreen.get())
val orientation = intent.getIntExtra(Constants.intent.EXTRA_MODE_ORIENTATION, AppPrefs.oritentation.get())
if (fullscreen)
window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
......
......@@ -29,12 +29,12 @@ import jp.hazuki.yuzubrowser.legacy.action.ActionNameArray
import jp.hazuki.yuzubrowser.legacy.action.item.AutoPageScrollAction
import jp.hazuki.yuzubrowser.legacy.action.item.OpenOptionsMenuAction
import jp.hazuki.yuzubrowser.legacy.action.item.TabListSingleAction
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData
import jp.hazuki.yuzubrowser.legacy.tab.manager.MainTabData
import jp.hazuki.yuzubrowser.legacy.tab.manager.TabManager
import jp.hazuki.yuzubrowser.legacy.toolbar.ToolbarManager
import jp.hazuki.yuzubrowser.legacy.webkit.TabType
import jp.hazuki.yuzubrowser.legacy.webrtc.core.WebRtcRequest
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs
import jp.hazuki.yuzubrowser.webview.CustomWebView
interface BrowserController : BrowserInfo {
......@@ -58,7 +58,7 @@ interface BrowserController : BrowserInfo {
fun showSubGesture()
fun showMenu(button: View?, action: OpenOptionsMenuAction)
fun finishAlert(clearTabNo: Int)
fun finishQuick(clearTabNo: Int, finish_clear: Int = AppData.finish_alert_default.get())
fun finishQuick(clearTabNo: Int, finish_clear: Int = AppPrefs.finish_alert_default.get())
fun moveTaskToBack(root: Boolean): Boolean
fun openInCurrentTab(url: String)
fun openInNewTab(tab: MainTabData)
......
/*
* Copyright (C) 2017 Hazuki
* Copyright (C) 2017-2019 Hazuki
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
......@@ -30,8 +30,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import jp.hazuki.yuzubrowser.legacy.R;
import jp.hazuki.yuzubrowser.legacy.settings.data.AppData;
import jp.hazuki.yuzubrowser.ui.preference.CustomDialogPreference;
import jp.hazuki.yuzubrowser.ui.settings.AppPrefs;
public class FinishAlertDialog extends CustomDialogPreference {
private final boolean mShowMessage;
......@@ -132,7 +132,7 @@ public class FinishAlertDialog extends CustomDialogPreference {
if (!showMessage)
textView.setVisibility(View.GONE);
final int def = AppData.finish_alert_default.get();
final int def = AppPrefs.finish_alert_default.get();
cacheCheckBox.setChecked((def & 0x01) != 0);
cookieCheckBox.setChecked((def & 0x02) != 0);
databaseCheckBox.setChecked((def & 0x04) != 0);
......@@ -143,7 +143,7 @@ public class FinishAlertDialog extends CustomDialogPreference {
geoCheckBox.setChecked((def & 0x80) != 0);
faviconCheckBox.setChecked((def & 0x100) != 0);
if (!AppData.save_last_tabs.get())
if (!AppPrefs.save_last_tabs.get())
closeallCheckBox.setVisibility(View.GONE);
//else
// closeallCheckBox.setChecked((def & 0x1000) != 0);
......@@ -190,8 +190,8 @@ public class FinishAlertDialog extends CustomDialogPreference {
if (closeallCheckBox.isChecked())
new_settings |= 0x1000;
AppData.finish_alert_default.set(new_settings);
AppData.commit(getContext(), AppData.finish_alert_default);
AppPrefs.finish_alert_default.set(new_settings);
AppPrefs.commit(getContext(), AppPrefs.finish_alert_default);
if (callBack != null)
callBack.onFinishPositiveButtonClicked(clearTabNo, new_settings);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment