filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review fixes.

This commit is contained in:
Onuray Sahin 2022-06-08 12:37:48 +03:00
parent 68c6e524d2
commit adde210cfd
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
View File

@ -85,7 +85,7 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder> : AbsMe
): Boolean { ): Boolean {
holder.staticMapPinImageView.setImageResource(R.drawable.ic_location_pin_failed) holder.staticMapPinImageView.setImageResource(R.drawable.ic_location_pin_failed)
holder.staticMapErrorTextView.isVisible = true holder.staticMapErrorTextView.isVisible = true
holder.mapCopyrightTextView.isVisible = false holder.staticMapCopyrightTextView.isVisible = false
return false return false
} }
@ -101,7 +101,7 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder> : AbsMe
holder.staticMapPinImageView.setImageDrawable(pinDrawable) holder.staticMapPinImageView.setImageDrawable(pinDrawable)
} }
holder.staticMapErrorTextView.isVisible = false holder.staticMapErrorTextView.isVisible = false
holder.mapCopyrightTextView.isVisible = true holder.staticMapCopyrightTextView.isVisible = true
return false return false
} }
}) })
@ -113,6 +113,6 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder> : AbsMe
val staticMapImageView by bind<ImageView>(R.id.staticMapImageView) val staticMapImageView by bind<ImageView>(R.id.staticMapImageView)
val staticMapPinImageView by bind<ImageView>(R.id.staticMapPinImageView) val staticMapPinImageView by bind<ImageView>(R.id.staticMapPinImageView)
val staticMapErrorTextView by bind<TextView>(R.id.staticMapErrorTextView) val staticMapErrorTextView by bind<TextView>(R.id.staticMapErrorTextView)
val mapCopyrightTextView by bind<TextView>(R.id.mapCopyrightTextView) val staticMapCopyrightTextView by bind<TextView>(R.id.staticMapCopyrightTextView)
} }
} }

3
vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
View File

@ -25,7 +25,6 @@ import org.matrix.android.sdk.api.session.Session
import javax.inject.Inject import javax.inject.Inject
class UrlMapProvider @Inject constructor( class UrlMapProvider @Inject constructor(
private val localeProvider: LocaleProvider,
private val session: Session, private val session: Session,
private val rawService: RawService private val rawService: RawService
) { ) {
@ -63,7 +62,7 @@ class UrlMapProvider @Inject constructor(
append(".png") append(".png")
append(keyParam) append(keyParam)
// Since the default copyright font is too small we put a custom one on map // Since the default copyright font is too small we put a custom one on map
append("&attribution=0") append("&attribution=false")
} }
} }
} }

2
vector/src/main/res/layout/item_timeline_event_location_stub.xml
View File

@ -63,7 +63,7 @@
app:layout_constraintGuide_percent="0.5" /> app:layout_constraintGuide_percent="0.5" />
<TextView <TextView
android:id="@+id/mapCopyrightTextView" android:id="@+id/staticMapCopyrightTextView"
style="@style/Widget.Vector.TextView.Nano.Copyright" style="@style/Widget.Vector.TextView.Nano.Copyright"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
vector/src/main/res/values/donottranslate.xml
View File

@ -42,4 +42,6 @@
<string name="ftue_auth_email_verification_subtitle">To confirm your email address, tap the button in the email we just sent to %s</string> <string name="ftue_auth_email_verification_subtitle">To confirm your email address, tap the button in the email we just sent to %s</string>
<string name="ftue_auth_email_verification_footer">Did not receive an email?</string> <string name="ftue_auth_email_verification_footer">Did not receive an email?</string>
<string name="ftue_auth_email_resend_email">Resend email</string> <string name="ftue_auth_email_resend_email">Resend email</string>
<string name="location_map_view_copyright">© MapTiler © OpenStreetMap contributors</string>
</resources> </resources>

1
vector/src/main/res/values/strings.xml
View File

@ -3036,7 +3036,6 @@
<string name="labs_enable_live_location_summary">Temporary implementation: locations persist in room history</string> <string name="labs_enable_live_location_summary">Temporary implementation: locations persist in room history</string>
<string name="live_location_bottom_sheet_stop_sharing">Stop sharing</string> <string name="live_location_bottom_sheet_stop_sharing">Stop sharing</string>
<string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string> <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
<string name="location_map_view_copyright">© MapTiler © OpenStreetMap contributors</string>
<string name="message_bubbles">Show Message bubbles</string> <string name="message_bubbles">Show Message bubbles</string>