Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tuskyapp/develop'

This commit is contained in:
kyori19 2020-02-12 12:16:30 +09:00
parent 4f0f4d8bfb 6f8e8a6d5c
commit fbb1c5aee6
176 changed files with 672 additions and 866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@ -114,11 +114,10 @@ repositories {
// if libraries are changed here, they should also be changed in LicenseActivity
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "androidx.core:core-ktx:1.2.0-rc01"
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "androidx.appcompat:appcompat:1.2.0-alpha02"
implementation "androidx.fragment:fragment-ktx:1.1.0"
implementation "androidx.browser:browser:1.2.0"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
@ -174,23 +173,18 @@ dependencies {
}
implementation "com.mikepenz:google-material-typeface:3.0.1.3.original@aar"
implementation("com.theartofdev.edmodo:android-image-cropper:2.8.0") {
exclude group: "com.android.support"
}
implementation "com.theartofdev.edmodo:android-image-cropper:2.8.0"
implementation "com.evernote:android-job:1.4.2"
implementation "de.c1710:filemojicompat:1.0.17"
testImplementation "androidx.test.ext:junit:1.1.1"
testImplementation "org.robolectric:robolectric:4.3.1"
testImplementation "org.mockito:mockito-inline:3.2.4"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1", {
exclude group: "com.android.support", module: "support-annotations"
})
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
androidTestImplementation "android.arch.persistence.room:testing:1.1.1"
androidTestImplementation "androidx.test.ext:junit:1.1.1"

5
app/proguard-rules.pro vendored
View File

@ -35,11 +35,6 @@
-keepclassmembers class **.R$* {
public static <fields>;
}
# The support library contains references to newer platform versions.
# Don't warn about those in case this app is linking against an older
# platform version. We know about them, and they are safe.
-dontwarn android.support.**
# TUSKY SPECIFIC OPTIONS

25
app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
View File

@ -19,13 +19,14 @@ import android.animation.ArgbEvaluator
import android.content.Context
import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.*
import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
import androidx.annotation.Px
import androidx.appcompat.app.AlertDialog
@ -239,9 +240,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
setDisplayShowTitleEnabled(false)
}
ThemeUtils.setDrawableTint(this, accountToolbar.navigationIcon, R.attr.account_toolbar_icon_tint_uncollapsed)
ThemeUtils.setDrawableTint(this, accountToolbar.overflowIcon, R.attr.account_toolbar_icon_tint_uncollapsed)
val appBarElevation = resources.getDimension(R.dimen.actionbar_elevation)
val toolbarBackground = MaterialShapeDrawable.createWithElevationOverlay(this, appBarElevation)
@ -262,9 +260,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
// Add a listener to change the toolbar icon color when it enters/exits its collapsed state.
accountAppBarLayout.addOnOffsetChangedListener(object : AppBarLayout.OnOffsetChangedListener {
@AttrRes
var priorAttribute = R.attr.account_toolbar_icon_tint_uncollapsed
override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
if (verticalOffset == oldOffset) {
@ -272,20 +267,10 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
}
oldOffset = verticalOffset
@AttrRes val attribute = if (titleVisibleHeight + verticalOffset < 0) {
if (titleVisibleHeight + verticalOffset < 0) {
supportActionBar?.setDisplayShowTitleEnabled(true)
R.attr.account_toolbar_icon_tint_collapsed
} else {
supportActionBar?.setDisplayShowTitleEnabled(false)
R.attr.account_toolbar_icon_tint_uncollapsed
}
if (attribute != priorAttribute) {
priorAttribute = attribute
val context = accountToolbar.context
ThemeUtils.setDrawableTint(context, accountToolbar.navigationIcon, attribute)
ThemeUtils.setDrawableTint(context, accountToolbar.overflowIcon, attribute)
}
if (hideFab && !viewModel.isSelf && !blocking) {
@ -473,7 +458,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
loadAvatar(movedAccount.avatar, accountMovedAvatar, avatarRadius, animateAvatar)
accountMovedText.text = getString(R.string.account_moved_description, movedAccount.displayName)
accountMovedText.text = getString(R.string.account_moved_description, movedAccount.name)
// this is necessary because API 19 can't handle vector compound drawables
val movedIcon = ContextCompat.getDrawable(this, R.drawable.ic_briefcase)?.mutate()

2
app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
View File

@ -76,7 +76,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
/* set the taskdescription programmatically, the theme would turn it blue */
String appName = getString(R.string.app_name);
Bitmap appIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
int recentsBackgroundColor = ThemeUtils.getColor(this, R.attr.recents_background_color);
int recentsBackgroundColor = ThemeUtils.getColor(this, R.attr.colorSurface);
setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, recentsBackgroundColor));

2
app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt
View File

@ -338,7 +338,7 @@ class LoginActivity : BaseActivity(), Injectable {
private fun openInCustomTab(uri: Uri, context: Context): Boolean {
val toolbarColor = ThemeUtils.getColor(context, R.attr.custom_tab_toolbar)
val toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface)
val customTabsIntentBuilder = CustomTabsIntent.Builder()
.setToolbarColor(toolbarColor)

2
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View File

@ -425,7 +425,7 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
ImageView background = headerResult.getHeaderBackgroundView();
background.setColorFilter(ContextCompat.getColor(this, R.color.header_background_filter));
background.setBackgroundColor(ContextCompat.getColor(this, R.color.window_background_dark));
background.setBackgroundColor(ContextCompat.getColor(this, R.color.tusky_grey_10));
final boolean animateAvatars = PreferenceManager.getDefaultSharedPreferences(this)
.getBoolean("animateGifAvatars", false);

2
app/src/main/java/com/keylesspalace/tusky/TabData.kt
View File

@ -44,7 +44,7 @@ fun createTabDataFromId(id: String, arguments: List<String> = emptyList()): TabD
NOTIFICATIONS -> TabData(NOTIFICATIONS, R.string.title_notifications, R.drawable.ic_notifications_24dp, { NotificationsFragment.newInstance() })
LOCAL -> TabData(LOCAL, R.string.title_public_local, R.drawable.ic_local_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_LOCAL) })
FEDERATED -> TabData(FEDERATED, R.string.title_public_federated, R.drawable.ic_public_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_FEDERATED) })
DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.reblog_direct_dark, { ConversationsFragment.newInstance() })
DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.ic_reblog_direct_24dp, { ConversationsFragment.newInstance() })
HASHTAG -> TabData(HASHTAG, R.string.hashtag, R.drawable.ic_hashtag, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.TAG, args.getOrNull(0).orEmpty()) }, arguments)
LIST -> TabData(LIST, R.string.list, R.drawable.ic_list, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.LIST, args.getOrNull(0).orEmpty()) }, arguments)
else -> throw IllegalArgumentException("unknown tab type")

1
app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
View File

@ -41,7 +41,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_tab_preference.*
import kotlinx.android.synthetic.main.toolbar_basic.*
import kotlinx.android.synthetic.main.item_tab_preference.view.removeButton
import java.util.regex.Pattern
import javax.inject.Inject

