Reformat code

michaelkourlas · Jun 28, 2024 · ae1f515 · ae1f515
1 parent 16aacad
commit ae1f515
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 5 deletions.
diff --git a/voipms-sms/build.gradle b/voipms-sms/build.gradle
@@ -56,7 +56,7 @@ android {
     variantFilter { variant ->
         def names = variant.flavors*.name
         def isDemo = (names.contains("demoSending")
-                      || names.contains("demoNotSending"))
+                || names.contains("demoNotSending"))
         def isRelease = variant.buildType.name == "release"
         def isPrimary = names.contains("primary")
         if (isDemo && (isPrimary || isRelease)) {

diff --git a/voipms-sms/src/main/AndroidManifest.xml b/voipms-sms/src/main/AndroidManifest.xml
@@ -204,8 +204,7 @@
         </activity>
         <activity
             android:name=".preferences.activities.MarkdownPreferencesActivity"
-            android:exported="false">
-        </activity>
+            android:exported="false" />
         <activity
             android:name=".preferences.activities.NetworkPreferencesActivity"
             android:exported="false"
@@ -240,8 +239,7 @@
             android:name=".signIn.SignInActivity"
             android:exported="false"
             android:label="@string/sign_in_name"
-            android:parentActivityName=".preferences.activities.PreferencesActivity">
-        </activity>
+            android:parentActivityName=".preferences.activities.PreferencesActivity" />
 
         <!-- BROADCAST RECEIVERS -->
 

diff --git a/...ms/src/main/kotlin/net/kourlas/voipms_sms/conversation/ConversationRecyclerViewAdapter.kt b/...ms/src/main/kotlin/net/kourlas/voipms_sms/conversation/ConversationRecyclerViewAdapter.kt
@@ -108,13 +108,15 @@ class ConversationRecyclerViewAdapter(
                         parent, false
                     )
             }
+
             R.layout.conversation_item_outgoing -> {
                 LayoutInflater.from(parent.context)
                     .inflate(
                         R.layout.conversation_item_outgoing,
                         parent, false
                     )
             }
+
             else -> throw Exception("Unknown view type $viewType")
         }
         return MessageViewHolder(itemView, viewType)
@@ -517,6 +519,7 @@ class ConversationRecyclerViewAdapter(
                         notifyItemRemoved(newIdx)
                         oldIdx += 1
                     }
+
                     comparison > 0 -> {
                         // Add new message
                         _messageItems.add(
@@ -526,6 +529,7 @@ class ConversationRecyclerViewAdapter(
                         notifyItemInserted(newIdx)
                         newIdx += 1
                     }
+
                     else -> {
                         // Even though the view might not need to be changed,
                         // update the underlying message anyways just to be

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/conversation/MessageTextView.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/conversation/MessageTextView.kt
@@ -76,6 +76,7 @@ class MessageTextView @JvmOverloads constructor(
                     }
                     longClick = false
                 }
+
                 MotionEvent.ACTION_DOWN -> {
                     Selection.setSelection(
                         buffer,

diff --git a/.../src/main/kotlin/net/kourlas/voipms_sms/conversations/ConversationsRecyclerViewAdapter.kt b/.../src/main/kotlin/net/kourlas/voipms_sms/conversations/ConversationsRecyclerViewAdapter.kt
@@ -533,12 +533,14 @@ class ConversationsRecyclerViewAdapter<T>(
                         notifyItemInserted(newIdx)
                         newIdx += 1
                     }
+
                     comparison > 0 -> {
                         // Remove old message
                         _conversationItems.removeAt(newIdx)
                         notifyItemRemoved(newIdx)
                         oldIdx += 1
                     }
+
                     else -> {
                         // Update the underlying message
                         conversationItems[newIdx].message = newMessages[newIdx]
@@ -581,10 +583,12 @@ class ConversationsRecyclerViewAdapter<T>(
                             emptyTextView.text = activity.getString(
                                 R.string.conversations_no_dids
                             )
+
                         activity is ConversationsArchivedActivity ->
                             emptyTextView.text = activity.getString(
                                 R.string.conversations_archived_no_messages
                             )
+
                         else -> emptyTextView.text = activity.getString(
                             R.string.conversations_no_messages
                         )

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/newConversation/NewConversationActivity.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/newConversation/NewConversationActivity.kt
@@ -345,6 +345,7 @@ class NewConversationActivity : AppCompatActivity(), View.OnClickListener {
         when {
             dids.isEmpty() -> // Silently fail if no DID set
                 return
+
             dids.size > 1 -> {
                 var selectedIndex = 0
                 AlertDialog.Builder(this).apply {
@@ -372,6 +373,7 @@ class NewConversationActivity : AppCompatActivity(), View.OnClickListener {
                     show()
                 }
             }
+
             else -> {
                 intent.putExtra(
                     getString(R.string.conversation_did),

diff --git a/.../main/kotlin/net/kourlas/voipms_sms/newConversation/NewConversationRecyclerViewAdapter.kt b/.../main/kotlin/net/kourlas/voipms_sms/newConversation/NewConversationRecyclerViewAdapter.kt
@@ -357,12 +357,14 @@ class NewConversationRecyclerViewAdapter(
                         notifyItemRemoved(newIdx)
                         oldIdx += 1
                     }
+
                     comparison > 0 -> {
                         // Add new contact
                         _contactItems.add(newIdx, newContactItems[newIdx])
                         notifyItemInserted(newIdx)
                         newIdx += 1
                     }
+
                     else -> {
                         // Replace existing contact, just to be safe
                         _contactItems[newIdx] = newContactItems[newIdx]

diff --git a/...main/kotlin/net/kourlas/voipms_sms/preferences/fragments/AppearancePreferencesFragment.kt b/...main/kotlin/net/kourlas/voipms_sms/preferences/fragments/AppearancePreferencesFragment.kt
@@ -53,9 +53,11 @@ class AppearancePreferencesFragment : PreferenceFragmentCompat(),
                                         AppCompatDelegate
                                             .MODE_NIGHT_FOLLOW_SYSTEM
                                     )
+
                                 LIGHT -> AppCompatDelegate.setDefaultNightMode(
                                     AppCompatDelegate.MODE_NIGHT_NO
                                 )
+
                                 DARK -> AppCompatDelegate.setDefaultNightMode(
                                     AppCompatDelegate.MODE_NIGHT_YES
                                 )

diff --git a/...c/main/kotlin/net/kourlas/voipms_sms/preferences/fragments/DatabasePreferencesFragment.kt b/...c/main/kotlin/net/kourlas/voipms_sms/preferences/fragments/DatabasePreferencesFragment.kt
@@ -109,6 +109,7 @@ class DatabasePreferencesFragment : PreferenceFragmentCompat() {
                             }
                             true
                         }
+
                 getString(
                     R.string.preferences_database_export_key
                 ) ->
@@ -129,6 +130,7 @@ class DatabasePreferencesFragment : PreferenceFragmentCompat() {
                             }
                             true
                         }
+
                 getString(
                     R.string.preferences_database_clean_up_key
                 ) ->
@@ -137,6 +139,7 @@ class DatabasePreferencesFragment : PreferenceFragmentCompat() {
                             cleanUp()
                             true
                         }
+
                 getString(
                     R.string.preferences_database_delete_key
                 ) ->

diff --git a/...kotlin/net/kourlas/voipms_sms/preferences/fragments/SynchronizationPreferencesFragment.kt b/...kotlin/net/kourlas/voipms_sms/preferences/fragments/SynchronizationPreferencesFragment.kt
@@ -77,6 +77,7 @@ class SynchronizationPreferencesFragment : PreferenceFragmentCompat(),
                             }
                             true
                         }
+
                 getString(R.string.preferences_sync_interval_key) ->
                     preference.onPreferenceChangeListener =
                         Preference.OnPreferenceChangeListener { _, newValue ->

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/signIn/SignInActivity.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/signIn/SignInActivity.kt
@@ -73,6 +73,7 @@ class SignInActivity : AppCompatActivity() {
                             error
                         )
                     }
+
                     valid == false -> {
                         // If valid is false, then some error occurred
                         toggleControls(enabled = true)
@@ -84,6 +85,7 @@ class SignInActivity : AppCompatActivity() {
                             )
                         )
                     }
+
                     valid == true -> {
                         // If we managed to verify the credentials, then we
                         // save them and try to enable all of the DIDs in the
@@ -305,6 +307,7 @@ class SignInActivity : AppCompatActivity() {
                 }
                 return super.onOptionsItemSelected(item)
             }
+
             else -> super.onOptionsItemSelected(item)
         }
     }

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/RetrieveDidsWorker.kt
@@ -201,6 +201,7 @@ class RetrieveDidsWorker(context: Context, params: WorkerParameters) :
                 "invalid_credentials" -> applicationContext.getString(
                     R.string.preferences_dids_error_api_error_invalid_credentials
                 )
+
                 else -> applicationContext.getString(
                     R.string.preferences_dids_error_api_error,
                     response.status

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/SendMessageWorker.kt
@@ -255,27 +255,35 @@ class SendMessageWorker(context: Context, params: WorkerParameters) :
                 "invalid_credentials" -> applicationContext.getString(
                     R.string.send_message_error_api_error_invalid_credentials
                 )
+
                 "invalid_dst" -> applicationContext.getString(
                     R.string.send_message_error_api_error_invalid_dst
                 )
+
                 "invalid_sms" -> applicationContext.getString(
                     R.string.send_message_error_api_error_invalid_sms
                 )
+
                 "limit_reached" -> applicationContext.getString(
                     R.string.send_message_error_api_error_limit_reached
                 )
+
                 "message_empty" -> applicationContext.getString(
                     R.string.send_message_error_api_error_message_empty
                 )
+
                 "missing_sms" -> applicationContext.getString(
                     R.string.send_message_error_api_error_missing_sms
                 )
+
                 "sms_failed" -> applicationContext.getString(
                     R.string.send_message_error_api_error_sms_failed
                 )
+
                 "sms_toolong" -> applicationContext.getString(
                     R.string.send_message_error_api_error_sms_toolong
                 )
+
                 else -> applicationContext.getString(
                     R.string.send_message_error_api_error, response?.status
                 )

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/sms/workers/VerifyCredentialsWorker.kt
@@ -187,9 +187,11 @@ class VerifyCredentialsWorker(context: Context, params: WorkerParameters) :
                 "invalid_credentials" -> applicationContext.getString(
                     R.string.verify_credentials_error_api_error_invalid_credentials
                 )
+
                 "missing_credentials" -> applicationContext.getString(
                     R.string.verify_credentials_error_api_error_missing_credentials
                 )
+
                 else -> applicationContext.getString(
                     R.string.verify_credentials_error_api_error,
                     response.status

diff --git a/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/ui/FastScroller.kt b/voipms-sms/src/main/kotlin/net/kourlas/voipms_sms/ui/FastScroller.kt
@@ -342,11 +342,13 @@ class FastScroller private constructor(
                 startDrag()
                 return true
             }
+
             MotionEvent.ACTION_MOVE -> {
                 if (mDragging) {
                     return true
                 }
             }
+
             MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
                 if (mDragging) {
                     cancelDrag()
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,6 +76,7 @@ class MessageTextView @JvmOverloads constructor( @@
                         }
                         longClick = false
                     }
                     MotionEvent.ACTION_DOWN -> {
                         Selection.setSelection(
                             buffer,
@@ Expand Down @@