safeStorageContext refactored
This commit is contained in:
parent
33c278d686
commit
5e23f27066
|
@ -15,7 +15,6 @@ import com.simplemobiletools.keyboard.R
|
||||||
import com.simplemobiletools.keyboard.extensions.config
|
import com.simplemobiletools.keyboard.extensions.config
|
||||||
import com.simplemobiletools.keyboard.extensions.getCurrentClip
|
import com.simplemobiletools.keyboard.extensions.getCurrentClip
|
||||||
import com.simplemobiletools.keyboard.extensions.getStrokeColor
|
import com.simplemobiletools.keyboard.extensions.getStrokeColor
|
||||||
import com.simplemobiletools.keyboard.extensions.safeStorageContext
|
|
||||||
import com.simplemobiletools.keyboard.helpers.ClipsHelper
|
import com.simplemobiletools.keyboard.helpers.ClipsHelper
|
||||||
import com.simplemobiletools.keyboard.helpers.ITEM_CLIP
|
import com.simplemobiletools.keyboard.helpers.ITEM_CLIP
|
||||||
import com.simplemobiletools.keyboard.helpers.ITEM_SECTION_LABEL
|
import com.simplemobiletools.keyboard.helpers.ITEM_SECTION_LABEL
|
||||||
|
@ -33,8 +32,8 @@ class ClipsKeyboardAdapter(
|
||||||
|
|
||||||
private val layoutInflater = LayoutInflater.from(context)
|
private val layoutInflater = LayoutInflater.from(context)
|
||||||
|
|
||||||
private var textColor = context.safeStorageContext.getProperTextColor()
|
private var textColor = context.getProperTextColor()
|
||||||
private var backgroundColor = context.safeStorageContext.getProperBackgroundColor()
|
private var backgroundColor = context.getProperBackgroundColor()
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
val layoutId = when (viewType) {
|
val layoutId = when (viewType) {
|
||||||
|
|
|
@ -4,7 +4,6 @@ import android.app.KeyguardManager
|
||||||
import android.content.ClipboardManager
|
import android.content.ClipboardManager
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
import android.os.Build
|
|
||||||
import android.os.IBinder
|
import android.os.IBinder
|
||||||
import android.view.*
|
import android.view.*
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
|
@ -29,9 +28,6 @@ val Context.safeStorageContext: Context
|
||||||
this
|
this
|
||||||
}
|
}
|
||||||
|
|
||||||
val Context.shouldShowKeyboardToolbar: Boolean
|
|
||||||
get() = !isDeviceLocked
|
|
||||||
|
|
||||||
val Context.isDeviceLocked: Boolean
|
val Context.isDeviceLocked: Boolean
|
||||||
get() = (getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager).isDeviceLocked
|
get() = (getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager).isDeviceLocked
|
||||||
|
|
||||||
|
@ -60,7 +56,7 @@ fun Context.getStrokeColor(): Int {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Context.getKeyboardDialogBuilder() = if (baseConfig.isUsingSystemTheme) {
|
fun Context.getKeyboardDialogBuilder() = if (safeStorageContext.baseConfig.isUsingSystemTheme) {
|
||||||
MaterialAlertDialogBuilder(this, R.style.MyKeyboard_Alert)
|
MaterialAlertDialogBuilder(this, R.style.MyKeyboard_Alert)
|
||||||
} else {
|
} else {
|
||||||
AlertDialog.Builder(this, R.style.MyKeyboard_Alert)
|
AlertDialog.Builder(this, R.style.MyKeyboard_Alert)
|
||||||
|
|
|
@ -225,9 +225,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
|
||||||
mLabelTextSize = resources.getDimension(R.dimen.label_text_size).toInt()
|
mLabelTextSize = resources.getDimension(R.dimen.label_text_size).toInt()
|
||||||
mPreviewHeight = resources.getDimension(R.dimen.key_height).toInt()
|
mPreviewHeight = resources.getDimension(R.dimen.key_height).toInt()
|
||||||
mSpaceMoveThreshold = resources.getDimension(R.dimen.medium_margin).toInt()
|
mSpaceMoveThreshold = resources.getDimension(R.dimen.medium_margin).toInt()
|
||||||
mTextColor = context.safeStorageContext.getProperTextColor()
|
|
||||||
mBackgroundColor = context.safeStorageContext.getProperBackgroundColor()
|
with (context.safeStorageContext) {
|
||||||
mPrimaryColor = context.safeStorageContext.getProperPrimaryColor()
|
mTextColor = getProperTextColor()
|
||||||
|
mBackgroundColor = getProperBackgroundColor()
|
||||||
|
mPrimaryColor = getProperPrimaryColor()
|
||||||
|
}
|
||||||
|
|
||||||
mPreviewPopup = PopupWindow(context)
|
mPreviewPopup = PopupWindow(context)
|
||||||
mPreviewText = inflater.inflate(resources.getLayout(R.layout.keyboard_key_preview), null) as TextView
|
mPreviewText = inflater.inflate(resources.getLayout(R.layout.keyboard_key_preview), null) as TextView
|
||||||
|
@ -383,7 +386,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
|
||||||
mUsingSystemTheme = config.isUsingSystemTheme
|
mUsingSystemTheme = config.isUsingSystemTheme
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val isMainKeyboard = changedView == null || changedView != mini_keyboard_view
|
val isMainKeyboard = changedView == null || changedView != mini_keyboard_view
|
||||||
mKeyBackground = if (mShowKeyBorders && isMainKeyboard) {
|
mKeyBackground = if (mShowKeyBorders && isMainKeyboard) {
|
||||||
resources.getDrawable(R.drawable.keyboard_key_selector_outlined, context.theme)
|
resources.getDrawable(R.drawable.keyboard_key_selector_outlined, context.theme)
|
||||||
|
@ -429,7 +431,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
|
||||||
pinned_clipboard_items.applyColorFilter(mTextColor)
|
pinned_clipboard_items.applyColorFilter(mTextColor)
|
||||||
clipboard_clear.applyColorFilter(mTextColor)
|
clipboard_clear.applyColorFilter(mTextColor)
|
||||||
|
|
||||||
toolbar_holder.beInvisibleIf(!context.shouldShowKeyboardToolbar)
|
toolbar_holder.beInvisibleIf(context.isDeviceLocked)
|
||||||
}
|
}
|
||||||
|
|
||||||
mClipboardManagerHolder?.apply {
|
mClipboardManagerHolder?.apply {
|
||||||
|
@ -1492,7 +1494,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val adapter = ClipsKeyboardAdapter(context, clips, refreshClipsListener) { clip ->
|
val adapter = ClipsKeyboardAdapter(context.safeStorageContext, clips, refreshClipsListener) { clip ->
|
||||||
mOnKeyboardActionListener!!.onText(clip.value)
|
mOnKeyboardActionListener!!.onText(clip.value)
|
||||||
vibrateIfNeeded()
|
vibrateIfNeeded()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue