mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-12-18 14:42:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

reformat code + fix lint warnings

Browse source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-12-02 16:55:32 +01:00
parent 22517c8ec9
commit 366c2b5777
No known key found for this signature in database
GPG key ID: C793F8B59F43CE7B
4 changed files with 93 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View file

@ -296,7 +296,9 @@ class ConversationsListActivity :
loadUserAvatar(binding.switchAccountButton)
viewThemeUtils.material.colorMaterialTextButton(binding.switchAccountButton)
viewThemeUtils.material.themeCardView(binding.conversationListHintInclude.hintLayoutCardview)
viewThemeUtils.material.themeCardView(binding.conversationListNotificationWarning.hintLayoutCardview)
viewThemeUtils.material.themeCardView(
binding.conversationListNotificationWarning.notificationWarningCardview
)
viewThemeUtils.material.colorMaterialButtonText(binding.conversationListNotificationWarning.notNowButton)
viewThemeUtils.material.colorMaterialButtonText(
binding.conversationListNotificationWarning.showSettingsButton
@ -323,14 +325,17 @@ class ConversationsListActivity :
conversationsListViewModel.getFederationInvitationsViewState.observe(this) { state ->
when (state) {
is ConversationsListViewModel.GetFederationInvitationsStartState -> {
binding.conversationListHintInclude.conversationListHintLayout.visibility = View.GONE
binding.conversationListHintInclude.conversationListHintLayout.visibility =
View.GONE
}
is ConversationsListViewModel.GetFederationInvitationsSuccessState -> {
if (state.showInvitationsHint) {
binding.conversationListHintInclude.conversationListHintLayout.visibility = View.VISIBLE
binding.conversationListHintInclude.conversationListHintLayout.visibility =
View.VISIBLE
} else {
binding.conversationListHintInclude.conversationListHintLayout.visibility = View.GONE
binding.conversationListHintInclude.conversationListHintLayout.visibility =
View.GONE
}
}
@ -1500,9 +1505,11 @@ class ConversationsListActivity :
private fun showNotificationWarning() {
if (shouldShowNotificationWarning()) {
binding.conversationListNotificationWarning.conversationListHintLayout.visibility = View.VISIBLE
binding.conversationListNotificationWarning.conversationListNotificationWarningLayout.visibility =
View.VISIBLE
binding.conversationListNotificationWarning.notNowButton.setOnClickListener {
binding.conversationListNotificationWarning.conversationListHintLayout.visibility = View.GONE
binding.conversationListNotificationWarning.conversationListNotificationWarningLayout.visibility =
View.GONE
val lastWarningDate = System.currentTimeMillis()
appPreferences.setNotificationWarningLastPostponedDate(lastWarningDate)
}
@ -1514,7 +1521,7 @@ class ConversationsListActivity :
startActivity(settingsIntent)
}
} else {
binding.conversationListNotificationWarning.conversationListHintLayout.visibility = View.GONE
binding.conversationListNotificationWarning.conversationListNotificationWarningLayout.visibility = View.GONE
}
}

143
app/src/main/java/com/nextcloud/talk/utils/preferences/AppPreferencesImpl.kt
View file

@ -28,11 +28,10 @@ import kotlinx.coroutines.runBlocking
@Suppress("TooManyFunctions", "DeferredResultUnused", "EmptyFunctionBlock")
class AppPreferencesImpl(val context: Context) : AppPreferences {
override fun getProxyType(): String {
return runBlocking {
override fun getProxyType(): String =
runBlocking {
async { readString(PROXY_TYPE, context.resources.getString(R.string.nc_no_proxy)).first() }
}.getCompleted()
}
override fun setProxyType(proxyType: String?) =
runBlocking<Unit> {
@ -47,9 +46,7 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
proxyType = ""
}
override fun getProxyHost(): String {
return runBlocking { async { readString(PROXY_HOST).first() } }.getCompleted()
}
override fun getProxyHost(): String = runBlocking { async { readString(PROXY_HOST).first() } }.getCompleted()
override fun setProxyHost(proxyHost: String?) =
runBlocking<Unit> {
@ -64,9 +61,7 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
proxyHost = ""
}
override fun getProxyPort(): String {
return runBlocking { async { readString(PROXY_PORT).first() } }.getCompleted()
}
override fun getProxyPort(): String = runBlocking { async { readString(PROXY_PORT).first() } }.getCompleted()
override fun setProxyPort(proxyPort: String?) =
runBlocking<Unit> {
@ -81,9 +76,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
proxyPort = ""
}
override fun getProxyCredentials(): Boolean {
return runBlocking { async { readBoolean(PROXY_CRED).first() } }.getCompleted()
}
override fun getProxyCredentials(): Boolean =
runBlocking {
async { readBoolean(PROXY_CRED).first() }
}.getCompleted()
override fun setProxyNeedsCredentials(proxyNeedsCredentials: Boolean) =
runBlocking<Unit> {
@ -96,9 +92,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
setProxyNeedsCredentials(false)
}
override fun getProxyUsername(): String {
return runBlocking { async { readString(PROXY_USERNAME).first() } }.getCompleted()
}
override fun getProxyUsername(): String =
runBlocking {
async { readString(PROXY_USERNAME).first() }
}.getCompleted()
override fun setProxyUsername(proxyUsername: String?) =
runBlocking<Unit> {
@ -113,9 +110,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
proxyUsername = ""
}
override fun getProxyPassword(): String {
return runBlocking { async { readString(PROXY_PASSWORD).first() } }.getCompleted()
}
override fun getProxyPassword(): String =
runBlocking {
async { readString(PROXY_PASSWORD).first() }
}.getCompleted()
override fun setProxyPassword(proxyPassword: String?) =
runBlocking<Unit> {
@ -130,9 +128,7 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
proxyPassword = ""
}
override fun getPushToken(): String {
return runBlocking { async { readString(PUSH_TOKEN).first() } }.getCompleted()
}
override fun getPushToken(): String = runBlocking { async { readString(PUSH_TOKEN).first() } }.getCompleted()
override fun setPushToken(pushToken: String?) =
runBlocking<Unit> {
@ -147,9 +143,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
pushToken = ""
}
override fun getPushTokenLatestGeneration(): Long {
return runBlocking { async { readLong(PUSH_TOKEN_LATEST_GENERATION).first() } }.getCompleted()
}
override fun getPushTokenLatestGeneration(): Long =
runBlocking {
async { readLong(PUSH_TOKEN_LATEST_GENERATION).first() }
}.getCompleted()
override fun setPushTokenLatestGeneration(date: Long) =
runBlocking<Unit> {
@ -158,9 +155,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
}
}
override fun getPushTokenLatestFetch(): Long {
return runBlocking { async { readLong(PUSH_TOKEN_LATEST_FETCH).first() } }.getCompleted()
}
override fun getPushTokenLatestFetch(): Long =
runBlocking {
async { readLong(PUSH_TOKEN_LATEST_FETCH).first() }
}.getCompleted()
override fun setPushTokenLatestFetch(date: Long) =
runBlocking<Unit> {
@ -169,9 +167,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
}
}
override fun getTemporaryClientCertAlias(): String {
return runBlocking { async { readString(TEMP_CLIENT_CERT_ALIAS).first() } }.getCompleted()
}
override fun getTemporaryClientCertAlias(): String =
runBlocking {
async { readString(TEMP_CLIENT_CERT_ALIAS).first() }
}.getCompleted()
override fun setTemporaryClientCertAlias(alias: String?) =
runBlocking<Unit> {
@ -186,9 +185,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
temporaryClientCertAlias = ""
}
override fun getPushToTalkIntroShown(): Boolean {
return runBlocking { async { readBoolean(PUSH_TO_TALK_INTRO_SHOWN).first() } }.getCompleted()
}
override fun getPushToTalkIntroShown(): Boolean =
runBlocking {
async { readBoolean(PUSH_TO_TALK_INTRO_SHOWN).first() }
}.getCompleted()
override fun setPushToTalkIntroShown(shown: Boolean) =
runBlocking<Unit> {
@ -201,9 +201,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
pushToTalkIntroShown = false
}
override fun getCallRingtoneUri(): String {
return runBlocking { async { readString(CALL_RINGTONE).first() } }.getCompleted()
}
override fun getCallRingtoneUri(): String =
runBlocking {
async { readString(CALL_RINGTONE).first() }
}.getCompleted()
override fun setCallRingtoneUri(value: String?) =
runBlocking<Unit> {
@ -218,9 +219,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
callRingtoneUri = ""
}
override fun getMessageRingtoneUri(): String {
return runBlocking { async { readString(MESSAGE_RINGTONE).first() } }.getCompleted()
}
override fun getMessageRingtoneUri(): String =
runBlocking {
async { readString(MESSAGE_RINGTONE).first() }
}.getCompleted()
override fun setMessageRingtoneUri(value: String?) =
runBlocking<Unit> {
@ -235,9 +237,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
messageRingtoneUri = ""
}
override fun getIsNotificationChannelUpgradedToV2(): Boolean {
return runBlocking { async { readBoolean(NOTIFY_UPGRADE_V2).first() } }.getCompleted()
}
override fun getIsNotificationChannelUpgradedToV2(): Boolean =
runBlocking {
async { readBoolean(NOTIFY_UPGRADE_V2).first() }
}.getCompleted()
override fun setNotificationChannelIsUpgradedToV2(value: Boolean) =
runBlocking<Unit> {
@ -250,9 +253,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
setNotificationChannelIsUpgradedToV2(false)
}
override fun getIsNotificationChannelUpgradedToV3(): Boolean {
return runBlocking { async { readBoolean(NOTIFY_UPGRADE_V3).first() } }.getCompleted()
}
override fun getIsNotificationChannelUpgradedToV3(): Boolean =
runBlocking {
async { readBoolean(NOTIFY_UPGRADE_V3).first() }
}.getCompleted()
override fun setNotificationChannelIsUpgradedToV3(value: Boolean) =
runBlocking<Unit> {
@ -265,9 +269,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
setNotificationChannelIsUpgradedToV3(false)
}
override fun getIsScreenSecured(): Boolean {
return runBlocking { async { readBoolean(SCREEN_SECURITY).first() } }.getCompleted()
}
override fun getIsScreenSecured(): Boolean =
runBlocking {
async { readBoolean(SCREEN_SECURITY).first() }
}.getCompleted()
override fun setScreenSecurity(value: Boolean) =
runBlocking<Unit> {
@ -280,9 +285,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
setScreenSecurity(false)
}
override fun getIsScreenLocked(): Boolean {
return runBlocking { async { readBoolean(SCREEN_LOCK).first() } }.getCompleted()
}
override fun getIsScreenLocked(): Boolean =
runBlocking {
async { readBoolean(SCREEN_LOCK).first() }
}.getCompleted()
override fun setScreenLock(value: Boolean) =
runBlocking<Unit> {
@ -311,9 +317,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
setIncognitoKeyboard(false)
}
override fun isPhoneBookIntegrationEnabled(): Boolean {
return runBlocking { async { readBoolean(PHONE_BOOK_INTEGRATION).first() } }.getCompleted()
}
override fun isPhoneBookIntegrationEnabled(): Boolean =
runBlocking {
async { readBoolean(PHONE_BOOK_INTEGRATION).first() }
}.getCompleted()
override fun setPhoneBookIntegration(value: Boolean) =
runBlocking<Unit> {
@ -381,9 +388,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
}
}
override fun getIsDbRoomMigrated(): Boolean {
return runBlocking { async { readBoolean(DB_ROOM_MIGRATED).first() } }.getCompleted()
}
override fun getIsDbRoomMigrated(): Boolean =
runBlocking {
async { readBoolean(DB_ROOM_MIGRATED).first() }
}.getCompleted()
override fun setIsDbRoomMigrated(value: Boolean) =
runBlocking<Unit> {
@ -392,9 +400,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
}
}
override fun getShowRegularNotificationWarning (): Boolean {
return runBlocking { async { readBoolean(SHOW_REGULAR_NOTIFICATION_WARNING, true).first() } }.getCompleted()
}
override fun getShowRegularNotificationWarning(): Boolean =
runBlocking {
async { readBoolean(SHOW_REGULAR_NOTIFICATION_WARNING, true).first() }
}.getCompleted()
override fun setShowRegularNotificationWarning(value: Boolean) =
runBlocking<Unit> {
@ -440,9 +449,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
}
}
override fun getTypingStatus(): Boolean {
return runBlocking { async { readBoolean(TYPING_STATUS).first() } }.getCompleted()
}
override fun getTypingStatus(): Boolean =
runBlocking {
async { readBoolean(TYPING_STATUS).first() }
}.getCompleted()
override fun setSorting(value: String?) =
runBlocking<Unit> {
@ -555,9 +565,10 @@ class AppPreferencesImpl(val context: Context) : AppPreferences {
}
}
override fun getNotificationWarningLastPostponedDate(): Long {
return runBlocking { async { readLong(LAST_NOTIFICATION_WARNING).first() } }.getCompleted()
}
override fun getNotificationWarningLastPostponedDate(): Long =
runBlocking {
async { readLong(LAST_NOTIFICATION_WARNING).first() }
}.getCompleted()
override fun setNotificationWarningLastPostponedDate(showNotificationWarning: Long) =
runBlocking<Unit> {

4
app/src/main/res/layout/notifications_warning.xml
View file

@ -8,7 +8,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/conversation_list_hint_layout"
android:id="@+id/conversation_list_notification_warning_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -16,7 +16,7 @@
android:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:id="@+id/hint_layout_cardview"
android:id="@+id/notification_warning_cardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_margin"

1
app/src/main/res/values/colors.xml
View file

@ -92,6 +92,5 @@
<color name="icon_on_bg_default">#99000000</color>
<color name="badge_color">#EF3B02</color>
<color name="secondary_button_background">#DBE2E9</color>
<color name="nc_warning">#FF9800</color>
</resources>