Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

improved OSM cache dir

This commit is contained in:
Mariotaku Lee 2017-10-09 13:30:25 +08:00
parent d98c25c453
commit dad191dadd
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
5 changed files with 80 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
twidere/src/fdroid/kotlin/org/mariotaku/twidere/fragment/OpenStreetMapViewerFragment.kt
View File

@ -19,20 +19,26 @@
package org.mariotaku.twidere.fragment
import android.content.Context
import android.graphics.Point
import android.graphics.drawable.Drawable
import android.os.Bundle
import android.support.v4.content.res.ResourcesCompat
import android.view.*
import kotlinx.android.synthetic.fdroid.activity_osm_viewer.*
import org.mariotaku.ktextension.preferExternalCacheDir
import org.mariotaku.twidere.Constants
import org.mariotaku.twidere.R
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_LATITUDE
import org.mariotaku.twidere.constant.IntentConstants.EXTRA_LONGITUDE
import org.mariotaku.twidere.util.DebugLog
import org.osmdroid.api.IMapView
import org.osmdroid.config.Configuration
import org.osmdroid.tileprovider.tilesource.TileSourceFactory
import org.osmdroid.util.GeoPoint
import org.osmdroid.views.overlay.ItemizedOverlay
import org.osmdroid.views.overlay.OverlayItem
import java.io.File
import java.util.*
class OpenStreetMapViewerFragment : BaseFragment(), Constants {
@ -52,6 +58,7 @@ class OpenStreetMapViewerFragment : BaseFragment(), Constants {
}
this.latitude = latitude
this.longitude = longitude
mapView.setTileSource(TileSourceFactory.MAPNIK)
mapView.setMultiTouchControls(true)
mapView.setBuiltInZoomControls(true)
mapView.isTilesScaledToDpi = true
@ -70,6 +77,21 @@ class OpenStreetMapViewerFragment : BaseFragment(), Constants {
return inflater.inflate(R.layout.activity_osm_viewer, container, false)
}
override fun onAttach(context: Context) {
super.onAttach(context)
Configuration.getInstance().apply {
try {
osmdroidBasePath = File(context.preferExternalCacheDir, "osmdroid")
osmdroidTileCache = File(osmdroidBasePath, "tiles")
osmdroidBasePath.mkdirs()
osmdroidTileCache.mkdirs()
} catch (e: Exception) {
DebugLog.w(tr = e)
}
}
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.menu_osm_viewer, menu)
}

1
twidere/src/fdroid/res/layout/activity_osm_viewer.xml
View File

@ -23,7 +23,6 @@
<org.osmdroid.views.MapView
android:id="@+id/mapView"
tilesource="Mapnik"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</FrameLayout>

6
twidere/src/main/kotlin/org/mariotaku/ktextension/ContextExtensions.kt
View File