15
app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt
View File

@ -27,19 +27,16 @@ import kotlinx.android.synthetic.main.item_picker_list.view.*
class ListSelectionAdapter(context: Context) : ArrayAdapter<MastoList>(context, R.layout.item_autocomplete_hashtag) {
override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
var view = convertView
if (convertView == null) {
val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
view = layoutInflater.inflate(R.layout.item_picker_list, parent, false)
}
view!!
val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val list = getItem(position)
if (list != null) {
val view = convertView
?: layoutInflater.inflate(R.layout.item_picker_list, parent, false)
getItem(position)?.let { list ->
val title = view.title
title.text = list.title
val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, android.R.attr.textColorTertiary)
val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, R.attr.iconColor)
title.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null)
}

2
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View File

@ -570,7 +570,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
contentCollapseButton.setOnClickListener(view -> {
int position = getAdapterPosition();
if (position != RecyclerView.NO_POSITION && notificationActionListener != null) {
notificationActionListener.onNotificationContentCollapsedChange(statusViewData.isCollapsed(), position);
notificationActionListener.onNotificationContentCollapsedChange(!statusViewData.isCollapsed(), position);
}
});

43
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -1,8 +1,6 @@
package com.keylesspalace.tusky.adapter;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.PorterDuff;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
@ -164,10 +162,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
this.avatarRadius36dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_36dp);
this.avatarRadius24dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_24dp);
mediaPreviewUnloaded = itemView.getContext().getDrawable(
ThemeUtils.getDrawableId(itemView.getContext(),
R.attr.media_preview_unloaded_drawable, android.R.color.black)
);
mediaPreviewUnloaded = new ColorDrawable(ThemeUtils.getColor(itemView.getContext(), R.attr.colorBackgroundAccent));
}
protected abstract int getMediaPreviewHeight(Context context);
@ -363,7 +358,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
visibilityIcon = R.drawable.ic_lock_outline_24dp;
break;
case UNLEAKABLE:
visibilityIcon = R.drawable.ic_unleakable_24dp;
visibilityIcon = R.drawable.ic_low_vision_24dp;
break;
case DIRECT:
visibilityIcon = R.drawable.ic_email_24dp;
@ -415,16 +410,13 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
int inactiveId;
int activeId;
if (visibility == Status.Visibility.PRIVATE) {
inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_disabled_private_drawable, R.drawable.reblog_private_dark);
activeId = R.drawable.reblog_private_active;
inactiveId = R.drawable.ic_reblog_private_24dp;
activeId = R.drawable.ic_reblog_private_active_24dp;
} else if (visibility == Status.Visibility.UNLEAKABLE) {
inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_disabled_unleakable_drawable, R.drawable.reblog_unleakable_dark);
activeId = R.drawable.reblog_unleakable_active;
inactiveId = R.drawable.ic_reblog_unleakable_24dp;
activeId = R.drawable.ic_reblog_unleakable_active_24dp;
} else {
inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_inactive_drawable, R.drawable.reblog_inactive_dark);
inactiveId = R.drawable.ic_reblog_24dp;
activeId = R.drawable.ic_reblog_active_24dp;
}
reblogButton.setInactiveImage(inactiveId);
@ -432,11 +424,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} else {
int disabledId;
if (visibility == Status.Visibility.DIRECT) {
disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_direct_drawable, R.drawable.reblog_direct_dark);
disabledId = R.drawable.ic_reblog_direct_24dp;
} else {
disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(),
R.attr.status_reblog_disabled_private_drawable, R.drawable.reblog_private_dark);
disabledId = R.drawable.ic_reblog_private_24dp;
}
reblogButton.setInactiveImage(disabledId);
reblogButton.setActiveImage(disabledId);
@ -447,17 +437,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
quoteButton.setEnabled(enabled && visibility != Status.Visibility.PRIVATE && visibility != Status.Visibility.UNLEAKABLE);
if (enabled && visibility != Status.Visibility.PRIVATE && visibility != Status.Visibility.UNLEAKABLE) {
int activeId;
activeId = ThemeUtils.getDrawableId(quoteButton.getContext(),
R.attr.status_quote_drawable, R.drawable.ic_quote_24dp);
quoteButton.setImageResource(activeId);
quoteButton.setImageResource(R.drawable.ic_quote_24dp);
} else {
Resources res = quoteButton.getContext().getResources();
Drawable disableIcon = res.getDrawable(R.drawable.ic_quote_disabled_24dp);
if (disableIcon != null) {
disableIcon.setColorFilter(res.getColor(R.color.status_reblog_button_disabled_dark), PorterDuff.Mode.DST_IN);
}
quoteButton.setImageDrawable(disableIcon);
quoteButton.setImageResource(R.drawable.ic_quote_disabled_24dp);
}
}
@ -561,8 +543,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
BitmapDrawable blurhashBitmap = decodeBlurHash(attachment.getBlurhash());
imageView.setImageDrawable(blurhashBitmap);
} else {
imageView.setImageDrawable(new ColorDrawable(ThemeUtils.getColor(
context, R.attr.sensitive_media_warning_background_color)));
imageView.setImageDrawable(mediaPreviewUnloaded);
}
}

2
app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt
View File

@ -88,7 +88,7 @@ class TabAdapter(private var data: List<TabData>,
ThemeUtils.setDrawableTint(
holder.itemView.context,
holder.itemView.removeButton.drawable,
(if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.image_button_disabled_tint)
(if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.textColorDisabled)
)
}

24
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
View File

@ -43,7 +43,6 @@ import androidx.annotation.ColorInt
import androidx.annotation.StringRes
import androidx.annotation.VisibleForTesting
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
@ -120,6 +119,8 @@ class ComposeActivity : BaseActivity(),
private var composeOptions: ComposeOptions? = null
private lateinit var viewModel: ComposeViewModel
private var mediaCount = 0
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val preferences = PreferenceManager.getDefaultSharedPreferences(this)
@ -356,9 +357,12 @@ class ComposeActivity : BaseActivity(),
setStatusVisibility(visibility)
}
viewModel.media.observe { media ->
composeMediaPreviewBar.visible(media.isNotEmpty())
mediaAdapter.submitList(media)
updateSensitiveMediaToggle(viewModel.markMediaAsSensitive.value != false, viewModel.showContentWarning.value != false)
if(media.size != mediaCount) {
mediaCount = media.size
composeMediaPreviewBar.visible(media.isNotEmpty())
updateSensitiveMediaToggle(viewModel.markMediaAsSensitive.value != false, viewModel.showContentWarning.value != false)
}
}
viewModel.poll.observe { poll ->
pollPreview.visible(poll != null)
@ -453,9 +457,7 @@ class ComposeActivity : BaseActivity(),
title = null
setDisplayHomeAsUpEnabled(true)
setDisplayShowHomeEnabled(true)
val closeIcon = AppCompatResources.getDrawable(this@ComposeActivity, R.drawable.ic_close_24dp)
ThemeUtils.setDrawableTint(this@ComposeActivity, closeIcon!!, R.attr.compose_close_button_tint)
setHomeAsUpIndicator(closeIcon)
setHomeAsUpIndicator(R.drawable.ic_close_24dp)
}
}
@ -564,8 +566,6 @@ class ComposeActivity : BaseActivity(),
}
private fun updateSensitiveMediaToggle(markMediaSensitive: Boolean, contentWarningShown: Boolean) {
TransitionManager.beginDelayedTransition(composeHideMediaButton.parent as ViewGroup)
if (viewModel.media.value.isNullOrEmpty()) {
composeHideMediaButton.hide()
} else {
@ -573,7 +573,7 @@ class ComposeActivity : BaseActivity(),
@ColorInt val color = if (contentWarningShown) {
composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp)
composeHideMediaButton.isClickable = false
ContextCompat.getColor(this, R.color.compose_media_visible_button_disabled_blue)
ContextCompat.getColor(this, R.color.transparent_tusky_blue)
} else {
composeHideMediaButton.isClickable = true
@ -616,7 +616,7 @@ class ComposeActivity : BaseActivity(),
Status.Visibility.PRIVATE -> R.drawable.ic_lock_outline_24dp
Status.Visibility.DIRECT -> R.drawable.ic_email_24dp
Status.Visibility.UNLISTED -> R.drawable.ic_lock_open_24dp
Status.Visibility.UNLEAKABLE -> R.drawable.ic_unleakable_24dp
Status.Visibility.UNLEAKABLE -> R.drawable.ic_low_vision_24dp
else -> R.drawable.ic_lock_open_24dp
}
val drawable = ThemeUtils.getTintedDrawable(this, iconRes, android.R.attr.textColorTertiary)
@ -901,14 +901,14 @@ class ComposeActivity : BaseActivity(),
button.isEnabled = clickable
ThemeUtils.setDrawableTint(this, button.drawable,
if (colorActive) android.R.attr.textColorTertiary
else R.attr.image_button_disabled_tint)
else R.attr.textColorDisabled)
}
private fun enablePollButton(enable: Boolean) {
addPollTextActionTextView.isEnabled = enable
val textColor = ThemeUtils.getColor(this,
if (enable) android.R.attr.textColorTertiary
else R.attr.image_button_disabled_tint)
else R.attr.textColorDisabled)
addPollTextActionTextView.setTextColor(textColor)
addPollTextActionTextView.compoundDrawablesRelative[0].colorFilter = PorterDuffColorFilter(textColor, PorterDuff.Mode.SRC_IN)
}

2
app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
View File

@ -64,7 +64,7 @@ class ComposeViewModel
private var quoteUrl: String? = null
private var startingVisibility: Status.Visibility = Status.Visibility.UNKNOWN
private val instance: MutableLiveData<InstanceEntity?> = MutableLiveData()
private val instance: MutableLiveData<InstanceEntity?> = MutableLiveData(null)
val instanceParams: LiveData<ComposeInstanceParams> = instance.map { instance ->
ComposeInstanceParams(

5
app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/CaptionDialog.kt
View File

@ -50,7 +50,10 @@ fun <T> T.makeCaptionDialog(existingDescription: String?,
dialogLayout.setPadding(padding, padding, padding, padding)
dialogLayout.orientation = LinearLayout.VERTICAL
val imageView = PhotoView(this)
val imageView = PhotoView(this).apply {
// If it seems a lot, try opening an image of A4 format or similar
maximumScale = 6.0f
}
val displayMetrics = DisplayMetrics()
windowManager.defaultDisplay.getMetrics(displayMetrics)

2
app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeOptionsView.kt
View File

@ -34,7 +34,7 @@ class ComposeOptionsView @JvmOverloads constructor(context: Context, attrs: Attr
publicRadioButton.setButtonDrawable(R.drawable.ic_public_24dp)
unlistedRadioButton.setButtonDrawable(R.drawable.ic_lock_open_24dp)
privateRadioButton.setButtonDrawable(R.drawable.ic_lock_outline_24dp)
unleakableRadioButton.setButtonDrawable(R.drawable.ic_unleakable_24dp)
unleakableRadioButton.setButtonDrawable(R.drawable.ic_low_vision_24dp)
directRadioButton.setButtonDrawable(R.drawable.ic_email_24dp)
visibilityRadioGroup.setOnCheckedChangeListener { _, checkedId ->

4
app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java
View File

@ -66,7 +66,7 @@ public final class ProgressImageView extends AppCompatImageView {
markBgPaint.setStyle(Paint.Style.FILL);
markBgPaint.setColor(ContextCompat.getColor(getContext(),
R.color.description_marker_unselected));
R.color.tusky_grey_10));
captionDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.spellcheck);
}
@ -82,7 +82,7 @@ public final class ProgressImageView extends AppCompatImageView {
public void setChecked(boolean checked) {
this.markBgPaint.setColor(ContextCompat.getColor(getContext(),
checked ? R.color.tusky_blue : R.color.description_marker_unselected));
checked ? R.color.tusky_blue : R.color.tusky_grey_10));
invalidate();
}

2
app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
View File

@ -167,7 +167,7 @@ fun Account.toEntity() =
ConversationAccountEntity(
id,
username,
displayName,
displayName.orEmpty(),
avatar,
emojis ?: emptyList()
)

5
app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt
View File

@ -60,14 +60,11 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
setSupportActionBar(toolbar)
val closeIcon = AppCompatResources.getDrawable(this, R.drawable.ic_close_24dp)
ThemeUtils.setDrawableTint(this, closeIcon!!, R.attr.compose_close_button_tint)
supportActionBar?.apply {
title = getString(R.string.report_username_format, viewModel.accountUserName)
setDisplayHomeAsUpEnabled(true)
setDisplayShowHomeEnabled(true)
setHomeAsUpIndicator(closeIcon)
setHomeAsUpIndicator(R.drawable.ic_close_24dp)
}
initViewPager()

14
app/src/main/java/com/keylesspalace/tusky/components/search/adapter/SearchDataSource.kt
View File

@ -62,7 +62,7 @@ class SearchDataSource<T>(
resolve = true,
limit = params.requestedLoadSize,
offset = 0,
following =false)
following = false)
.subscribe(
{ data ->
val res = parser(data)
@ -84,10 +84,16 @@ class SearchDataSource<T>(
override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<T>) {
networkState.postValue(NetworkState.LOADING)
retry = null
if(source.exhausted) {
if (source.exhausted) {
return callback.onResult(emptyList())
}
mastodonApi.searchObservable(searchType.apiParameter, searchRequest, true, params.loadSize, params.startPosition, false)
mastodonApi.searchObservable(
query = searchRequest,
type = searchType.apiParameter,
resolve = true,
limit = params.loadSize,
offset = params.startPosition,
following = false)
.subscribe(
{ data ->
// Working around Mastodon bug where exact match is returned no matter
@ -101,7 +107,7 @@ class SearchDataSource<T>(
} else {
parser(data)
}
if(res.isEmpty()) {
if (res.isEmpty()) {
source.exhausted = true
}
callback.onResult(res)

4
app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
View File

@ -31,7 +31,7 @@ data class Account(
val id: String,
@SerializedName("username") val localUsername: String,
@SerializedName("acct", alternate = ["subject"]) val username: String,
@SerializedName("display_name") val displayName: String = "",
@SerializedName("display_name") val displayName: String?, // should never be null per Api definition, but some servers break the contract
val note: @WriteWith<SpannedParceler>() Spanned,
val url: String,
val avatar: String,
@ -50,7 +50,7 @@ data class Account(
) : Parcelable {
val name: String
get() = notestockUsername ?: if (displayName.isEmpty()) {
get() = notestockUsername ?: if (displayName.isNullOrEmpty()) {
localUsername
} else displayName

7
app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt
View File

@ -23,7 +23,6 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.core.app.ActivityOptionsCompat
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
@ -179,15 +178,11 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable {
val columnCount = view.context.resources.getInteger(R.integer.profile_media_column_count)
val layoutManager = GridLayoutManager(view.context, columnCount)
val bgRes = ThemeUtils.getColorId(view.context, R.attr.window_background)
adapter.baseItemColor = ContextCompat.getColor(recyclerView.context, bgRes)
adapter.baseItemColor = ThemeUtils.getColor(view.context, android.R.attr.windowBackground)
recyclerView.layoutManager = layoutManager
recyclerView.adapter = adapter
if (isSwipeToRefreshEnabled) {
swipeRefreshLayout.setOnRefreshListener {
refresh()

12
app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt
View File

@ -92,9 +92,9 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
publicFiltersPreference = requirePreference("publicFilters")
threadFiltersPreference = requirePreference("threadFilters")
notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).sizePx(iconSize).color(ThemeUtils.getColor(notificationPreference.context, R.attr.preference_icon_tint))
notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).sizePx(iconSize).color(ThemeUtils.getColor(notificationPreference.context, R.attr.iconColor))
mutedUsersPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp)
blockedUsersPreference.icon = IconicsDrawable(blockedUsersPreference.context, GoogleMaterial.Icon.gmd_block).sizePx(iconSize).color(ThemeUtils.getColor(blockedUsersPreference.context, R.attr.preference_icon_tint))
blockedUsersPreference.icon = IconicsDrawable(blockedUsersPreference.context, GoogleMaterial.Icon.gmd_block).sizePx(iconSize).color(ThemeUtils.getColor(blockedUsersPreference.context, R.attr.iconColor))
mutedDomainsPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp)
notificationPreference.onPreferenceClickListener = this
@ -288,9 +288,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
}
private fun getTintedIcon(iconId: Int): Drawable? {
val drawable = context?.getDrawable(iconId)
ThemeUtils.setDrawableTint(context, drawable, R.attr.preference_icon_tint)
return drawable
return ThemeUtils.getTintedDrawable(requireContext(), iconId, R.attr.iconColor)
}
private fun launchFilterActivity(filterContext: String, titleResource: Int): Boolean {
@ -303,9 +301,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(),
}
companion object {
fun newInstance(): AccountPreferencesFragment {
return AccountPreferencesFragment()
}
fun newInstance() = AccountPreferencesFragment()
}
}

13
app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt
View File

@ -40,13 +40,13 @@ class PreferencesFragment : PreferenceFragmentCompat() {
addPreferencesFromResource(R.xml.preferences)
val themePreference: Preference = requirePreference("appTheme")
themePreference.icon = IconicsDrawable(themePreference.context, GoogleMaterial.Icon.gmd_palette).sizePx(iconSize).color(ThemeUtils.getColor(themePreference.context, R.attr.preference_icon_tint))
themePreference.icon = IconicsDrawable(themePreference.context, GoogleMaterial.Icon.gmd_palette).sizePx(iconSize).color(ThemeUtils.getColor(themePreference.context, R.attr.iconColor))
val emojiPreference: Preference = requirePreference("emojiCompat")
emojiPreference.icon = IconicsDrawable(emojiPreference.context, GoogleMaterial.Icon.gmd_sentiment_satisfied).sizePx(iconSize).color(ThemeUtils.getColor(emojiPreference.context, R.attr.preference_icon_tint))
emojiPreference.icon = IconicsDrawable(emojiPreference.context, GoogleMaterial.Icon.gmd_sentiment_satisfied).sizePx(iconSize).color(ThemeUtils.getColor(emojiPreference.context, R.attr.iconColor))
val textSizePreference: Preference = requirePreference("statusTextSize")
textSizePreference.icon = IconicsDrawable(textSizePreference.context, GoogleMaterial.Icon.gmd_format_size).sizePx(iconSize).color(ThemeUtils.getColor(textSizePreference.context, R.attr.preference_icon_tint))
textSizePreference.icon = IconicsDrawable(textSizePreference.context, GoogleMaterial.Icon.gmd_format_size).sizePx(iconSize).color(ThemeUtils.getColor(textSizePreference.context, R.attr.iconColor))
val timelineFilterPreferences: Preference = requirePreference("timelineFilterPreferences")
timelineFilterPreferences.setOnPreferenceClickListener {
@ -69,12 +69,11 @@ class PreferencesFragment : PreferenceFragmentCompat() {
}
val languagePreference: Preference = requirePreference("language")
languagePreference.icon = IconicsDrawable(languagePreference.context, GoogleMaterial.Icon.gmd_translate).sizePx(iconSize).color(ThemeUtils.getColor(languagePreference.context, R.attr.preference_icon_tint))
languagePreference.icon = IconicsDrawable(languagePreference.context, GoogleMaterial.Icon.gmd_translate).sizePx(iconSize).color(ThemeUtils.getColor(languagePreference.context, R.attr.iconColor))
val botIndicatorPreference = requirePreference("showBotOverlay")
val botDrawable = botIndicatorPreference.context.getDrawable(R.drawable.ic_bot_24dp)
ThemeUtils.setDrawableTint(context, botDrawable, R.attr.preference_icon_tint)
botIndicatorPreference.icon = botDrawable
botIndicatorPreference.icon = ThemeUtils.getTintedDrawable(requireContext(), R.drawable.ic_bot_24dp, R.attr.iconColor)
updateStackTracePreference()
}

2
app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
View File

@ -313,7 +313,7 @@ fun Account.toEntity(accountId: Long, gson: Gson): TimelineAccountEntity {
timelineUserId = accountId,
localUsername = localUsername,
username = username,
displayName = displayName,
displayName = displayName.orEmpty(),
url = url,
avatar = avatar,
emojis = gson.toJson(emojis),

2
app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java
View File

@ -236,7 +236,7 @@ public class LinkHelper {
* @param context context
*/
public static void openLinkInCustomTab(Uri uri, Context context) {
int toolbarColor = ThemeUtils.getColor(context, R.attr.custom_tab_toolbar);
int toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface);
CustomTabsIntent.Builder customTabsIntentBuilder = new CustomTabsIntent.Builder()
.setToolbarColor(toolbarColor)

7
app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
View File

@ -24,6 +24,7 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.annotation.DrawableRes
import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat
import com.bumptech.glide.Glide
import com.keylesspalace.tusky.R
import com.keylesspalace.tusky.entity.Attachment
@ -87,8 +88,7 @@ class StatusViewHelper(private val itemView: View) {
}
val mediaPreviewUnloaded = ThemeUtils.getDrawable(context,
R.attr.media_preview_unloaded_drawable, android.R.color.black)
val mediaPreviewUnloaded = ColorDrawable(ThemeUtils.getColor(context, R.attr.colorBackgroundAccent))
val n = min(attachments.size, Status.MAX_MEDIA_ATTACHMENTS)
@ -141,8 +141,7 @@ class StatusViewHelper(private val itemView: View) {
val blurhashBitmap = decodeBlurHash(context, attachment.blurhash)
mediaPreviews[i].setImageDrawable(blurhashBitmap)
} else {
mediaPreviews[i].setImageDrawable(ColorDrawable(ThemeUtils.getColor(
context, R.attr.sensitive_media_warning_background_color)))
mediaPreviews[i].setImageDrawable(mediaPreviewUnloaded)
}
}
}

33
app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java
View File

@ -19,17 +19,14 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.provider.Settings;
import android.util.TypedValue;
import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatDelegate;
import android.util.TypedValue;
/**
* Provides runtime compatibility to obtain theme information and re-theme views, especially where
@ -45,29 +42,6 @@ public class ThemeUtils {
private static final String THEME_AUTO = "auto";
private static final String THEME_SYSTEM = "auto_system";
public static Drawable getDrawable(@NonNull Context context, @AttrRes int attribute,
@DrawableRes int fallbackDrawable) {
TypedValue value = new TypedValue();
@DrawableRes int resourceId;
if (context.getTheme().resolveAttribute(attribute, value, true)) {
resourceId = value.resourceId;
} else {
resourceId = fallbackDrawable;
}
return context.getDrawable(resourceId);
}
@DrawableRes
public static int getDrawableId(@NonNull Context context, @AttrRes int attribute,
@DrawableRes int fallbackDrawableId) {
TypedValue value = new TypedValue();
if (context.getTheme().resolveAttribute(attribute, value, true)) {
return value.resourceId;
} else {
return fallbackDrawableId;
}
}
@ColorInt
public static int getColor(@NonNull Context context, @AttrRes int attribute) {
TypedValue value = new TypedValue();
@ -78,13 +52,6 @@ public class ThemeUtils {
}
}
@ColorRes
public static int getColorId(@NonNull Context context, @AttrRes int attribute) {
TypedValue value = new TypedValue();
context.getTheme().resolveAttribute(attribute, value, true);
return value.resourceId;
}
/** this can be replaced with drawableTint in xml once minSdkVersion >= 23 */
@Nullable
public static Drawable getTintedDrawable(@NonNull Context context, @DrawableRes int drawableId, @AttrRes int colorAttr) {

5
app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.kt
View File

@ -20,15 +20,14 @@ import android.graphics.Canvas
import android.graphics.drawable.Drawable
import androidx.recyclerview.widget.RecyclerView
import android.view.View
import androidx.core.content.ContextCompat
import com.keylesspalace.tusky.R
import com.keylesspalace.tusky.adapter.ThreadAdapter
import com.keylesspalace.tusky.util.ThemeUtils
class ConversationLineItemDecoration(private val context: Context) : RecyclerView.ItemDecoration() {
private val divider: Drawable = ThemeUtils.getDrawable(context, R.attr.conversation_thread_line_drawable,
R.drawable.conversation_thread_line_dark)
private val divider: Drawable = ContextCompat.getDrawable(context, R.drawable.conversation_thread_line)!!
override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
val dividerStart = parent.paddingStart + context.resources.getDimensionPixelSize(R.dimen.status_line_margin_start)

2
app/src/main/java/com/keylesspalace/tusky/view/LicenseCard.kt
View File

@ -34,7 +34,7 @@ class LicenseCard
init {
inflate(context, R.layout.card_license, this)
setCardBackgroundColor(ThemeUtils.getColor(context, android.R.attr.colorBackground))
setCardBackgroundColor(ThemeUtils.getColor(context, R.attr.colorSurface))
val a = context.theme.obtainStyledAttributes(attrs, R.styleable.LicenseCard, 0, 0)

2
app/src/main/java/net/accelf/yuito/QuickTootHelper.java
View File

@ -267,7 +267,7 @@ public class QuickTootHelper {
visibilityButton.setImageResource(R.drawable.ic_lock_outline_24dp);
break;
case UNLEAKABLE:
visibilityButton.setImageResource(R.drawable.ic_unleakable_24dp);
visibilityButton.setImageResource(R.drawable.ic_low_vision_24dp);
break;
}
}

4
app/src/main/res/color/color_background_transparent_60.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.6" android:color="@color/colorBackground" />
</selector>

3
app/src/main/res/color/compound_button_color_dark.xml → app/src/main/res/color/compound_button_color.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false" android:color="@color/text_color_tertiary_dark"/>
<!-- attr not working here for Android 5? -->
<item android:state_checked="false" android:color="@color/textColorTertiary"/>
<item android:state_checked="true" android:color="@color/tusky_blue"/>
</selector>

5
app/src/main/res/color/compound_button_color_light.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false" android:color="@color/text_color_tertiary_light"/>
<item android:state_checked="true" android:color="@color/tusky_blue"/>
</selector>

5
app/src/main/res/drawable-night/background_dialog_activity.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
<solid android:color="@color/window_background_dark" />
</shape>

9
app/src/main/res/drawable-night/ic_emoji_34dp.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="34dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="@color/text_color_secondary_dark"
android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
</vector>

6
app/src/main/res/drawable-night/profile_badge_background.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" android:color="@color/text_color_tertiary_dark"/>
<corners android:radius="12dp"/>
<padding android:bottom="2dp" android:top="2dp" android:left="8dp" android:right="8dp"/>
</shape>

6
app/src/main/res/drawable/autocomplete_divider_dark.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:height="1dp" />
<solid android:color="@color/autocomplete_divider_dark" />
</shape>

2
app/src/main/res/drawable/avatar_border.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?attr/window_background" />
<solid android:color="?android:attr/windowBackground" />
<corners android:radius="7dp"/>
<size android:height="52dp" android:width="52dp"/>
</shape>

2
app/src/main/res/drawable/background_dialog_activity.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
<solid android:color="@color/window_background_light" />
<solid android:color="?android:attr/colorBackground" />
</shape>

5
app/src/main/res/drawable/background_dialog_activity_black.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="5dp" />
<solid android:color="@color/dialog_background_black" />
</shape>

5
app/src/main/res/drawable/border_background_dark.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="3dp" />
<stroke android:color="#ffffffff" android:width="1dp" />
</shape>

5
app/src/main/res/drawable/border_background_light.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="3dp" />
<stroke android:color="#ff000000" android:width="1dp" />
</shape>

2
app/src/main/res/drawable/card_frame.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp" />
<stroke android:color="?attr/card_background_color" android:width="1dp" />
<stroke android:color="?attr/colorBackgroundAccent" android:width="1dp" />
</shape>

2
app/src/main/res/drawable/conversation_thread_line_dark.xml → app/src/main/res/drawable/conversation_thread_line.xml
View File

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="4dp" />
<solid android:color="@color/status_divider_dark" />
<solid android:color="?attr/colorBackgroundAccent" />
</shape>

6
app/src/main/res/drawable/conversation_thread_line_light.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="4dp" />
<solid android:color="@color/status_divider_light" />
</shape>

9
app/src/main/res/drawable/favourite_active_light.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/tusky_orange_light"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>

9
app/src/main/res/drawable/favourite_inactive_dark.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/text_color_tertiary_dark"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>

10
app/src/main/res/drawable/favourite_inactive_light.xml
View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/text_color_tertiary_light"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>

0
app/src/main/res/drawable-anydpi/ic_access_time.xml → app/src/main/res/drawable/ic_access_time.xml
View File

0
app/src/main/res/drawable-anydpi/ic_arrow_drop_down.xml → app/src/main/res/drawable/ic_arrow_drop_down.xml
View File

0
app/src/main/res/drawable-anydpi/ic_arrow_drop_up.xml → app/src/main/res/drawable/ic_arrow_drop_up.xml
View File

0
app/src/main/res/drawable-anydpi/ic_arrow_upward.xml → app/src/main/res/drawable/ic_arrow_upward.xml
View File

2
app/src/main/res/drawable/ic_attach_file_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z"/>
</vector>

0
app/src/main/res/drawable/ic_cancel_black_24dp.xml → app/src/main/res/drawable/ic_cancel_24dp.xml
View File

0
app/src/main/res/drawable-anydpi/ic_chevron_left.xml → app/src/main/res/drawable/ic_chevron_left.xml
View File

0
app/src/main/res/drawable-anydpi/ic_chevron_right.xml → app/src/main/res/drawable/ic_chevron_right.xml
View File

2
app/src/main/res/drawable/ic_clear_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

2
app/src/main/res/drawable/ic_close_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="?android:attr/textColorSecondary"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

2
app/src/main/res/drawable/ic_emoji_34dp.xml
View File

@ -4,6 +4,6 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="@color/text_color_secondary_light"
android:fillColor="?android:attr/textColorSecondary"
android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
</vector>

9
app/src/main/res/drawable/ic_favourite_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="?android:attr/textColorTertiary"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
</vector>

2
app/src/main/res/drawable/favourite_active_dark.xml → app/src/main/res/drawable/ic_favourite_active_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/tusky_orange"
android:fillColor="@color/favoriteButtonActiveColor"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>

2
app/src/main/res/drawable/ic_home_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
</vector>

0
app/src/main/res/drawable-anydpi/ic_list.xml → app/src/main/res/drawable/ic_list.xml
View File

2
app/src/main/res/drawable/ic_lock_open_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" />
</vector>

2
app/src/main/res/drawable/ic_lock_outline_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z" />
</vector>

2
app/src/main/res/drawable/ic_unleakable_24dp.xml → app/src/main/res/drawable/ic_low_vision_24dp.xml
View File

@ -1,5 +1,5 @@
<vector android:height="21dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/toolbar_icon_dark"
<path android:fillColor="#fff"
android:pathData="M 22.745785,11.069479 C 20.59223,7.4149586 16.576087,4.9724689 12.000015,4.9724689 c -1.087318,0 -2.1427837,0.1382199 -3.1491684,0.3975598 L 6.8352892,2.613579 C 6.5449734,2.1988591 5.9734704,2.0979491 5.5587172,2.388229 l -0.5008816,0.35055 c -0.4147914,0.29032 -0.515701,0.8619 -0.225347,1.2766899 L 6.4798519,6.2458287 C 4.416475,7.2538186 2.5365077,8.8943779 1.2552378,11.067568 c -3.819e-4,6.5e-4 -8.785e-4,0.001 -0.0013,0.002 -0.33477406,0.56814 -0.34237474,1.28058 0,1.861561 1.470485,2.495319 3.8095874,4.425278 6.6022485,5.398738 L 3.1127846,11.553528 a 10.396291,10.396291 0 0 1 1.0806728,-1.37164 l 4.5604131,6.51521 h 3.821e-4 l 1.5518394,2.2168 a 12.606259,12.606259 0 0 0 3.015069,0.0447 L 6.0649842,8.5925279 A 10.603839,10.603839 0 0 1 7.5460491,7.768948 l 9.6187289,13.617989 c 0.290315,0.41471 0.861819,0.51558 1.276572,0.225351 l 0.500881,-0.350551 c 0.414793,-0.290319 0.515701,-0.861939 0.225347,-1.27669 l -1.646942,-2.229679 -2.67e-4,-3.4e-4 c 2.183229,-1.0686 4.004111,-2.751529 5.225377,-4.823989 a 1.8309639,1.8309639 0 0 0 3.9e-5,-1.86156 z m -6.848946,4.365968 -0.728215,-1.04004 c 0.942713,-1.243879 1.058404,-2.916259 0.33611,-4.265548 v 9.99e-4 c 0,0.9033 -0.732187,1.63549 -1.635484,1.63549 -0.910097,0 -1.635486,-0.739019 -1.635486,-1.63549 0,-0.9032891 0.732188,-1.6354791 1.635486,-1.6354791 h 0.0011 c -0.945266,-0.505901 -2.044196,-0.59734 -3.036793,-0.29319 L 10.105265,7.1618787 c 0.586896,-0.2298102 1.22589,-0.3560801 1.89475,-0.3560801 2.870769,0 5.194441,2.3232093 5.194441,5.1944394 0,1.317859 -0.49015,2.519879 -1.297617,3.435209 z"/>
</vector>

2
app/src/main/res/drawable/ic_more_horiz_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
</vector>

2
app/src/main/res/drawable/ic_notifications_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
</vector>

4
app/src/main/res/drawable/ic_play_indicator_dark.xml → app/src/main/res/drawable/ic_play_indicator.xml
View File

@ -1,8 +1,8 @@
<vector android:height="48dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#1a1c23"
<path android:fillAlpha=".85" android:fillColor="?attr/colorSurface"
android:pathData="M21.282,12A9.282,9.282 0,0 1,12 21.282,9.282 9.282,0 0,1 2.718,12 9.282,9.282 0,0 1,12 2.718,9.282 9.282,0 0,1 21.282,12Z"
android:strokeAlpha="1" android:strokeColor="#00000000"
android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="8"/>
<path android:fillAlpha="1" android:fillColor="#2b90d9" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
<path android:fillAlpha="1" android:fillColor="@color/tusky_blue" android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
</vector>

15
app/src/main/res/drawable/ic_play_indicator_light.xml
View File

@ -1,15 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:autoMirrored="true"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillAlpha="1"
android:fillColor="#ffff"
android:pathData="M21.282,12A9.282,9.282 0,0 1,12 21.282,9.282 9.282,0 0,1 2.718,12 9.282,9.282 0,0 1,12 2.718,9.282 9.282,0 0,1 21.282,12Z" />
<path
android:fillAlpha="1"
android:fillColor="#2b90d9"
android:pathData="M10,16.5l6,-4.5 -6,-4.5v9zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
</vector>

2
app/src/main/res/drawable/ic_public_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
</vector>

2
app/src/main/res/drawable/ic_quote_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="?android:attr/textColorTertiary"
android:pathData="m 20.9375,2.375 h -5.5 c -1.138672,0 -2.0625,0.923828 -2.0625,2.0625 v 5.5 c 0,1.138672 0.923828,2.0625 2.0625,2.0625 h 3.4375 v 2.75 c 0,1.516797 -1.233203,2.75 -2.75,2.75 H 15.78125 C 15.209766,17.5 14.75,17.959766 14.75,18.53125 v 2.0625 c 0,0.571484 0.459766,1.03125 1.03125,1.03125 H 16.125 C 19.923437,21.625 23,18.548437 23,14.75 V 4.4375 C 23,3.298828 22.076172,2.375 20.9375,2.375 Z m -12.375,0 h -5.5 C 1.9238281,2.375 1,3.298828 1,4.4375 v 5.5 C 1,11.076172 1.9238281,12 3.0625,12 H 6.5 v 2.75 c 0,1.516797 -1.2332031,2.75 -2.75,2.75 H 3.40625 C 2.8347656,17.5 2.375,17.959766 2.375,18.53125 v 2.0625 c 0,0.571484 0.4597656,1.03125 1.03125,1.03125 H 3.75 c 3.7984375,0 6.875,-3.076563 6.875,-6.875 V 4.4375 C 10.625,3.298828 9.701172,2.375 8.5625,2.375 Z" />
</vector>

2
app/src/main/res/drawable/ic_quote_disabled_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/status_reblog_button_disabled_dark"
android:fillColor="@color/textColorDisabled"
android:pathData="m 20.9375,2.375 h -5.5 c -1.138672,0 -2.0625,0.923828 -2.0625,2.0625 v 5.5 c 0,1.138672 0.923828,2.0625 2.0625,2.0625 h 3.4375 v 2.75 c 0,1.516797 -1.233203,2.75 -2.75,2.75 H 15.78125 C 15.209766,17.5 14.75,17.959766 14.75,18.53125 v 2.0625 c 0,0.571484 0.459766,1.03125 1.03125,1.03125 H 16.125 C 19.923437,21.625 23,18.548437 23,14.75 V 4.4375 C 23,3.298828 22.076172,2.375 20.9375,2.375 Z m -12.375,0 h -5.5 C 1.9238281,2.375 1,3.298828 1,4.4375 v 5.5 C 1,11.076172 1.9238281,12 3.0625,12 H 6.5 v 2.75 c 0,1.516797 -1.2332031,2.75 -2.75,2.75 H 3.40625 C 2.8347656,17.5 2.375,17.959766 2.375,18.53125 v 2.0625 c 0,0.571484 0.4597656,1.03125 1.03125,1.03125 H 3.75 c 3.7984375,0 6.875,-3.076563 6.875,-6.875 V 4.4375 C 10.625,3.298828 9.701172,2.375 8.5625,2.375 Z" />
</vector>

8
app/src/main/res/drawable/reblog_inactive_light.xml → app/src/main/res/drawable/ic_reblog_18dp.xml
View File

@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="18dp"
android:height="18dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/text_color_tertiary_light"
android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
android:fillColor="?android:attr/textColorTertiary"
android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
</vector>

2
app/src/main/res/drawable/reblog_inactive_dark.xml → app/src/main/res/drawable/ic_reblog_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/text_color_tertiary_dark"
android:fillColor="?android:attr/textColorTertiary"
android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
</vector>

4
app/src/main/res/drawable/ic_reblog_dark_24dp.xml
View File

@ -1,4 +0,0 @@
<vector android:height="18dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#9baec8" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
</vector>

2
app/src/main/res/drawable/reblog_direct_dark.xml → app/src/main/res/drawable/ic_reblog_direct_24dp.xml
View File

@ -5,6 +5,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/status_reblog_button_disabled_dark"
android:fillColor="@color/textColorDisabled"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
</vector>

4
app/src/main/res/drawable/ic_reblog_light_24dp.xml
View File

@ -1,4 +0,0 @@
<vector android:height="18dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#5f636f" android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
</vector>

2
app/src/main/res/drawable/reblog_private_dark.xml → app/src/main/res/drawable/ic_reblog_private_24dp.xml
View File

@ -4,6 +4,6 @@ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/status_reblog_button_disabled_dark"
android:fillColor="@color/textColorDisabled"
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>

0
app/src/main/res/drawable/reblog_private_active.xml → app/src/main/res/drawable/ic_reblog_private_active_24dp.xml
View File

2
app/src/main/res/drawable/reblog_unleakable_dark.xml → app/src/main/res/drawable/ic_reblog_unleakable_24dp.xml
View File

@ -1,5 +1,5 @@
<vector android:height="21dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/status_reblog_button_disabled_dark"
<path android:fillColor="@color/textColorDisabled"
android:pathData="M 22.745785,11.069479 C 20.59223,7.4149586 16.576087,4.9724689 12.000015,4.9724689 c -1.087318,0 -2.1427837,0.1382199 -3.1491684,0.3975598 L 6.8352892,2.613579 C 6.5449734,2.1988591 5.9734704,2.0979491 5.5587172,2.388229 l -0.5008816,0.35055 c -0.4147914,0.29032 -0.515701,0.8619 -0.225347,1.2766899 L 6.4798519,6.2458287 C 4.416475,7.2538186 2.5365077,8.8943779 1.2552378,11.067568 c -3.819e-4,6.5e-4 -8.785e-4,0.001 -0.0013,0.002 -0.33477406,0.56814 -0.34237474,1.28058 0,1.861561 1.470485,2.495319 3.8095874,4.425278 6.6022485,5.398738 L 3.1127846,11.553528 a 10.396291,10.396291 0 0 1 1.0806728,-1.37164 l 4.5604131,6.51521 h 3.821e-4 l 1.5518394,2.2168 a 12.606259,12.606259 0 0 0 3.015069,0.0447 L 6.0649842,8.5925279 A 10.603839,10.603839 0 0 1 7.5460491,7.768948 l 9.6187289,13.617989 c 0.290315,0.41471 0.861819,0.51558 1.276572,0.225351 l 0.500881,-0.350551 c 0.414793,-0.290319 0.515701,-0.861939 0.225347,-1.27669 l -1.646942,-2.229679 -2.67e-4,-3.4e-4 c 2.183229,-1.0686 4.004111,-2.751529 5.225377,-4.823989 a 1.8309639,1.8309639 0 0 0 3.9e-5,-1.86156 z m -6.848946,4.365968 -0.728215,-1.04004 c 0.942713,-1.243879 1.058404,-2.916259 0.33611,-4.265548 v 9.99e-4 c 0,0.9033 -0.732187,1.63549 -1.635484,1.63549 -0.910097,0 -1.635486,-0.739019 -1.635486,-1.63549 0,-0.9032891 0.732188,-1.6354791 1.635486,-1.6354791 h 0.0011 c -0.945266,-0.505901 -2.044196,-0.59734 -3.036793,-0.29319 L 10.105265,7.1618787 c 0.586896,-0.2298102 1.22589,-0.3560801 1.89475,-0.3560801 2.870769,0 5.194441,2.3232093 5.194441,5.1944394 0,1.317859 -0.49015,2.519879 -1.297617,3.435209 z"/>
</vector>

0
app/src/main/res/drawable/reblog_unleakable_active.xml → app/src/main/res/drawable/ic_reblog_unleakable_active_24dp.xml
View File

2
app/src/main/res/drawable/ic_repeat_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
</vector>

2
app/src/main/res/drawable/ic_reply_24dp.xml
View File

@ -5,6 +5,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
</vector>

2
app/src/main/res/drawable/ic_reply_all_24dp.xml
View File

@ -5,6 +5,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M7,8L7,5l-7,7 7,7v-3l-4,-4 4,-4zM13,9L13,5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z" />
</vector>

0
app/src/main/res/drawable-anydpi/ic_searched_for.xml → app/src/main/res/drawable/ic_searched_for.xml
View File

2
app/src/main/res/drawable/ic_send_24dp.xml
View File

@ -5,6 +5,6 @@
android:viewportHeight="24.0"
android:autoMirrored="true">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>

2
app/src/main/res/drawable/ic_star_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/toolbar_icon_dark"
android:fillColor="#fff"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>

14
app/src/main/res/drawable/media_preview_unloaded_dark.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_background_dark" />
<stroke
android:dashWidth="4dp"
android:dashGap="4dp"
android:width="2dp"
android:color="@color/color_primary_dark" />
</shape>

14
app/src/main/res/drawable/media_preview_unloaded_light.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/media_preview_unloaded_background_light" />
<stroke
android:dashWidth="4dp"
android:dashGap="4dp"
android:width="2dp"
android:color="#AFAFAF" />
</shape>

2
app/src/main/res/drawable/media_warning_bg.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
<solid android:color="?attr/sensitive_media_warning_background_color" />
<solid android:color="@color/color_background_transparent_60" />
</shape>

2
app/src/main/res/drawable/poll_option_shape.xml
View File

@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="6dp"/>
<solid android:color="?attr/pollOptionBackgroundColor" />
<solid android:color="?attr/colorBackgroundAccent" />
</shape>

2
app/src/main/res/drawable/profile_badge_background.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:width="1dp" android:color="@color/text_color_tertiary_light"/>
<stroke android:width="1dp" android:color="?android:attr/textColorTertiary"/>
<corners android:radius="12dp"/>
<padding android:bottom="2dp" android:top="2dp" android:left="8dp" android:right="8dp"/>
</shape>

10
app/src/main/res/drawable/reblog_direct_light.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/status_reblog_button_disabled_light"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
</vector>

9
app/src/main/res/drawable/reblog_private_light.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/status_reblog_button_disabled_light"
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>

5
app/src/main/res/drawable/reblog_unleakable_light.xml
View File

@ -1,5 +0,0 @@
<vector android:height="21dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/status_reblog_button_disabled_light"
android:pathData="M 22.745785,11.069479 C 20.59223,7.4149586 16.576087,4.9724689 12.000015,4.9724689 c -1.087318,0 -2.1427837,0.1382199 -3.1491684,0.3975598 L 6.8352892,2.613579 C 6.5449734,2.1988591 5.9734704,2.0979491 5.5587172,2.388229 l -0.5008816,0.35055 c -0.4147914,0.29032 -0.515701,0.8619 -0.225347,1.2766899 L 6.4798519,6.2458287 C 4.416475,7.2538186 2.5365077,8.8943779 1.2552378,11.067568 c -3.819e-4,6.5e-4 -8.785e-4,0.001 -0.0013,0.002 -0.33477406,0.56814 -0.34237474,1.28058 0,1.861561 1.470485,2.495319 3.8095874,4.425278 6.6022485,5.398738 L 3.1127846,11.553528 a 10.396291,10.396291 0 0 1 1.0806728,-1.37164 l 4.5604131,6.51521 h 3.821e-4 l 1.5518394,2.2168 a 12.606259,12.606259 0 0 0 3.015069,0.0447 L 6.0649842,8.5925279 A 10.603839,10.603839 0 0 1 7.5460491,7.768948 l 9.6187289,13.617989 c 0.290315,0.41471 0.861819,0.51558 1.276572,0.225351 l 0.500881,-0.350551 c 0.414793,-0.290319 0.515701,-0.861939 0.225347,-1.27669 l -1.646942,-2.229679 -2.67e-4,-3.4e-4 c 2.183229,-1.0686 4.004111,-2.751529 5.225377,-4.823989 a 1.8309639,1.8309639 0 0 0 3.9e-5,-1.86156 z m -6.848946,4.365968 -0.728215,-1.04004 c 0.942713,-1.243879 1.058404,-2.916259 0.33611,-4.265548 v 9.99e-4 c 0,0.9033 -0.732187,1.63549 -1.635484,1.63549 -0.910097,0 -1.635486,-0.739019 -1.635486,-1.63549 0,-0.9032891 0.732188,-1.6354791 1.635486,-1.6354791 h 0.0011 c -0.945266,-0.505901 -2.044196,-0.59734 -3.036793,-0.29319 L 10.105265,7.1618787 c 0.586896,-0.2298102 1.22589,-0.3560801 1.89475,-0.3560801 2.870769,0 5.194441,2.3232093 5.194441,5.1944394 0,1.317859 -0.49015,2.519879 -1.297617,3.435209 z"/>
</vector>

2
app/src/main/res/drawable/autocomplete_divider_light.xml → app/src/main/res/drawable/status_divider.xml
View File

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:height="1dp" />
<solid android:color="@color/status_divider_light" />
<solid android:color="?attr/colorBackgroundAccent" />
</shape>

6
app/src/main/res/drawable/status_divider_dark.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:height="1dp" />
<solid android:color="@color/status_divider_dark" />
</shape>

6
app/src/main/res/drawable/status_divider_light.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:height="1dp" />
<solid android:color="@color/status_divider_light" />
</shape>

Some files were not shown because too many files have changed in this diff Show More