removing the lock screen notification visibility label from the settings
This commit is contained in:
parent
efc95ef9f6
commit
a5dc5c1bb8
|
@ -13,7 +13,6 @@ import com.simplemobiletools.commons.helpers.*
|
||||||
import com.simplemobiletools.commons.models.RadioItem
|
import com.simplemobiletools.commons.models.RadioItem
|
||||||
import com.simplemobiletools.smsmessenger.R
|
import com.simplemobiletools.smsmessenger.R
|
||||||
import com.simplemobiletools.smsmessenger.extensions.config
|
import com.simplemobiletools.smsmessenger.extensions.config
|
||||||
import com.simplemobiletools.smsmessenger.extensions.getLockScreenVisibilityText
|
|
||||||
import com.simplemobiletools.smsmessenger.extensions.getMMSFileLimitText
|
import com.simplemobiletools.smsmessenger.extensions.getMMSFileLimitText
|
||||||
import com.simplemobiletools.smsmessenger.helpers.*
|
import com.simplemobiletools.smsmessenger.helpers.*
|
||||||
import kotlinx.android.synthetic.main.activity_settings.*
|
import kotlinx.android.synthetic.main.activity_settings.*
|
||||||
|
@ -173,7 +172,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupLockScreenVisibility() {
|
private fun setupLockScreenVisibility() {
|
||||||
settings_lock_screen_visibility.text = getLockScreenVisibilityText(config.lockScreenVisibilitySetting)
|
|
||||||
settings_lock_screen_visibility_holder.setOnClickListener {
|
settings_lock_screen_visibility_holder.setOnClickListener {
|
||||||
val items = arrayListOf(
|
val items = arrayListOf(
|
||||||
RadioItem(LOCK_SCREEN_SENDER_MESSAGE, getString(R.string.sender_and_message)),
|
RadioItem(LOCK_SCREEN_SENDER_MESSAGE, getString(R.string.sender_and_message)),
|
||||||
|
@ -183,7 +181,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
|
|
||||||
RadioGroupDialog(this@SettingsActivity, items, config.lockScreenVisibilitySetting) {
|
RadioGroupDialog(this@SettingsActivity, items, config.lockScreenVisibilitySetting) {
|
||||||
config.lockScreenVisibilitySetting = it as Int
|
config.lockScreenVisibilitySetting = it as Int
|
||||||
settings_lock_screen_visibility.text = getLockScreenVisibilityText(config.lockScreenVisibilitySetting)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -771,14 +771,6 @@ fun Context.showMessageNotification(address: String, body: String, threadId: Lon
|
||||||
notificationManager.notify(threadId.hashCode(), builder.build())
|
notificationManager.notify(threadId.hashCode(), builder.build())
|
||||||
}
|
}
|
||||||
|
|
||||||
fun Context.getLockScreenVisibilityText(type: Int) = getString(
|
|
||||||
when (type) {
|
|
||||||
LOCK_SCREEN_SENDER_MESSAGE -> R.string.sender_and_message
|
|
||||||
LOCK_SCREEN_SENDER -> R.string.sender_only
|
|
||||||
else -> R.string.nothing
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
fun Context.removeDiacriticsIfNeeded(text: String): String {
|
fun Context.removeDiacriticsIfNeeded(text: String): String {
|
||||||
return if (config.useSimpleCharacters) text.normalizeString() else text
|
return if (config.useSimpleCharacters) text.normalizeString() else text
|
||||||
}
|
}
|
||||||
|
|
|
@ -88,14 +88,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/lock_screen_visibility" />
|
android:text="@string/lock_screen_visibility" />
|
||||||
|
|
||||||
<com.simplemobiletools.commons.views.MyTextView
|
|
||||||
android:id="@+id/settings_lock_screen_visibility"
|
|
||||||
style="@style/SettingsRightTextualValueStyle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_toEndOf="@+id/settings_lock_screen_visibility_label"
|
|
||||||
tools:text="@string/sender_and_message" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue