Эх сурвалжийг харах

Fixed Unresolved reference: ColorRole and Exceeded max line length issue

Smarshall 1 жил өмнө
parent
commit
62a79fa144

+ 3 - 3
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt

@@ -428,9 +428,9 @@ class CallActivity : CallBaseActivity() {
                 if (viewState.showStartedInfo) {
                     vibrateShort(context)
                     Snackbar.make(
-                        binding!!.root, context.resources.getString(R.string.record_active_info), Snackbar
-                        .LENGTH_LONG)
-                        .show()
+                        binding!!.root,
+                        context.resources.getString(R.string.record_active_info),
+                        Snackbar.LENGTH_LONG).show()
                 }
             } else if (viewState is RecordingStartingState) {
                 if (isAllowedToStartOrStopRecording) {

+ 1 - 0
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt

@@ -44,6 +44,7 @@ import com.nextcloud.talk.databinding.ItemCustomOutcomingLocationMessageBinding
 import com.nextcloud.talk.models.json.chat.ChatMessage
 import com.nextcloud.talk.models.json.chat.ReadStatus
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
+import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.DateUtils
 import com.nextcloud.talk.utils.UriUtils

+ 3 - 2
app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -594,8 +594,9 @@ class ConversationInfoActivity :
                 }
 
                 override fun onNext(genericOverall: GenericOverall) {
-                    Snackbar.make(binding.root, context.getString(R.string.nc_clear_history_success), Snackbar.LENGTH_LONG)
-                        .show()
+                    Snackbar.make(binding.root,
+                        context.getString(R.string.nc_clear_history_success),
+                        Snackbar.LENGTH_LONG).show()
                 }
 
                 override fun onError(e: Throwable) {

+ 3 - 2
app/src/main/java/com/nextcloud/talk/conversationinfo/GuestAccessHelper.kt

@@ -151,8 +151,9 @@ class GuestAccessHelper(
 
         override fun onComplete() {
             if (resendInvitationsResult.successful) {
-                Snackbar.make(binding.root, R.string.nc_guest_access_resend_invitations_successful, Snackbar.LENGTH_SHORT)
-                    .show()
+                Snackbar.make(binding.root,
+                    R.string.nc_guest_access_resend_invitations_successful,
+                    Snackbar.LENGTH_SHORT).show()
             }
         }
     }

+ 1 - 2
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt

@@ -744,8 +744,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor
                 Manifest.permission.POST_NOTIFICATIONS
             ) != PackageManager.PERMISSION_GRANTED
         ) {
-            // TODO: Consider calling
-            //    ActivityCompat#requestPermissions
+
             // here to request the missing permissions, and then overriding
             //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
             //                                          int[] grantResults)

+ 16 - 3
app/src/main/java/com/nextcloud/talk/location/LocationPickerActivity.kt

@@ -319,7 +319,11 @@ class LocationPickerActivity :
 
         binding.centerMapButton.setOnClickListener {
             if (myLocation.latitude == COORDINATE_ZERO && myLocation.longitude == COORDINATE_ZERO) {
-                Snackbar.make(binding.root, context.getString(R.string.nc_location_unknown), Snackbar.LENGTH_LONG).show()
+                Snackbar.make(
+                    binding.root,
+                    context.getString(R.string.nc_location_unknown),
+                    Snackbar.LENGTH_LONG
+                ).show()
             } else {
                 mapController.animateTo(myLocation)
                 moveToCurrentLocation = true
@@ -341,11 +345,13 @@ class LocationPickerActivity :
                             setLocationDescription(isGpsLocation = true, isGeocodedResult = false)
                             moveToCurrentLocation = false
                         }
+
                         geocodingResult != null -> {
                             binding.shareLocation.isClickable = true
                             setLocationDescription(isGpsLocation = false, isGeocodedResult = true)
                             geocodingResult = null
                         }
+
                         else -> {
                             binding.shareLocation.isClickable = true
                             setLocationDescription(isGpsLocation = false, isGeocodedResult = false)
@@ -377,6 +383,7 @@ class LocationPickerActivity :
                         this
                     )
                 }
+
                 locationManager!!.isProviderEnabled(LocationManager.GPS_PROVIDER) -> {
                     locationManager!!.requestLocationUpdates(
                         LocationManager.GPS_PROVIDER,
@@ -386,6 +393,7 @@ class LocationPickerActivity :
                     )
                     Log.d(TAG, "LocationManager.NETWORK_PROVIDER falling back to LocationManager.GPS_PROVIDER")
                 }
+
                 else -> {
                     Log.e(
                         TAG,
@@ -413,11 +421,13 @@ class LocationPickerActivity :
                 binding.placeName.visibility = View.GONE
                 binding.placeName.text = ""
             }
+
             isGeocodedResult -> {
                 binding.shareLocationDescription.text = context!!.getText(R.string.nc_share_this_location)
                 binding.placeName.visibility = View.VISIBLE
                 binding.placeName.text = geocodingResult?.displayName
             }
+
             else -> {
                 binding.shareLocationDescription.text = context!!.getText(R.string.nc_share_this_location)
                 binding.placeName.visibility = View.GONE
@@ -531,8 +541,11 @@ class LocationPickerActivity :
         if (requestCode == REQUEST_PERMISSIONS_REQUEST_CODE && areAllGranted(grantResults)) {
             initMap()
         } else {
-            Snackbar.make(binding.root, context!!.getString(R.string.nc_location_permission_required), Snackbar.LENGTH_LONG)
-                .show()
+            Snackbar.make(
+                binding.root,
+                context!!.getString(R.string.nc_location_permission_required),
+                Snackbar.LENGTH_LONG
+            ).show()
         }
     }
 

+ 1 - 1
app/src/main/java/com/nextcloud/talk/receivers/ShareRecordingToChatReceiver.kt

@@ -95,7 +95,7 @@ class ShareRecordingToChatReceiver : BroadcastReceiver() {
                     // For this reason there is only a Snackbar for now until we got rid of conductor.
 
                     Snackbar.make(
-                       View(context),
+                        View(context),
                         context.resources.getString(R.string.nc_all_ok_operation),
                         Snackbar.LENGTH_LONG
                     ).show()