@ -4,6 +4,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.pm.PackageManager
import android.support.v4.content.ContextCompat
import java.io.File
/**
* Created by mariotaku on 2016/12/13.
@ -25,4 +26,7 @@ fun Context.unregisterReceiverSafe(receiver: BroadcastReceiver?): Boolean {
} catch (e: IllegalArgumentException) {
return false
}
}
}
val Context.preferExternalCacheDir: File
get() = externalCacheDir ?: cacheDir

78
twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt
View File

@ -208,8 +208,8 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
quotedNameView.visibility = View.VISIBLE
quotedTextView.visibility = View.VISIBLE
val quoted_user_key = status.quoted_user_key!!
quotedNameView.name = colorNameManager.getUserNickname(quoted_user_key,
val quotedUserKey = status.quoted_user_key!!
quotedNameView.name = colorNameManager.getUserNickname(quotedUserKey,
status.quoted_user_name)
quotedNameView.screenName = "@${status.quoted_user_acct}"
@ -231,9 +231,9 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
}
quotedTextView.hideIfEmpty()
val quoted_user_color = colorNameManager.getUserColor(quoted_user_key)
if (quoted_user_color != 0) {
quotedView.drawStart(quoted_user_color)
val quotedUserColor = colorNameManager.getUserColor(quotedUserKey)
if (quotedUserColor != 0) {
quotedView.drawStart(quotedUserColor)
} else {
quotedView.drawStart(ThemeUtils.getColorFromAttribute(context,
R.attr.quoteIndicatorBackgroundColor))
@ -275,12 +275,10 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
if (status.is_retweet) {
val retweetUserColor = colorNameManager.getUserColor(status.retweeted_by_user_key!!)
if (retweetUserColor == 0) {
itemContent.drawStart(userColor)
} else if (userColor == 0) {
itemContent.drawStart(retweetUserColor)
} else {
itemContent.drawStart(retweetUserColor, userColor)
when {
retweetUserColor == 0 -> itemContent.drawStart(userColor)
userColor == 0 -> itemContent.drawStart(retweetUserColor)
else -> itemContent.drawStart(retweetUserColor, userColor)
}
} else {
itemContent.drawStart(userColor)
@ -605,31 +603,43 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
private fun TextView.displayMediaLabel(cardName: String?, media: Array<ParcelableMedia?>?,
location: ParcelableLocation?, placeFullName: String?, sensitive: Boolean): Boolean {
var result = false
if (media != null && media.isNotEmpty()) {
if (sensitive) {
setLabelIcon(R.drawable.ic_label_warning)
setText(R.string.label_sensitive_content)
} else when {
media.type in videoTypes -> {
setLabelIcon(R.drawable.ic_label_video)
setText(R.string.label_video)
}
media.size > 1 -> {
setLabelIcon(R.drawable.ic_label_gallery)
setText(R.string.label_photos)
}
else -> {
setLabelIcon(R.drawable.ic_label_gallery)
setText(R.string.label_photo)
when {
media != null && media.isNotEmpty() -> {
when {
sensitive -> {
setLabelIcon(R.drawable.ic_label_warning)
setText(R.string.label_sensitive_content)
}
media.type in videoTypes -> {
setLabelIcon(R.drawable.ic_label_video)
setText(R.string.label_video)
}
media.size > 1 -> {
setLabelIcon(R.drawable.ic_label_gallery)
setText(R.string.label_photos)
}
else -> {
setLabelIcon(R.drawable.ic_label_gallery)
setText(R.string.label_photo)
}
}
result = true
}
result = true
} else if (cardName != null) {
if (cardName.startsWith("poll")) {
cardName != null -> if (cardName.startsWith("poll")) {
setLabelIcon(R.drawable.ic_label_poll)
setText(R.string.label_poll)
result = true
}
// placeFullName != null -> {
// setLabelIcon(R.drawable.ic_label_location)
// text = placeFullName
// result = true
// }
// location != null -> {
// setLabelIcon(R.drawable.ic_label_location)
// setText(R.string.action_view_map)
// result = true
// }
}
refreshDrawableState()
return result
@ -646,14 +656,6 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
return 0
}
private fun hasVideo(media: Array<ParcelableMedia?>?): Boolean {
if (media == null) return false
return media.any { item ->
if (item == null) return@any false
return@any videoTypes.contains(item.type)
}
}
internal class EventListener(holder: StatusViewHolder) : OnClickListener, OnLongClickListener {
private val holderRef = WeakReference(holder)

13
twidere/src/main/svg/drawable/ic_label_location-mdpi.svg Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
<title>ic_label_location-mdpi</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Action-Icons" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="ic_label_location-mdpi">
<polygon id="Shape" points="2 2 22 2 22 22 2 22"></polygon>
<path d="M11.95,4 C8.6605,4 6,6.6605 6,9.95 C6,14.4125 11.95,21 11.95,21 C11.95,21 17.9,14.4125 17.9,9.95 C17.9,6.6605 15.2395,4 11.95,4 L11.95,4 L11.95,4 Z M11.95,12.075 C10.777,12.075 9.825,11.123 9.825,9.95 C9.825,8.777 10.777,7.825 11.95,7.825 C13.123,7.825 14.075,8.777 14.075,9.95 C14.075,11.123 13.123,12.075 11.95,12.075 L11.95,12.075 L11.95,12.075 Z" id="Shape" fill="#FFFFFF"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1000 B