diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0bf4d3aa6..4231121ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ To add a new language, click on the 'Start a new translation' button on at the b ## Contributing code ### Prerequisites -You should have a general understanding of Android development and Git. +You should have a general understanding of Android development and Git. ### Architecture We try to follow the [Guide to app architecture](https://developer.android.com/topic/architecture). @@ -35,9 +35,16 @@ If there is untranslatable text that you don't want to keep as a string constant We use [Viewbinding](https://developer.android.com/topic/libraries/view-binding) to reference views. No contribution using another mechanism will be accepted. There are useful extensions in `src/main/java/com/keylesspalace/tusky/util/ViewExtensions.kt` that make working with viewbinding easier. -### Visuals +### Themes There are three themes in the app, so any visual changes should be checked with each of them to ensure they look appropriate no matter which theme is selected. Usually, you can use existing color attributes like `?attr/colorPrimary` and `?attr/textColorSecondary`. -All icons are from the Material iconset, find new icons [here](https://fonts.google.com/icons) (Google fonts) or [here](https://fonts.google.com/icons) (community contributions). + +### Icons +All icons are from the rounded variant of the Material Symbols icon set with weight 400 and grade 0. +New icons can be found [here](https://fonts.google.com/icons?icon.style=Rounded&icon.size=24). +Usually we prefer outlined icons, but there are cases where a filled one is a better choice. +If the icon needs to have an active/inactive state it is a good idea to use the outlined icon for the inactive and the filled one for the active state. + +Icons should be imported as vector drawables and named `ic_icon_name_sizedp_modifier.xml`, e.g. `ic_home_24dp` or `ic_notifications_24dp_filled`. ### Accessibility We try to make Tusky as accessible as possible for as many people as possible. Please make sure that all touch targets are at least 48dpx48dp in size, Text has sufficient contrast and images or icons have a image description. See [this guide](https://developer.android.com/guide/topics/ui/accessibility/apps) for more information. diff --git a/app/build.gradle b/app/build.gradle index fe716fa40..cc7615696 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -169,7 +169,6 @@ dependencies { implementation libs.touchimageview implementation libs.bundles.material.drawer - implementation libs.material.typeface implementation libs.image.cropper diff --git a/app/src/green/res/values/flavor-colors.xml b/app/src/green/res/values/flavor-colors.xml index a5120eade..55d033268 100644 --- a/app/src/green/res/values/flavor-colors.xml +++ b/app/src/green/res/values/flavor-colors.xml @@ -1,8 +1,8 @@ - #19A341 + @color/tusky_green #097b44 #39ff9e - \ No newline at end of file + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e6a7e3864..86db206e8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -185,7 +185,7 @@ diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt index d92b92ab0..c4015ca02 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt @@ -265,10 +265,10 @@ class AccountsInListFragment : DialogFragment() { holder.binding.rejectButton.apply { contentDescription = if (inAList) { - setImageResource(R.drawable.ic_reject_24dp) + setImageResource(R.drawable.ic_close_24dp) getString(R.string.action_remove_from_list) } else { - setImageResource(R.drawable.ic_plus_24dp) + setImageResource(R.drawable.ic_add_24dp) getString(R.string.action_add_to_list) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt index 87eea1340..8faa342b5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt @@ -44,8 +44,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.canhub.cropper.CropImage import com.canhub.cropper.CropImageContract import com.canhub.cropper.options -import com.google.android.material.R as materialR -import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.adapter.AccountFieldEditAdapter @@ -59,10 +57,6 @@ import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.viewmodel.EditProfileViewModel import com.keylesspalace.tusky.viewmodel.ProfileDataInUi -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch @@ -150,18 +144,6 @@ class EditProfileActivity : BaseActivity() { binding.fieldList.layoutManager = LinearLayoutManager(this) binding.fieldList.adapter = accountFieldEditAdapter - val plusDrawable = IconicsDrawable(this, GoogleMaterial.Icon.gmd_add).apply { - sizeDp = 12 - colorInt = MaterialColors.getColor(binding.addFieldButton, materialR.attr.colorOnPrimary) - } - - binding.addFieldButton.setCompoundDrawablesRelativeWithIntrinsicBounds( - plusDrawable, - null, - null, - null - ) - binding.addFieldButton.setOnClickListener { accountFieldEditAdapter.addField() if (accountFieldEditAdapter.itemCount >= maxAccountFields) { diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt index 682ad195a..65deb667d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt @@ -104,14 +104,9 @@ import com.keylesspalace.tusky.util.reduceSwipeSensitivity import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation import com.keylesspalace.tusky.util.viewBinding -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import com.mikepenz.materialdrawer.holder.BadgeStyle import com.mikepenz.materialdrawer.holder.ColorHolder import com.mikepenz.materialdrawer.holder.StringHolder -import com.mikepenz.materialdrawer.iconics.iconicsIcon import com.mikepenz.materialdrawer.model.AbstractDrawerItem import com.mikepenz.materialdrawer.model.DividerDrawerItem import com.mikepenz.materialdrawer.model.PrimaryDrawerItem @@ -465,12 +460,6 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.activity_main, menu) - menu.findItem(R.id.action_search)?.apply { - icon = IconicsDrawable(this@MainActivity, GoogleMaterial.Icon.gmd_search).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.mainToolbar, android.R.attr.textColorPrimary) - } - } } override fun onPrepareMenu(menu: Menu) { @@ -597,7 +586,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { identifier = DRAWER_ITEM_ADD_ACCOUNT nameRes = R.string.add_account_name descriptionRes = R.string.add_account_description - iconicsIcon = GoogleMaterial.Icon.gmd_add + iconRes = R.drawable.ic_add_24dp + isIconTinted = true }, 0 ) @@ -665,7 +655,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { addItems( primaryDrawerItem { nameRes = R.string.action_edit_profile - iconicsIcon = GoogleMaterial.Icon.gmd_person + iconRes = R.drawable.ic_person_24dp onClick = { val intent = Intent(context, EditProfileActivity::class.java) startActivityWithSlideInAnimation(intent) @@ -674,7 +664,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { primaryDrawerItem { nameRes = R.string.action_view_favourites isSelectable = false - iconicsIcon = GoogleMaterial.Icon.gmd_star + iconRes = R.drawable.ic_star_24dp onClick = { val intent = StatusListActivity.newFavouritesIntent(context) startActivityWithSlideInAnimation(intent) @@ -682,7 +672,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, primaryDrawerItem { nameRes = R.string.action_view_bookmarks - iconicsIcon = GoogleMaterial.Icon.gmd_bookmark + iconRes = R.drawable.ic_bookmark_24dp onClick = { val intent = StatusListActivity.newBookmarksIntent(context) startActivityWithSlideInAnimation(intent) @@ -690,7 +680,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, primaryDrawerItem { nameRes = R.string.action_view_follow_requests - iconicsIcon = GoogleMaterial.Icon.gmd_person_add + iconRes = R.drawable.ic_person_add_24dp_mirrored onClick = { val intent = AccountListActivity.newIntent(context, AccountListActivity.Type.FOLLOW_REQUESTS) startActivityWithSlideInAnimation(intent) @@ -698,14 +688,14 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, primaryDrawerItem { nameRes = R.string.action_lists - iconicsIcon = GoogleMaterial.Icon.gmd_list + iconRes = R.drawable.ic_list_alt_24dp onClick = { startActivityWithSlideInAnimation(ListsActivity.newIntent(context)) } }, primaryDrawerItem { nameRes = R.string.action_access_drafts - iconRes = R.drawable.ic_notebook + iconRes = R.drawable.ic_edit_document_24dp onClick = { val intent = DraftsActivity.newIntent(context) startActivityWithSlideInAnimation(intent) @@ -713,7 +703,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, primaryDrawerItem { nameRes = R.string.action_access_scheduled_posts - iconRes = R.drawable.ic_access_time + iconRes = R.drawable.ic_schedule_24dp onClick = { startActivityWithSlideInAnimation(ScheduledStatusActivity.newIntent(context)) } @@ -721,7 +711,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { primaryDrawerItem { identifier = DRAWER_ITEM_ANNOUNCEMENTS nameRes = R.string.title_announcements - iconRes = R.drawable.ic_bullhorn_24dp + iconRes = R.drawable.ic_campaign_24dp onClick = { startActivityWithSlideInAnimation(AnnouncementsActivity.newIntent(context)) } @@ -733,7 +723,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { DividerDrawerItem(), secondaryDrawerItem { nameRes = R.string.action_view_account_preferences - iconRes = R.drawable.ic_account_settings + iconRes = R.drawable.ic_manage_accounts_24dp onClick = { val intent = PreferencesActivity.newIntent(context, PreferencesActivity.ACCOUNT_PREFERENCES) startActivityWithSlideInAnimation(intent) @@ -741,7 +731,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, secondaryDrawerItem { nameRes = R.string.action_view_preferences - iconicsIcon = GoogleMaterial.Icon.gmd_settings + iconRes = R.drawable.ic_settings_24dp onClick = { val intent = PreferencesActivity.newIntent(context, PreferencesActivity.GENERAL_PREFERENCES) startActivityWithSlideInAnimation(intent) @@ -749,7 +739,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, secondaryDrawerItem { nameRes = R.string.about_title_activity - iconicsIcon = GoogleMaterial.Icon.gmd_info + iconRes = R.drawable.ic_info_24dp onClick = { val intent = Intent(context, AboutActivity::class.java) startActivityWithSlideInAnimation(intent) @@ -757,7 +747,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { }, secondaryDrawerItem { nameRes = R.string.action_logout - iconRes = R.drawable.ic_logout + iconRes = R.drawable.ic_logout_24dp onClick = ::logout } ) @@ -767,7 +757,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { 4, primaryDrawerItem { nameRes = R.string.action_search - iconicsIcon = GoogleMaterial.Icon.gmd_search + iconRes = R.drawable.ic_search_24dp onClick = { startActivityWithSlideInAnimation(SearchActivity.getIntent(context)) } @@ -780,7 +770,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { 5, primaryDrawerItem { nameRes = R.string.title_public_trending_hashtags - iconicsIcon = GoogleMaterial.Icon.gmd_trending_up + iconRes = R.drawable.ic_whatshot_24dp onClick = { startActivityWithSlideInAnimation(TrendingActivity.getIntent(context)) } @@ -793,7 +783,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { 6, primaryDrawerItem { nameRes = R.string.title_public_trending_statuses - iconicsIcon = GoogleMaterial.Icon.gmd_local_fire_department + iconRes = R.drawable.ic_local_fire_department_24dp onClick = { startActivityWithSlideInAnimation(StatusListActivity.newTrendingIntent(context)) } @@ -811,7 +801,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider { secondaryDrawerItem { nameText = "Developer tools" isEnabled = true - iconicsIcon = GoogleMaterial.Icon.gmd_developer_mode + iconRes = R.drawable.ic_developer_mode_24dp onClick = { showDeveloperToolsDialog() } diff --git a/app/src/main/java/com/keylesspalace/tusky/TabData.kt b/app/src/main/java/com/keylesspalace/tusky/TabData.kt index 9f23f74f8..12a5f20cd 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabData.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabData.kt @@ -67,19 +67,19 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD HOME -> TabData( id = HOME, text = R.string.title_home, - icon = R.drawable.ic_home_24dp, + icon = R.drawable.tab_icon_home, fragment = { TimelineFragment.newInstance(TimelineViewModel.Kind.HOME) } ) NOTIFICATIONS -> TabData( id = NOTIFICATIONS, text = R.string.title_notifications, - icon = R.drawable.ic_notifications_24dp, + icon = R.drawable.tab_icon_notifications, fragment = { NotificationsFragment.newInstance() } ) LOCAL -> TabData( id = LOCAL, text = R.string.title_public_local, - icon = R.drawable.ic_local_24dp, + icon = R.drawable.tab_icon_local, fragment = { TimelineFragment.newInstance(TimelineViewModel.Kind.PUBLIC_LOCAL) } ) FEDERATED -> TabData( @@ -91,19 +91,19 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD DIRECT -> TabData( id = DIRECT, text = R.string.title_direct_messages, - icon = R.drawable.ic_reblog_direct_24dp, + icon = R.drawable.tab_icon_direct, fragment = { ConversationsFragment.newInstance() } ) TRENDING_TAGS -> TabData( id = TRENDING_TAGS, text = R.string.title_public_trending_hashtags, - icon = R.drawable.ic_trending_up_24px, + icon = R.drawable.tab_icon_trending_tags, fragment = { TrendingTagsFragment.newInstance() } ) TRENDING_STATUSES -> TabData( id = TRENDING_STATUSES, text = R.string.title_public_trending_statuses, - icon = R.drawable.ic_hot_24dp, + icon = R.drawable.tab_icon_trending_posts, fragment = { TimelineFragment.newInstance( TimelineViewModel.Kind.PUBLIC_TRENDING_STATUSES @@ -113,7 +113,7 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD HASHTAG -> TabData( id = HASHTAG, text = R.string.hashtags, - icon = R.drawable.ic_hashtag, + icon = R.drawable.ic_tag_24dp, fragment = { args -> TimelineFragment.newHashtagInstance(args) }, arguments = arguments, title = { context -> @@ -125,7 +125,7 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD LIST -> TabData( id = LIST, text = R.string.list, - icon = R.drawable.ic_list, + icon = R.drawable.tab_icon_list, fragment = { args -> TimelineFragment.newInstance( TimelineViewModel.Kind.LIST, @@ -138,7 +138,7 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD BOOKMARKS -> TabData( id = BOOKMARKS, text = R.string.title_bookmarks, - icon = R.drawable.ic_bookmark_active_24dp, + icon = R.drawable.tab_icon_bookmarks, fragment = { TimelineFragment.newInstance(TimelineViewModel.Kind.BOOKMARKS) } ) else -> throw IllegalArgumentException("unknown tab type") diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java index 9803b7ec8..e9eece7bc 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java @@ -448,20 +448,20 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { int inactiveId; int activeId; if (visibility == Status.Visibility.PRIVATE) { - inactiveId = R.drawable.ic_reblog_private_24dp; - activeId = R.drawable.ic_reblog_private_active_24dp; + inactiveId = R.drawable.ic_lock_24dp; + activeId = R.drawable.ic_lock_24dp_filled; } else { - inactiveId = R.drawable.ic_reblog_24dp; - activeId = R.drawable.ic_reblog_active_24dp; + inactiveId = R.drawable.ic_repeat_24dp; + activeId = R.drawable.ic_repeat_active_24dp; } reblogButton.setInactiveImage(inactiveId); reblogButton.setActiveImage(activeId); } else { int disabledId; if (visibility == Status.Visibility.DIRECT) { - disabledId = R.drawable.ic_reblog_direct_24dp; + disabledId = R.drawable.ic_mail_24dp; } else { - disabledId = R.drawable.ic_reblog_private_24dp; + disabledId = R.drawable.ic_lock_24dp; } reblogButton.setInactiveImage(disabledId); reblogButton.setActiveImage(disabledId); @@ -551,7 +551,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { final Attachment.Type type = attachment.getType(); if (showingContent && (type == Attachment.Type.VIDEO || type == Attachment.Type.GIFV)) { imageView.setForegroundGravity(Gravity.CENTER); - imageView.setForeground(AppCompatResources.getDrawable(itemView.getContext(), R.drawable.ic_play_indicator)); + imageView.setForeground(AppCompatResources.getDrawable(itemView.getContext(), R.drawable.play_indicator)); } else { imageView.setForeground(null); } @@ -593,17 +593,13 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { @DrawableRes private static int getLabelIcon(Attachment.Type type) { - switch (type) { - case IMAGE: - return R.drawable.ic_photo_24dp; - case GIFV: - case VIDEO: - return R.drawable.ic_videocam_24dp; - case AUDIO: - return R.drawable.ic_music_box_24dp; - default: - return R.drawable.ic_attach_file_24dp; - } + return switch (type) { + case IMAGE -> R.drawable.ic_image_24dp; + case GIFV -> R.drawable.ic_gif_box_24dp; + case VIDEO -> R.drawable.ic_slideshow_24dp; + case AUDIO -> R.drawable.ic_music_box_24dp; + default -> R.drawable.ic_attach_file_24dp; + }; } private void updateMediaLabel(int index, boolean sensitive, boolean showingContent) { diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java index f27bc514d..1a0c42797 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java @@ -177,10 +177,10 @@ public class StatusDetailedViewHolder extends StatusBaseViewHolder { visibilityIcon = R.drawable.ic_lock_open_24dp; break; case PRIVATE: - visibilityIcon = R.drawable.ic_lock_outline_24dp; + visibilityIcon = R.drawable.ic_lock_24dp; break; case DIRECT: - visibilityIcon = R.drawable.ic_email_24dp; + visibilityIcon = R.drawable.ic_mail_24dp; break; default: return null; diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java index 8c78871f1..2a63531ef 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java @@ -130,7 +130,7 @@ public class StatusViewHolder extends StatusBaseViewHolder { statusDisplayOptions.animateEmojis() ); statusInfo.setText(emojifiedText); - statusInfo.setCompoundDrawablesWithIntrinsicBounds(isReply ? R.drawable.ic_reply_18dp : R.drawable.ic_reblog_18dp, 0, 0, 0); + statusInfo.setCompoundDrawablesWithIntrinsicBounds(isReply ? R.drawable.ic_reply_18dp : R.drawable.ic_repeat_18dp, 0, 0, 0); statusInfo.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt index 7643aec3b..fc6f534e5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt @@ -122,7 +122,7 @@ class TabAdapter( val chip = binding.chipGroup.getChildAt(i).takeUnless { it.id == R.id.actionChip } as Chip? ?: Chip(context).apply { - setCloseIconResource(R.drawable.ic_cancel_24dp) + setCloseIconResource(R.drawable.ic_cancel_24dp_filled) isCheckable = false binding.chipGroup.addView(this, binding.chipGroup.size - 1) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt index 61779f83f..ef27d3b2f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt @@ -38,6 +38,7 @@ import androidx.annotation.Px import androidx.appcompat.content.res.AppCompatResources import androidx.core.app.ActivityOptionsCompat import androidx.core.graphics.ColorUtils +import androidx.core.graphics.toColorInt import androidx.core.view.MenuProvider import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat @@ -316,8 +317,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide binding.accountToolbar.setBackgroundColor(Color.TRANSPARENT) - binding.accountToolbar.setNavigationIcon(R.drawable.ic_arrow_back_with_background) - binding.accountToolbar.overflowIcon = AppCompatResources.getDrawable(this, R.drawable.ic_more_with_background) + binding.accountToolbar.setNavigationIcon(R.drawable.toolbar_icon_arrow_back_with_background) + binding.accountToolbar.overflowIcon = AppCompatResources.getDrawable(this, R.drawable.toolbar_icon_more_with_background) val avatarBackground = MaterialShapeDrawable().apply { fillColor = ColorStateList.valueOf(toolbarColor) @@ -518,7 +519,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide loadedAccount?.roles?.forEach { role -> val badgeColor = if (role.color.isNotBlank()) { - Color.parseColor(role.color) + role.color.toColorInt() } else { // sometimes the color is not set for a role, in this case fall back to our default blue getColor(R.color.tusky_blue) @@ -527,7 +528,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide val sb = SpannableStringBuilder("${role.name} ${viewModel.domain}") sb.setSpan(StyleSpan(Typeface.BOLD), 0, role.name.length, 0) - val badgeView = getBadge(badgeColor, R.drawable.profile_badge_person_24dp, sb, isLight) + val badgeView = getBadge(badgeColor, R.drawable.ic_person_24dp, sb, isLight) binding.accountBadgeContainer.addView(badgeView) } @@ -742,7 +743,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide private fun updateMuteButton() { if (muting) { - binding.accountMuteButton.setIconResource(R.drawable.ic_unmute_24dp) + binding.accountMuteButton.setIconResource(R.drawable.ic_volume_up_24dp) } else { binding.accountMuteButton.hide() } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountFieldAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountFieldAdapter.kt index 1d6562825..2410f3366 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountFieldAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountFieldAdapter.kt @@ -69,7 +69,7 @@ class AccountFieldAdapter( valueTextView.setCompoundDrawablesRelativeWithIntrinsicBounds( 0, 0, - R.drawable.ic_check_circle, + R.drawable.ic_verified_18dp, 0 ) } else { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt index 343e1fa3e..083c93fc9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt @@ -30,7 +30,6 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.paging.LoadState import androidx.recyclerview.widget.GridLayoutManager -import com.google.android.material.color.MaterialColors import com.keylesspalace.tusky.R import com.keylesspalace.tusky.ViewMediaActivity import com.keylesspalace.tusky.databinding.FragmentTimelineBinding @@ -43,10 +42,6 @@ import com.keylesspalace.tusky.util.openLink import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.viewdata.AttachmentViewData -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.flow.collectLatest @@ -153,12 +148,6 @@ class AccountMediaFragment : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.fragment_account_media, menu) - menu.findItem(R.id.action_refresh)?.apply { - icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaGridAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaGridAdapter.kt index 6fc33f23a..007d8c981 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaGridAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaGridAdapter.kt @@ -53,11 +53,11 @@ class AccountMediaGridAdapter( ) private val videoIndicator = AppCompatResources.getDrawable( context, - R.drawable.ic_play_indicator + R.drawable.play_indicator ) private val mediaHiddenDrawable = AppCompatResources.getDrawable( context, - R.drawable.ic_hide_media_24dp + R.drawable.ic_visibility_off_24dp ) private val itemBgBaseHSV = FloatArray(3) @@ -101,7 +101,7 @@ class AccountMediaGridAdapter( ) Glide.with(imageView) - .load(R.drawable.ic_music_box_preview_24dp) + .load(R.drawable.ic_music_box_24dp) .centerInside() .into(imageView) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index 45ab7c84a..fbdae1eac 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -46,6 +46,7 @@ import androidx.annotation.AttrRes import androidx.annotation.ColorInt import androidx.annotation.StringRes import androidx.annotation.VisibleForTesting +import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.FileProvider import androidx.core.content.res.use import androidx.core.view.ContentInfoCompat @@ -114,10 +115,6 @@ import com.keylesspalace.tusky.util.setOnWindowInsetsChangeListener import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.util.visible -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.migration.OptionalInject import java.io.File @@ -410,12 +407,7 @@ class ComposeActivity : if (replyingStatusAuthor != null) { binding.composeReplyView.show() binding.composeReplyView.text = getString(R.string.replying_to, replyingStatusAuthor) - val arrowDownIcon = IconicsDrawable( - this, - GoogleMaterial.Icon.gmd_arrow_drop_down - ).apply { - sizeDp = 12 - } + val arrowDownIcon = AppCompatResources.getDrawable(this, R.drawable.ic_arrow_drop_down_24dp)!! setDrawableTint(this, arrowDownIcon, android.R.attr.textColorTertiary) binding.composeReplyView.setCompoundDrawablesRelativeWithIntrinsicBounds( @@ -440,10 +432,7 @@ class ComposeActivity : ) } else { binding.composeReplyContentView.show() - val arrowUpIcon = IconicsDrawable( - this, - GoogleMaterial.Icon.gmd_arrow_drop_up - ).apply { sizeDp = 12 } + val arrowUpIcon = AppCompatResources.getDrawable(this, R.drawable.ic_arrow_drop_up_24dp)!! setDrawableTint(this, arrowUpIcon, android.R.attr.textColorTertiary) binding.composeReplyView.setCompoundDrawablesRelativeWithIntrinsicBounds( @@ -647,41 +636,6 @@ class ComposeActivity : displayTransientMessage(R.string.hint_media_description_missing) } - val textColor = MaterialColors.getColor(binding.root, android.R.attr.textColorTertiary) - - val cameraIcon = IconicsDrawable(this, GoogleMaterial.Icon.gmd_camera_alt).apply { - colorInt = textColor - sizeDp = 18 - } - binding.actionPhotoTake.setCompoundDrawablesRelativeWithIntrinsicBounds( - cameraIcon, - null, - null, - null - ) - - val imageIcon = IconicsDrawable(this, GoogleMaterial.Icon.gmd_image).apply { - colorInt = textColor - sizeDp = 18 - } - binding.actionPhotoPick.setCompoundDrawablesRelativeWithIntrinsicBounds( - imageIcon, - null, - null, - null - ) - - val pollIcon = IconicsDrawable(this, GoogleMaterial.Icon.gmd_poll).apply { - colorInt = textColor - sizeDp = 18 - } - binding.addPollTextActionTextView.setCompoundDrawablesRelativeWithIntrinsicBounds( - pollIcon, - null, - null, - null - ) - binding.actionPhotoTake.visible( Intent(MediaStore.ACTION_IMAGE_CAPTURE).resolveActivity(packageManager) != null ) @@ -856,16 +810,16 @@ class ComposeActivity : } else { binding.composeHideMediaButton.show() @AttrRes val color = if (contentWarningShown) { - binding.composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp) + binding.composeHideMediaButton.setImageResource(R.drawable.ic_visibility_off_24dp) binding.composeHideMediaButton.isClickable = false materialR.attr.colorPrimary } else { binding.composeHideMediaButton.isClickable = true if (markMediaSensitive) { - binding.composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp) + binding.composeHideMediaButton.setImageResource(R.drawable.ic_visibility_off_24dp) materialR.attr.colorPrimary } else { - binding.composeHideMediaButton.setImageResource(R.drawable.ic_eye_24dp) + binding.composeHideMediaButton.setImageResource(R.drawable.ic_visibility_24dp) android.R.attr.textColorTertiary } } @@ -916,8 +870,8 @@ class ComposeActivity : val iconRes = when (visibility) { Status.Visibility.PUBLIC -> R.drawable.ic_public_24dp - Status.Visibility.PRIVATE -> R.drawable.ic_lock_outline_24dp - Status.Visibility.DIRECT -> R.drawable.ic_email_24dp + Status.Visibility.PRIVATE -> R.drawable.ic_lock_24dp + Status.Visibility.DIRECT -> R.drawable.ic_mail_24dp Status.Visibility.UNLISTED -> R.drawable.ic_lock_open_24dp else -> R.drawable.ic_lock_open_24dp } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaPreviewAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaPreviewAdapter.kt index ca7f8213f..6cf6257ca 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaPreviewAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/MediaPreviewAdapter.kt @@ -90,7 +90,7 @@ class MediaPreviewAdapter( holder.progressImageView.setProgress(item.uploadPercent) if (item.type == ComposeViewModel.QueuedMedia.Type.AUDIO) { // TODO: Fancy waveform display? - holder.progressImageView.setImageResource(R.drawable.ic_music_box_preview_24dp) + holder.progressImageView.setImageResource(R.drawable.audio_file_preview) } else { val imageView = holder.progressImageView val focus = item.focus diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt index 9a39d4156..1090bd599 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt @@ -41,7 +41,7 @@ fun showAddPollDialog( val inset = context.resources.getDimensionPixelSize(R.dimen.dialog_inset) val dialog = MaterialAlertDialogBuilder(context) - .setIcon(R.drawable.ic_poll_24dp) + .setIcon(R.drawable.ic_insert_chart_24dp_filled) .setTitle(R.string.create_poll_title) .setView(binding.root) .setBackgroundInsetTop(inset) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt index b061d6298..26f046613 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.kt @@ -87,7 +87,7 @@ class ComposeScheduleView } private fun setEditIcons() { - val icon = AppCompatResources.getDrawable(context, R.drawable.ic_create_24dp) ?: return + val icon = AppCompatResources.getDrawable(context, R.drawable.ic_edit_24dp_filled) ?: return val size = binding.scheduledDateTime.lineHeight icon.setBounds(0, 0, size, size) binding.scheduledDateTime.setCompoundDrawablesRelative(null, null, icon, null) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt index 8bdaa465d..ce66435ba 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt @@ -52,12 +52,8 @@ class ProgressImageView } private val captionDrawable = AppCompatResources.getDrawable( context, - R.drawable.spellcheck - )!!.apply { - setTint( - MaterialColors.getColor(this@ProgressImageView, android.R.attr.textColorTertiary) - ) - } + R.drawable.ic_spellcheck_24dp + )!! private val circleRadius = Utils.dpToPx(context, 14) private val circleMargin = Utils.dpToPx(context, 14) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/TootButton.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/TootButton.kt index beb57d941..245ebf6cd 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/TootButton.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/TootButton.kt @@ -16,15 +16,11 @@ package com.keylesspalace.tusky.components.compose.view import android.content.Context -import android.graphics.Color import android.util.AttributeSet +import androidx.appcompat.content.res.AppCompatResources import com.google.android.material.button.MaterialButton import com.keylesspalace.tusky.R import com.keylesspalace.tusky.entity.Status -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp class TootButton @JvmOverloads constructor( @@ -60,10 +56,7 @@ class TootButton Status.Visibility.PRIVATE, Status.Visibility.DIRECT -> { setText(R.string.action_send) - IconicsDrawable(context, GoogleMaterial.Icon.gmd_lock).apply { - sizeDp = 18 - colorInt = Color.WHITE - } + AppCompatResources.getDrawable(context, R.drawable.ic_lock_24dp) } else -> { null diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt index 576b0d656..4303c700f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt @@ -32,7 +32,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.SimpleItemAnimator import at.connyduck.sparkbutton.helpers.Utils -import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.keylesspalace.tusky.R import com.keylesspalace.tusky.StatusListActivity @@ -55,10 +54,6 @@ import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.updateRelativeTimePeriodically import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.viewdata.AttachmentViewData -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.flow.collectLatest @@ -203,12 +198,6 @@ class ConversationsFragment : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.fragment_conversations, menu) - menu.findItem(R.id.action_refresh)?.apply { - icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftMediaAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftMediaAdapter.kt index ac631721d..5fd8b9c39 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftMediaAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/drafts/DraftMediaAdapter.kt @@ -52,7 +52,7 @@ class DraftMediaAdapter( getItem(position)?.let { attachment -> if (attachment.type == DraftAttachment.Type.AUDIO) { holder.imageView.clearFocus() - holder.imageView.setImageResource(R.drawable.ic_music_box_preview_24dp) + holder.imageView.setImageResource(R.drawable.audio_file_preview) } else { if (attachment.focus != null) { holder.imageView.setFocalPoint(attachment.focus) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt index 81a5d5e15..414fb1b88 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/filters/EditFilterActivity.kt @@ -206,7 +206,7 @@ class EditFilterActivity : BaseActivity() { val chip = binding.keywordChips.getChildAt(index).takeUnless { it.id == R.id.actionChip } as Chip? ?: Chip(this).apply { - setCloseIconResource(R.drawable.ic_cancel_24dp) + setCloseIconResource(R.drawable.ic_cancel_24dp_filled) isCheckable = false binding.keywordChips.addView(this, binding.keywordChips.size - 1) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt index 2a57e5909..0ae269627 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt @@ -17,17 +17,14 @@ package com.keylesspalace.tusky.components.notifications -import android.content.Context +import android.annotation.SuppressLint +import android.content.res.ColorStateList import android.graphics.Typeface -import android.graphics.drawable.Drawable import android.text.InputFilter import android.text.Spanned import android.text.format.DateUtils import android.text.style.StyleSpan import android.view.View -import androidx.annotation.ColorRes -import androidx.annotation.DrawableRes -import androidx.appcompat.content.res.AppCompatResources import androidx.core.text.toSpannable import androidx.recyclerview.widget.RecyclerView import at.connyduck.sparkbutton.helpers.Utils @@ -176,16 +173,6 @@ internal class StatusNotificationViewHolder( } } - private fun getIconWithColor( - context: Context, - @DrawableRes drawable: Int, - @ColorRes color: Int - ): Drawable? { - val icon = AppCompatResources.getDrawable(context, drawable) - icon?.setTint(context.getColor(color)) - return icon - } - private fun setAvatar(statusAvatarUrl: String?, isBot: Boolean, animateAvatars: Boolean, showBotOverlay: Boolean) { binding.notificationStatusAvatar.setPaddingRelative(0, 0, 0, 0) loadAvatar( @@ -222,6 +209,7 @@ internal class StatusNotificationViewHolder( ) } + @SuppressLint("UseCompatTextViewDrawableApis") fun setMessage( notificationViewData: NotificationViewData.Concrete, listener: LinkListener, @@ -232,35 +220,37 @@ internal class StatusNotificationViewHolder( val type = notificationViewData.type val context = binding.notificationTopText.context val format: String - val icon: Drawable? + val icon: Int + val iconColor: Int when (type) { Notification.Type.Favourite -> { - icon = getIconWithColor(context, R.drawable.ic_star_24dp, R.color.tusky_orange) + icon = R.drawable.ic_star_24dp_filled + iconColor = R.color.favoriteButtonActiveColor format = context.getString(R.string.notification_favourite_format) } Notification.Type.Reblog -> { - icon = getIconWithColor(context, R.drawable.ic_repeat_24dp, R.color.tusky_blue) + icon = R.drawable.ic_repeat_24dp + iconColor = R.color.colorPrimary format = context.getString(R.string.notification_reblog_format) } Notification.Type.Status -> { - icon = getIconWithColor(context, R.drawable.ic_notifications_active_24dp, R.color.tusky_blue) + icon = R.drawable.ic_notifications_active_24dp + iconColor = R.color.colorPrimary format = context.getString(R.string.notification_subscription_format) } Notification.Type.Update -> { - icon = getIconWithColor(context, R.drawable.ic_edit_24dp, R.color.tusky_blue) + icon = R.drawable.ic_edit_24dp_filled + iconColor = R.color.colorPrimary format = context.getString(R.string.notification_update_format) } else -> { - icon = getIconWithColor(context, R.drawable.ic_star_24dp, R.color.tusky_orange) + icon = R.drawable.ic_star_24dp_filled + iconColor = R.color.favoriteButtonActiveColor format = context.getString(R.string.notification_favourite_format) } } - binding.notificationTopText.setCompoundDrawablesRelativeWithIntrinsicBounds( - icon, - null, - null, - null - ) + binding.notificationTopText.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, 0, 0, 0) + binding.notificationTopText.compoundDrawableTintList = ColorStateList.valueOf(context.getColor(iconColor)) val wholeMessage = String.format(format, displayName).toSpannable() val displayNameIndex = format.indexOf("%1\$s") wholeMessage.setSpan( @@ -376,7 +366,7 @@ internal class StatusNotificationViewHolder( binding.notificationAttachmentInfo.text = attachmentText } else if (status.poll != null) { binding.notificationAttachmentInfo.show() - binding.notificationAttachmentInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_poll_24dp, 0, 0, 0) + binding.notificationAttachmentInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_insert_chart_24dp, 0, 0, 0) binding.notificationAttachmentInfo.setText(R.string.poll) } else { binding.notificationAttachmentInfo.hide() diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusViewHolder.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusViewHolder.kt index ef477c524..dd0fe317a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusViewHolder.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusViewHolder.kt @@ -59,7 +59,7 @@ internal class StatusViewHolder( val res = itemView.resources if (viewData.type == Notification.Type.Poll) { statusInfo.setText(if (accountId == viewData.account.id) R.string.poll_ended_created else R.string.poll_ended_voted) - statusInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_poll_24dp, 0, 0, 0) + statusInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_insert_chart_24dp_filled, 0, 0, 0) statusInfo.setCompoundDrawablePadding(res.getDimensionPixelSize(R.dimen.status_info_drawable_padding_large)) statusInfo.setPadding(res.getDimensionPixelSize(R.dimen.status_info_padding_large), 0, 0, 0) statusInfo.show() @@ -76,7 +76,7 @@ internal class StatusViewHolder( statusInfo.setText(R.string.notification_info_reply) } } else { - statusInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_at_18dp, 0, 0, 0) + statusInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_email_alternate_18dp, 0, 0, 0) if (viewData.statusViewData.status.visibility == Status.Visibility.DIRECT) { statusInfo.setText(R.string.notification_info_private_mention) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/NotificationRequestsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/NotificationRequestsActivity.kt index c8e6fcae3..b6f852052 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/NotificationRequestsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/NotificationRequestsActivity.kt @@ -30,7 +30,6 @@ import androidx.paging.LoadState import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator -import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.BaseActivity @@ -47,13 +46,7 @@ import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.util.visible -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint -import kotlin.String -import kotlin.getValue import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @@ -144,12 +137,6 @@ class NotificationRequestsActivity : BaseActivity(), MenuProvider { override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.activity_notification_requests, menu) - menu.findItem(R.id.open_settings)?.apply { - icon = IconicsDrawable(this@NotificationRequestsActivity, GoogleMaterial.Icon.gmd_settings).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.includedToolbar.toolbar, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt index d48f92d0e..052397c64 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/preference/AccountPreferencesFragment.kt @@ -16,7 +16,6 @@ package com.keylesspalace.tusky.components.preference import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.os.Build import android.os.Bundle @@ -24,7 +23,6 @@ import android.util.Log import androidx.lifecycle.lifecycleScope import androidx.preference.ListPreference import at.connyduck.calladapter.networkresult.fold -import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.BaseActivity import com.keylesspalace.tusky.BuildConfig @@ -54,10 +52,6 @@ import com.keylesspalace.tusky.util.getLocaleList import com.keylesspalace.tusky.util.getTuskyDisplayName import com.keylesspalace.tusky.util.icon import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeRes import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.launch @@ -81,10 +75,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { makePreferenceScreen { preference { setTitle(R.string.pref_title_edit_notification_settings) - icon = IconicsDrawable(context, GoogleMaterial.Icon.gmd_notifications).apply { - sizeRes = R.dimen.preference_icon_size - colorInt = MaterialColors.getColor(context, R.attr.iconColor, Color.BLACK) - } + icon = icon(R.drawable.ic_notifications_24dp) setOnPreferenceClickListener { openNotificationSystemPrefs() true @@ -93,7 +84,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { preference { setTitle(R.string.title_tab_preferences) - icon = icon(R.drawable.ic_tabs) + icon = icon(R.drawable.ic_tabs_24dp) setOnPreferenceClickListener { val intent = Intent(context, TabPreferenceActivity::class.java) activity?.startActivityWithSlideInAnimation(intent) @@ -103,7 +94,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { preference { setTitle(R.string.title_followed_hashtags) - icon = icon(R.drawable.ic_hashtag) + icon = icon(R.drawable.ic_tag_24dp) setOnPreferenceClickListener { val intent = Intent(context, FollowedTagsActivity::class.java) activity?.startActivityWithSlideInAnimation(intent) @@ -113,7 +104,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { preference { setTitle(R.string.action_view_mutes) - icon = icon(R.drawable.ic_mute_24dp) + icon = icon(R.drawable.ic_volume_off_24dp) setOnPreferenceClickListener { val intent = Intent(context, AccountListActivity::class.java) intent.putExtra("type", AccountListActivity.Type.MUTES) @@ -124,7 +115,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { preference { setTitle(R.string.action_view_blocks) - icon = icon(GoogleMaterial.Icon.gmd_block) + icon = icon(R.drawable.ic_block_24dp) setOnPreferenceClickListener { val intent = Intent(context, AccountListActivity::class.java) intent.putExtra("type", AccountListActivity.Type.BLOCKS) @@ -135,7 +126,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { preference { setTitle(R.string.title_domain_mutes) - icon = icon(R.drawable.ic_mute_24dp) + icon = icon(R.drawable.ic_volume_off_24dp) setOnPreferenceClickListener { val intent = Intent(context, DomainBlocksActivity::class.java) activity?.startActivityWithSlideInAnimation(intent) @@ -145,7 +136,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { preference { setTitle(R.string.pref_title_timeline_filters) - icon = icon(R.drawable.ic_filter_24dp) + icon = icon(R.drawable.ic_filter_alt_24dp) setOnPreferenceClickListener { launchFilterActivity() true @@ -216,7 +207,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { ).toTypedArray() entryValues = (listOf("") + locales.map { it.language }).toTypedArray() key = PrefKeys.DEFAULT_POST_LANGUAGE - icon = icon(GoogleMaterial.Icon.gmd_translate) + icon = icon(R.drawable.ic_translate_24dp) value = accountManager.activeAccount?.defaultPostLanguage.orEmpty() isPersistent = false // This will be entirely server-driven setSummaryProvider { entry } @@ -229,7 +220,7 @@ class AccountPreferencesFragment : BasePreferencesFragment() { switchPreference { setTitle(R.string.pref_default_media_sensitivity) - icon = icon(R.drawable.ic_eye_24dp) + icon = icon(R.drawable.ic_visibility_24dp) key = PrefKeys.DEFAULT_MEDIA_SENSITIVITY val sensitivity = accountManager.activeAccount?.defaultMediaSensitivity == true setDefaultValue(sensitivity) @@ -342,9 +333,9 @@ class AccountPreferencesFragment : BasePreferencesFragment() { private fun getIconForVisibility(visibility: Status.Visibility): Drawable? { val iconRes = when (visibility) { - Status.Visibility.PRIVATE -> R.drawable.ic_lock_outline_24dp + Status.Visibility.PRIVATE -> R.drawable.ic_lock_24dp Status.Visibility.UNLISTED -> R.drawable.ic_lock_open_24dp - Status.Visibility.DIRECT -> R.drawable.ic_email_24dp + Status.Visibility.DIRECT -> R.drawable.ic_mail_24dp else -> R.drawable.ic_public_24dp } return icon(iconRes) @@ -352,9 +343,9 @@ class AccountPreferencesFragment : BasePreferencesFragment() { private fun getIconForSensitivity(sensitive: Boolean): Drawable? { return if (sensitive) { - icon(R.drawable.ic_hide_media_24dp) + icon(R.drawable.ic_visibility_off_24dp) } else { - icon(R.drawable.ic_eye_24dp) + icon(R.drawable.ic_visibility_24dp) } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt index 845ef7b5b..2661c21a4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt @@ -15,10 +15,13 @@ package com.keylesspalace.tusky.components.preference +import android.content.SharedPreferences import android.os.Bundle +import androidx.annotation.DrawableRes import androidx.lifecycle.lifecycleScope import androidx.preference.Preference import com.keylesspalace.tusky.R +import com.keylesspalace.tusky.components.preference.PreferencesFragment.ReadingOrder.valueOf import com.keylesspalace.tusky.components.systemnotifications.NotificationChannelData import com.keylesspalace.tusky.db.AccountManager import com.keylesspalace.tusky.settings.AppTheme @@ -32,7 +35,6 @@ import com.keylesspalace.tusky.settings.sliderPreference import com.keylesspalace.tusky.settings.switchPreference import com.keylesspalace.tusky.util.LocaleManager import com.keylesspalace.tusky.util.icon -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import dagger.hilt.android.AndroidEntryPoint import de.c1710.filemojicompat_ui.views.picker.preference.EmojiPickerPreference import javax.inject.Inject @@ -47,6 +49,9 @@ class PreferencesFragment : BasePreferencesFragment() { @Inject lateinit var localeManager: LocaleManager + @Inject + lateinit var sharedPrefs: SharedPreferences + enum class ReadingOrder { /** User scrolls up, reading statuses oldest to newest */ OLDEST_FIRST, @@ -77,12 +82,12 @@ class PreferencesFragment : BasePreferencesFragment() { key = PrefKeys.APP_THEME setSummaryProvider { entry } setTitle(R.string.pref_title_app_theme) - icon = icon(GoogleMaterial.Icon.gmd_palette) + icon = icon(R.drawable.ic_palette_24dp) } emojiPreference(requireActivity()) { setTitle(R.string.emoji_style) - icon = icon(GoogleMaterial.Icon.gmd_sentiment_satisfied) + icon = icon(R.drawable.ic_mood_24dp) } listPreference { @@ -92,7 +97,7 @@ class PreferencesFragment : BasePreferencesFragment() { key = PrefKeys.LANGUAGE + "_" // deliberately not the actual key, the real handling happens in LocaleManager setSummaryProvider { entry } setTitle(R.string.pref_title_language) - icon = icon(GoogleMaterial.Icon.gmd_translate) + icon = icon(R.drawable.ic_translate_24dp) preferenceDataStore = localeManager } @@ -104,9 +109,9 @@ class PreferencesFragment : BasePreferencesFragment() { stepSize = 5F setTitle(R.string.pref_ui_text_size) format = "%.0f%%" - decrementIcon = icon(GoogleMaterial.Icon.gmd_zoom_out) - incrementIcon = icon(GoogleMaterial.Icon.gmd_zoom_in) - icon = icon(GoogleMaterial.Icon.gmd_format_size) + decrementIcon = icon(R.drawable.ic_zoom_out_24dp) + incrementIcon = icon(R.drawable.ic_zoom_in_24dp) + icon = icon(R.drawable.ic_format_size_24dp) } listPreference { @@ -116,7 +121,7 @@ class PreferencesFragment : BasePreferencesFragment() { key = PrefKeys.STATUS_TEXT_SIZE setSummaryProvider { entry } setTitle(R.string.pref_post_text_size) - icon = icon(GoogleMaterial.Icon.gmd_format_size) + icon = icon(R.drawable.ic_format_size_24dp) } listPreference { @@ -126,7 +131,7 @@ class PreferencesFragment : BasePreferencesFragment() { key = PrefKeys.READING_ORDER setSummaryProvider { entry } setTitle(R.string.pref_title_reading_order) - icon = icon(GoogleMaterial.Icon.gmd_sort) + icon = icon(R.drawable.ic_sort_24dp) } listPreference { @@ -136,6 +141,15 @@ class PreferencesFragment : BasePreferencesFragment() { key = PrefKeys.MAIN_NAV_POSITION setSummaryProvider { entry } setTitle(R.string.pref_main_nav_position) + icon = icon( + navigationPositionIcon( + sharedPrefs.getString(PrefKeys.MAIN_NAV_POSITION, "top").orEmpty() + ) + ) + setOnPreferenceChangeListener { _, newValue -> + icon = icon(navigationPositionIcon(newValue.toString())) + true + } } listPreference { @@ -285,6 +299,14 @@ class PreferencesFragment : BasePreferencesFragment() { } } + @DrawableRes private fun navigationPositionIcon(position: String): Int { + return if (position == "bottom") { + R.drawable.ic_bottom_navigation_24dp + } else { + R.drawable.ic_bottom_navigation_24dp_mirrored + } + } + override fun onResume() { super.onResume() requireActivity().setTitle(R.string.action_view_preferences) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt index 66a1c29f1..ddc9d914d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt @@ -33,7 +33,6 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener -import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.R import com.keylesspalace.tusky.StatusListActivity @@ -54,10 +53,6 @@ import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.util.visible import com.keylesspalace.tusky.viewdata.AttachmentViewData import com.keylesspalace.tusky.viewdata.StatusViewData -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.flow.collectLatest @@ -124,12 +119,6 @@ class ReportStatusesFragment : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.fragment_report_statuses, menu) - menu.findItem(R.id.action_refresh)?.apply { - icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt index d613d78d4..092b8c2d0 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt @@ -27,7 +27,6 @@ import androidx.lifecycle.lifecycleScope import androidx.paging.LoadState import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import com.google.android.material.color.MaterialColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.keylesspalace.tusky.BaseActivity import com.keylesspalace.tusky.R @@ -40,10 +39,6 @@ import com.keylesspalace.tusky.util.ensureBottomPadding import com.keylesspalace.tusky.util.hide import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.viewBinding -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.flow.collectLatest @@ -129,12 +124,6 @@ class ScheduledStatusActivity : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.activity_scheduled_status, menu) - menu.findItem(R.id.action_search)?.apply { - icon = IconicsDrawable(this@ScheduledStatusActivity, GoogleMaterial.Icon.gmd_search).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.includedToolbar.toolbar, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt index 7b6b3f3fd..336249f1c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt @@ -16,7 +16,6 @@ import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import androidx.swiperefreshlayout.widget.SwipeRefreshLayout -import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R @@ -30,10 +29,6 @@ import com.keylesspalace.tusky.util.ensureBottomPadding import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.util.visible -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.collectLatest @@ -113,12 +108,6 @@ abstract class SearchFragment : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.fragment_search, menu) - menu.findItem(R.id.action_refresh)?.apply { - icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/systemnotifications/NotificationService.kt b/app/src/main/java/com/keylesspalace/tusky/components/systemnotifications/NotificationService.kt index fd15cb6a8..b4ccdf9fc 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/systemnotifications/NotificationService.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/systemnotifications/NotificationService.kt @@ -389,7 +389,7 @@ class NotificationService @Inject constructor( val text = joinNames(activeNotifications, additionalNotifications) val summaryBuilder = NotificationCompat.Builder(context, typeChannelId) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setContentIntent(summaryResultPendingIntent) .setColor(context.getColor(R.color.notification_color)) .setAutoCancel(true) @@ -415,7 +415,7 @@ class NotificationService @Inject constructor( return NotificationCompat.Builder(context, CHANNEL_BACKGROUND_TASKS) .setContentTitle(title) .setTicker(title) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setOngoing(true) .build() } @@ -459,7 +459,7 @@ class NotificationService @Inject constructor( } val builder = NotificationCompat.Builder(context, channelId) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setContentIntent(eventResultPendingIntent) .setColor(context.getColor(R.color.notification_color)) .setAutoCancel(true) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt index 2b8469ee6..9dcb73894 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt @@ -36,7 +36,6 @@ import androidx.recyclerview.widget.SimpleItemAnimator import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener import at.connyduck.calladapter.networkresult.onFailure import at.connyduck.sparkbutton.helpers.Utils -import com.google.android.material.color.MaterialColors import com.google.android.material.snackbar.Snackbar import com.keylesspalace.tusky.R import com.keylesspalace.tusky.appstore.EventHub @@ -69,10 +68,6 @@ import com.keylesspalace.tusky.util.viewBinding import com.keylesspalace.tusky.viewdata.AttachmentViewData import com.keylesspalace.tusky.viewdata.StatusViewData import com.keylesspalace.tusky.viewdata.TranslationViewData -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.flow.collectLatest @@ -307,13 +302,6 @@ class TimelineFragment : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { if (isSwipeToRefreshEnabled) { menuInflater.inflate(R.menu.fragment_timeline, menu) - menu.findItem(R.id.action_refresh)?.apply { - icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { - sizeDp = 20 - colorInt = - MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary) - } - } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt index 44fd3bacd..bedb42821 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt @@ -275,8 +275,8 @@ class ViewThreadFragment : actionReveal.isVisible = revealButtonState != RevealButtonState.NO_BUTTON actionReveal.setIcon( when (revealButtonState) { - RevealButtonState.REVEAL -> R.drawable.ic_eye_24dp - else -> R.drawable.ic_hide_media_24dp + RevealButtonState.REVEAL -> R.drawable.ic_visibility_24dp + else -> R.drawable.ic_visibility_off_24dp } ) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt index 10301ca15..3be8fac01 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt @@ -32,7 +32,6 @@ import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.SimpleItemAnimator import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener -import com.google.android.material.color.MaterialColors import com.keylesspalace.tusky.BottomSheetActivity import com.keylesspalace.tusky.R import com.keylesspalace.tusky.StatusListActivity @@ -47,10 +46,6 @@ import com.keylesspalace.tusky.util.show import com.keylesspalace.tusky.util.startActivityWithSlideInAnimation import com.keylesspalace.tusky.util.unicodeWrap import com.keylesspalace.tusky.util.viewBinding -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizeDp import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject import kotlinx.coroutines.launch @@ -162,12 +157,6 @@ class ViewEditsFragment : override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) { menuInflater.inflate(R.menu.fragment_view_edits, menu) - menu.findItem(R.id.action_refresh)?.apply { - icon = IconicsDrawable(requireContext(), GoogleMaterial.Icon.gmd_refresh).apply { - sizeDp = 20 - colorInt = MaterialColors.getColor(binding.root, android.R.attr.textColorPrimary) - } - } } override fun onMenuItemSelected(menuItem: MenuItem): Boolean { diff --git a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt index 7facfaaf8..d504cc153 100644 --- a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt +++ b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt @@ -71,7 +71,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() { context, NotificationChannelData.MENTION.getChannelId(senderIdentifier) ) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setColor(context.getColor(R.color.tusky_blue)) .setGroup(senderFullName) .setDefaults(0) // We don't want this to make any sound or vibration @@ -116,7 +116,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() { context, NotificationChannelData.MENTION.getChannelId(senderIdentifier) ) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setColor(context.getColor(R.color.notification_color)) .setGroup(senderFullName) .setDefaults(0) // We don't want this to make any sound or vibration diff --git a/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt b/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt index 4d3d96cca..8d61330e6 100644 --- a/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt +++ b/app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt @@ -115,7 +115,7 @@ class SendStatusService : Service() { } val builder = NotificationCompat.Builder(this, CHANNEL_ID) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setContentTitle(getString(R.string.send_post_notification_title)) .setContentText(notificationText) .setProgress(1, 0, true) @@ -432,7 +432,7 @@ class SendStatusService : Service() { ) return NotificationCompat.Builder(this@SendStatusService, CHANNEL_ID) - .setSmallIcon(R.drawable.ic_notify) + .setSmallIcon(R.drawable.tusky_notification_icon) .setContentTitle(getString(title)) .setContentText(getString(content)) .setColor(getColor(R.color.notification_color)) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/IconUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/IconUtils.kt index 334f12fc4..0448892b1 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/IconUtils.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/IconUtils.kt @@ -21,20 +21,6 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.preference.PreferenceFragmentCompat import com.google.android.material.color.MaterialColors import com.keylesspalace.tusky.R -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.sizePx - -fun PreferenceFragmentCompat.icon(icon: GoogleMaterial.Icon): IconicsDrawable { - val context = requireContext() - return IconicsDrawable(context, icon).apply { - sizePx = context.resources.getDimensionPixelSize( - R.dimen.preference_icon_size - ) - colorInt = MaterialColors.getColor(context, R.attr.iconColor, Color.BLACK) - } -} fun PreferenceFragmentCompat.icon(icon: Int): Drawable? { val context = requireContext() diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt index b41b0e88c..e45a52fa9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.kt @@ -222,7 +222,7 @@ internal fun markupHiddenUrls(view: TextView, content: CharSequence): SpannableS // reinsert the span so it covers the original and the additional text spannableContent.setSpan(span, start, end + additionalText.length, 0) - val linkDrawable = AppCompatResources.getDrawable(view.context, R.drawable.ic_link)!! + val linkDrawable = AppCompatResources.getDrawable(view.context, R.drawable.ic_open_in_new_24dp)!! // ImageSpan does not always align the icon correctly in the line, let's use our custom emoji span for this val linkDrawableSpan = EmojiSpan(view) linkDrawableSpan.imageDrawable = linkDrawable diff --git a/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt index 4da9b16d4..0872a5602 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/SpanUtils.kt @@ -9,9 +9,9 @@ import android.text.style.DynamicDrawableSpan import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.text.style.URLSpan +import androidx.appcompat.content.res.AppCompatResources +import com.keylesspalace.tusky.R import com.keylesspalace.tusky.util.twittertext.Regex -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import java.util.regex.Pattern /** @@ -95,23 +95,34 @@ private fun Spannable.clearSpans(spanClass: Class) { } } +private val iconNameMapping: Map = mapOf( + "{{home}}" to R.drawable.ic_home_24dp, + "{{mail}}" to R.drawable.ic_mail_24dp, + "{{group}}" to R.drawable.ic_group_24dp, + "{{search}}" to R.drawable.ic_search_24dp, + "{{manage_accounts}}" to R.drawable.ic_manage_accounts_24dp, + "{{chevron_right}}" to R.drawable.ic_chevron_right_24dp, +) + /** - * Replaces text of the form [iconics name] with their spanned counterparts (ImageSpan). + * Replaces text of the form {{icon_name}} with their spanned counterparts (ImageSpan). Supported icon names are above. */ fun addDrawables(text: CharSequence, color: Int, size: Int, context: Context): Spannable { val builder = SpannableStringBuilder(text) - val pattern = Pattern.compile("\\[iconics ([0-9a-z_]+)]") - val matcher = pattern.matcher(builder) - while (matcher.find()) { - val resourceName = matcher.group(1) - ?: continue - - val drawable = IconicsDrawable(context, GoogleMaterial.getIcon(resourceName)) - drawable.setBounds(0, 0, size, size) - drawable.setTint(color) - - builder.setSpan(ImageSpan(drawable, DynamicDrawableSpan.ALIGN_BASELINE), matcher.start(), matcher.end(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + iconNameMapping.forEach { iconName, icon -> + var index = 0 + while (index < text.length - iconName.length && index != -1) { + index = text.indexOf(iconName, index) + + if (index != -1) { + val drawable = AppCompatResources.getDrawable(context, icon)!! + drawable.setBounds(0, 0, size, size) + drawable.setTint(color) + builder.setSpan(ImageSpan(drawable, DynamicDrawableSpan.ALIGN_CENTER), index, index + iconName.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + index += iconName.length + } + } } return builder diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt index 6210bba76..d73d9e87f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt @@ -262,8 +262,9 @@ class StatusViewHelper(private val itemView: View) { @DrawableRes private fun getLabelIcon(type: Attachment.Type): Int { return when (type) { - Attachment.Type.IMAGE -> R.drawable.ic_photo_24dp - Attachment.Type.GIFV, Attachment.Type.VIDEO -> R.drawable.ic_videocam_24dp + Attachment.Type.IMAGE -> R.drawable.ic_image_24dp + Attachment.Type.GIFV -> R.drawable.ic_gif_box_24dp + Attachment.Type.VIDEO -> R.drawable.ic_slideshow_24dp Attachment.Type.AUDIO -> R.drawable.ic_music_box_24dp else -> R.drawable.ic_attach_file_24dp } diff --git a/app/src/main/res/drawable/audio_file_preview.xml b/app/src/main/res/drawable/audio_file_preview.xml new file mode 100644 index 000000000..ea98404f6 --- /dev/null +++ b/app/src/main/res/drawable/audio_file_preview.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/bot_badge.xml b/app/src/main/res/drawable/bot_badge.xml index 6f857df56..17e92ac11 100644 --- a/app/src/main/res/drawable/bot_badge.xml +++ b/app/src/main/res/drawable/bot_badge.xml @@ -1,13 +1,13 @@ - - +android:width="24dp" +android:height="24dp" +android:viewportWidth="24" +android:viewportHeight="24"> + + diff --git a/app/src/main/res/drawable/heart_broken_24.xml b/app/src/main/res/drawable/heart_broken_24.xml deleted file mode 100644 index bf5c73062..000000000 --- a/app/src/main/res/drawable/heart_broken_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/help_24dp.xml b/app/src/main/res/drawable/help_24dp.xml deleted file mode 100644 index 7f116ea42..000000000 --- a/app/src/main/res/drawable/help_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml deleted file mode 100644 index 2239a4f45..000000000 --- a/app/src/main/res/drawable/ic_access_time.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_account_settings.xml b/app/src/main/res/drawable/ic_account_settings.xml deleted file mode 100644 index d13907dc5..000000000 --- a/app/src/main/res/drawable/ic_account_settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml new file mode 100644 index 000000000..9795fdbba --- /dev/null +++ b/app/src/main/res/drawable/ic_add_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_a_photo_32dp.xml b/app/src/main/res/drawable/ic_add_a_photo_32dp.xml deleted file mode 100644 index 172c5ace1..000000000 --- a/app/src/main/res/drawable/ic_add_a_photo_32dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_a_photo_32dp_filled.xml b/app/src/main/res/drawable/ic_add_a_photo_32dp_filled.xml new file mode 100644 index 000000000..a4cee9d03 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_a_photo_32dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_alert_circle.xml b/app/src/main/res/drawable/ic_alert_circle.xml deleted file mode 100644 index 4c894f0dc..000000000 --- a/app/src/main/res/drawable/ic_alert_circle.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml new file mode 100644 index 000000000..08ca46961 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_back_with_background.xml b/app/src/main/res/drawable/ic_arrow_back_with_background.xml deleted file mode 100644 index 5253e68ff..000000000 --- a/app/src/main/res/drawable/ic_arrow_back_with_background.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_down_24dp.xml new file mode 100644 index 000000000..9332234e4 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_drop_down_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_drop_up_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_up_24dp.xml new file mode 100644 index 000000000..917def92d --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_drop_up_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_at_18dp.xml b/app/src/main/res/drawable/ic_at_18dp.xml deleted file mode 100644 index ba41e91d1..000000000 --- a/app/src/main/res/drawable/ic_at_18dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_attach_file_24dp.xml b/app/src/main/res/drawable/ic_attach_file_24dp.xml index 806cac00e..020a0dc20 100644 --- a/app/src/main/res/drawable/ic_attach_file_24dp.xml +++ b/app/src/main/res/drawable/ic_attach_file_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M720,630Q720,734 647,807Q574,880 470,880Q366,880 293,807Q220,734 220,630L220,260Q220,185 272.5,132.5Q325,80 400,80Q475,80 527.5,132.5Q580,185 580,260L580,610Q580,656 548,688Q516,720 470,720Q424,720 392,688Q360,656 360,610L360,280Q360,263 371.5,251.5Q383,240 400,240Q417,240 428.5,251.5Q440,263 440,280L440,610Q440,623 448.5,631.5Q457,640 470,640Q483,640 491.5,631.5Q500,623 500,610L500,260Q499,218 470.5,189Q442,160 400,160Q358,160 329,189Q300,218 300,260L300,630Q299,701 349,750.5Q399,800 470,800Q540,800 589,750.5Q638,701 640,630L640,280Q640,263 651.5,251.5Q663,240 680,240Q697,240 708.5,251.5Q720,263 720,280L720,630Z"/> diff --git a/app/src/main/res/drawable/ic_block_24dp.xml b/app/src/main/res/drawable/ic_block_24dp.xml new file mode 100644 index 000000000..540750b3f --- /dev/null +++ b/app/src/main/res/drawable/ic_block_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_bookmark_24dp.xml b/app/src/main/res/drawable/ic_bookmark_24dp.xml index 803bca926..409ed9508 100644 --- a/app/src/main/res/drawable/ic_bookmark_24dp.xml +++ b/app/src/main/res/drawable/ic_bookmark_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M480,720L312,792Q272,809 236,785.5Q200,762 200,719L200,200Q200,167 223.5,143.5Q247,120 280,120L680,120Q713,120 736.5,143.5Q760,167 760,200L760,719Q760,762 724,785.5Q688,809 648,792L480,720ZM480,632L680,718Q680,718 680,718Q680,718 680,718L680,200Q680,200 680,200Q680,200 680,200L280,200Q280,200 280,200Q280,200 280,200L280,718Q280,718 280,718Q280,718 280,718L480,632ZM480,200L280,200Q280,200 280,200Q280,200 280,200L280,200Q280,200 280,200Q280,200 280,200L680,200Q680,200 680,200Q680,200 680,200L680,200Q680,200 680,200Q680,200 680,200L480,200Z"/> diff --git a/app/src/main/res/drawable/ic_bookmark_24dp_filled.xml b/app/src/main/res/drawable/ic_bookmark_24dp_filled.xml new file mode 100644 index 000000000..e71230119 --- /dev/null +++ b/app/src/main/res/drawable/ic_bookmark_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bookmark_active_24dp.xml b/app/src/main/res/drawable/ic_bookmark_active_24dp.xml deleted file mode 100644 index 217b78ba3..000000000 --- a/app/src/main/res/drawable/ic_bookmark_active_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_bot_24dp.xml b/app/src/main/res/drawable/ic_bot_24dp.xml index abb3efb44..37b3e9a02 100644 --- a/app/src/main/res/drawable/ic_bot_24dp.xml +++ b/app/src/main/res/drawable/ic_bot_24dp.xml @@ -1,8 +1,9 @@ - - - \ No newline at end of file + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + + diff --git a/app/src/main/res/drawable/ic_bottom_navigation_24dp.xml b/app/src/main/res/drawable/ic_bottom_navigation_24dp.xml new file mode 100644 index 000000000..4d26277c2 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_navigation_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_bottom_navigation_24dp_mirrored.xml b/app/src/main/res/drawable/ic_bottom_navigation_24dp_mirrored.xml new file mode 100644 index 000000000..99cb7da57 --- /dev/null +++ b/app/src/main/res/drawable/ic_bottom_navigation_24dp_mirrored.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_briefcase.xml b/app/src/main/res/drawable/ic_briefcase.xml deleted file mode 100644 index 6df5b88bd..000000000 --- a/app/src/main/res/drawable/ic_briefcase.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_bullhorn_24dp.xml b/app/src/main/res/drawable/ic_bullhorn_24dp.xml deleted file mode 100644 index e290b24ea..000000000 --- a/app/src/main/res/drawable/ic_bullhorn_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_campaign_24dp.xml b/app/src/main/res/drawable/ic_campaign_24dp.xml new file mode 100644 index 000000000..1383d5972 --- /dev/null +++ b/app/src/main/res/drawable/ic_campaign_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cancel_24dp.xml b/app/src/main/res/drawable/ic_cancel_24dp.xml deleted file mode 100644 index 7d2b57eb2..000000000 --- a/app/src/main/res/drawable/ic_cancel_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cancel_24dp_filled.xml b/app/src/main/res/drawable/ic_cancel_24dp_filled.xml new file mode 100644 index 000000000..55e2ec280 --- /dev/null +++ b/app/src/main/res/drawable/ic_cancel_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_24dp.xml b/app/src/main/res/drawable/ic_check_24dp.xml index 6541ee3e3..463d2847d 100644 --- a/app/src/main/res/drawable/ic_check_24dp.xml +++ b/app/src/main/res/drawable/ic_check_24dp.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + android:fillColor="@android:color/white" + android:pathData="M382,606L721,267Q733,255 749,255Q765,255 777,267Q789,279 789,295.5Q789,312 777,324L410,692Q398,704 382,704Q366,704 354,692L182,520Q170,508 170.5,491.5Q171,475 183,463Q195,451 211.5,451Q228,451 240,463L382,606Z"/> diff --git a/app/src/main/res/drawable/ic_check_32dp.xml b/app/src/main/res/drawable/ic_check_32dp.xml deleted file mode 100644 index 9325c89a2..000000000 --- a/app/src/main/res/drawable/ic_check_32dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_check_box_outline_blank_18dp.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_18dp.xml index cb610e2d4..0afb898ec 100644 --- a/app/src/main/res/drawable/ic_check_box_outline_blank_18dp.xml +++ b/app/src/main/res/drawable/ic_check_box_outline_blank_18dp.xml @@ -1,9 +1,9 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml deleted file mode 100644 index 602455078..000000000 --- a/app/src/main/res/drawable/ic_check_circle.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_trending_up_24px.xml b/app/src/main/res/drawable/ic_chevron_right_24dp.xml similarity index 60% rename from app/src/main/res/drawable/ic_trending_up_24px.xml rename to app/src/main/res/drawable/ic_chevron_right_24dp.xml index 95e98c210..3d036ecb1 100644 --- a/app/src/main/res/drawable/ic_trending_up_24px.xml +++ b/app/src/main/res/drawable/ic_chevron_right_24dp.xml @@ -1,11 +1,11 @@ + android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z"/> diff --git a/app/src/main/res/drawable/ic_clear_24dp.xml b/app/src/main/res/drawable/ic_clear_24dp.xml deleted file mode 100644 index 0a244b997..000000000 --- a/app/src/main/res/drawable/ic_clear_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml index 081e405f3..154493167 100644 --- a/app/src/main/res/drawable/ic_close_24dp.xml +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M480,536L284,732Q273,743 256,743Q239,743 228,732Q217,721 217,704Q217,687 228,676L424,480L228,284Q217,273 217,256Q217,239 228,228Q239,217 256,217Q273,217 284,228L480,424L676,228Q687,217 704,217Q721,217 732,228Q743,239 743,256Q743,273 732,284L536,480L732,676Q743,687 743,704Q743,721 732,732Q721,743 704,743Q687,743 676,732L480,536Z"/> diff --git a/app/src/main/res/drawable/ic_comments_disabled_24dp.xml b/app/src/main/res/drawable/ic_comments_disabled_24dp.xml new file mode 100644 index 000000000..ccde8bd12 --- /dev/null +++ b/app/src/main/res/drawable/ic_comments_disabled_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_content_copy_24.xml b/app/src/main/res/drawable/ic_content_copy_24.xml deleted file mode 100644 index bac0f6001..000000000 --- a/app/src/main/res/drawable/ic_content_copy_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_content_copy_24dp.xml b/app/src/main/res/drawable/ic_content_copy_24dp.xml new file mode 100644 index 000000000..fd3bfebeb --- /dev/null +++ b/app/src/main/res/drawable/ic_content_copy_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_create_24dp.xml b/app/src/main/res/drawable/ic_create_24dp.xml deleted file mode 100644 index d74fe13e6..000000000 --- a/app/src/main/res/drawable/ic_create_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cw_24dp.xml b/app/src/main/res/drawable/ic_cw_24dp.xml deleted file mode 100644 index 62713d711..000000000 --- a/app/src/main/res/drawable/ic_cw_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_developer_mode_24dp.xml b/app/src/main/res/drawable/ic_developer_mode_24dp.xml new file mode 100644 index 000000000..24aec79dc --- /dev/null +++ b/app/src/main/res/drawable/ic_developer_mode_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_done_outline_24dp.xml b/app/src/main/res/drawable/ic_done_outline_24dp.xml new file mode 100644 index 000000000..98a806390 --- /dev/null +++ b/app/src/main/res/drawable/ic_done_outline_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_download_24dp.xml b/app/src/main/res/drawable/ic_download_24dp.xml new file mode 100644 index 000000000..aaf739cd7 --- /dev/null +++ b/app/src/main/res/drawable/ic_download_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_drag_indicator_24dp.xml b/app/src/main/res/drawable/ic_drag_indicator_24dp.xml index ab9d5f320..76d427a61 100644 --- a/app/src/main/res/drawable/ic_drag_indicator_24dp.xml +++ b/app/src/main/res/drawable/ic_drag_indicator_24dp.xml @@ -1,9 +1,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M360,800Q327,800 303.5,776.5Q280,753 280,720Q280,687 303.5,663.5Q327,640 360,640Q393,640 416.5,663.5Q440,687 440,720Q440,753 416.5,776.5Q393,800 360,800ZM600,800Q567,800 543.5,776.5Q520,753 520,720Q520,687 543.5,663.5Q567,640 600,640Q633,640 656.5,663.5Q680,687 680,720Q680,753 656.5,776.5Q633,800 600,800ZM360,560Q327,560 303.5,536.5Q280,513 280,480Q280,447 303.5,423.5Q327,400 360,400Q393,400 416.5,423.5Q440,447 440,480Q440,513 416.5,536.5Q393,560 360,560ZM600,560Q567,560 543.5,536.5Q520,513 520,480Q520,447 543.5,423.5Q567,400 600,400Q633,400 656.5,423.5Q680,447 680,480Q680,513 656.5,536.5Q633,560 600,560ZM360,320Q327,320 303.5,296.5Q280,273 280,240Q280,207 303.5,183.5Q327,160 360,160Q393,160 416.5,183.5Q440,207 440,240Q440,273 416.5,296.5Q393,320 360,320ZM600,320Q567,320 543.5,296.5Q520,273 520,240Q520,207 543.5,183.5Q567,160 600,160Q633,160 656.5,183.5Q680,207 680,240Q680,273 656.5,296.5Q633,320 600,320Z" /> diff --git a/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml b/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml deleted file mode 100644 index e8be67fe7..000000000 --- a/app/src/main/res/drawable/ic_drag_indicator_horiz_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_edit_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml deleted file mode 100644 index 2844bafeb..000000000 --- a/app/src/main/res/drawable/ic_edit_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit_24dp_filled.xml b/app/src/main/res/drawable/ic_edit_24dp_filled.xml new file mode 100644 index 000000000..3afa4a45f --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_edit_document_24dp.xml b/app/src/main/res/drawable/ic_edit_document_24dp.xml new file mode 100644 index 000000000..4f3daf1ed --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_document_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_email_24dp.xml b/app/src/main/res/drawable/ic_email_24dp.xml deleted file mode 100644 index 1bcee1be0..000000000 --- a/app/src/main/res/drawable/ic_email_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_email_alternate_18dp.xml b/app/src/main/res/drawable/ic_email_alternate_18dp.xml new file mode 100644 index 000000000..4de005b74 --- /dev/null +++ b/app/src/main/res/drawable/ic_email_alternate_18dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_email_alternate_24dp.xml b/app/src/main/res/drawable/ic_email_alternate_24dp.xml new file mode 100644 index 000000000..f50ecd59f --- /dev/null +++ b/app/src/main/res/drawable/ic_email_alternate_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_emoji_24dp.xml b/app/src/main/res/drawable/ic_emoji_24dp.xml deleted file mode 100644 index 5a73c89d5..000000000 --- a/app/src/main/res/drawable/ic_emoji_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_error_24dp.xml b/app/src/main/res/drawable/ic_error_24dp.xml new file mode 100644 index 000000000..b47e21723 --- /dev/null +++ b/app/src/main/res/drawable/ic_error_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_eye_24dp.xml b/app/src/main/res/drawable/ic_eye_24dp.xml deleted file mode 100644 index 83a346372..000000000 --- a/app/src/main/res/drawable/ic_eye_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_favourite_24dp.xml b/app/src/main/res/drawable/ic_favourite_24dp.xml deleted file mode 100644 index 5826bf5a6..000000000 --- a/app/src/main/res/drawable/ic_favourite_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_favourite_active_24dp.xml b/app/src/main/res/drawable/ic_favourite_active_24dp.xml deleted file mode 100644 index 2eb3014f5..000000000 --- a/app/src/main/res/drawable/ic_favourite_active_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_feedback_24dp_filled.xml b/app/src/main/res/drawable/ic_feedback_24dp_filled.xml new file mode 100644 index 000000000..36843fa5a --- /dev/null +++ b/app/src/main/res/drawable/ic_feedback_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_file_download_black_24dp.xml b/app/src/main/res/drawable/ic_file_download_black_24dp.xml deleted file mode 100644 index f5f7221a9..000000000 --- a/app/src/main/res/drawable/ic_file_download_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_filter_24dp.xml b/app/src/main/res/drawable/ic_filter_24dp.xml deleted file mode 100644 index ccb8fd223..000000000 --- a/app/src/main/res/drawable/ic_filter_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_filter_alt_24dp.xml b/app/src/main/res/drawable/ic_filter_alt_24dp.xml new file mode 100644 index 000000000..b41088739 --- /dev/null +++ b/app/src/main/res/drawable/ic_filter_alt_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_flag_24dp.xml b/app/src/main/res/drawable/ic_flag_24dp.xml index 03df9261d..82d764e51 100644 --- a/app/src/main/res/drawable/ic_flag_24dp.xml +++ b/app/src/main/res/drawable/ic_flag_24dp.xml @@ -1,10 +1,11 @@ - + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorPrimary" + android:autoMirrored="true"> + diff --git a/app/src/main/res/drawable/ic_format_size_24dp.xml b/app/src/main/res/drawable/ic_format_size_24dp.xml new file mode 100644 index 000000000..d47b248a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_format_size_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_gavel_24dp.xml b/app/src/main/res/drawable/ic_gavel_24dp.xml index 674603600..1241d3bc5 100644 --- a/app/src/main/res/drawable/ic_gavel_24dp.xml +++ b/app/src/main/res/drawable/ic_gavel_24dp.xml @@ -1,11 +1,10 @@ - + android:viewportHeight="960" + android:tint="?attr/colorControlNormal"> + android:pathData="M200,760L600,760Q617,760 628.5,771.5Q640,783 640,800Q640,817 628.5,828.5Q617,840 600,840L200,840Q183,840 171.5,828.5Q160,817 160,800Q160,783 171.5,771.5Q183,760 200,760ZM329,589L216,476Q193,453 192.5,419.5Q192,386 215,363L244,334L472,560L443,589Q420,612 386,612Q352,612 329,589ZM640,392L414,164L443,135Q466,112 499.5,112.5Q533,113 556,136L669,249Q692,272 692,306Q692,340 669,363L640,392ZM796,772L302,278L358,222L852,716Q863,727 863,744Q863,761 852,772Q841,783 824,783Q807,783 796,772Z"/> diff --git a/app/src/main/res/drawable/ic_gif_box_24dp.xml b/app/src/main/res/drawable/ic_gif_box_24dp.xml new file mode 100644 index 000000000..0f5f82d5c --- /dev/null +++ b/app/src/main/res/drawable/ic_gif_box_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_group_24dp.xml b/app/src/main/res/drawable/ic_group_24dp.xml new file mode 100644 index 000000000..83a2acaa2 --- /dev/null +++ b/app/src/main/res/drawable/ic_group_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_group_24dp_filled.xml b/app/src/main/res/drawable/ic_group_24dp_filled.xml new file mode 100644 index 000000000..d87663e13 --- /dev/null +++ b/app/src/main/res/drawable/ic_group_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_hashtag.xml b/app/src/main/res/drawable/ic_hashtag.xml deleted file mode 100644 index c7a3bc010..000000000 --- a/app/src/main/res/drawable/ic_hashtag.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_heart_broken_24.xml b/app/src/main/res/drawable/ic_heart_broken_24.xml new file mode 100644 index 000000000..1fb2b7808 --- /dev/null +++ b/app/src/main/res/drawable/ic_heart_broken_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_help_24dp.xml b/app/src/main/res/drawable/ic_help_24dp.xml new file mode 100644 index 000000000..d83ffe70e --- /dev/null +++ b/app/src/main/res/drawable/ic_help_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_hide_media_24dp.xml b/app/src/main/res/drawable/ic_hide_media_24dp.xml deleted file mode 100644 index 106a53de5..000000000 --- a/app/src/main/res/drawable/ic_hide_media_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_24dp.xml b/app/src/main/res/drawable/ic_home_24dp.xml index 4c6bc0efc..ff9eaf816 100644 --- a/app/src/main/res/drawable/ic_home_24dp.xml +++ b/app/src/main/res/drawable/ic_home_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M240,760L360,760L360,560Q360,543 371.5,531.5Q383,520 400,520L560,520Q577,520 588.5,531.5Q600,543 600,560L600,760L720,760L720,400Q720,400 720,400Q720,400 720,400L480,220Q480,220 480,220Q480,220 480,220L240,400Q240,400 240,400Q240,400 240,400L240,760ZM160,760L160,400Q160,381 168.5,364Q177,347 192,336L432,156Q453,140 480,140Q507,140 528,156L768,336Q783,347 791.5,364Q800,381 800,400L800,760Q800,793 776.5,816.5Q753,840 720,840L560,840Q543,840 531.5,828.5Q520,817 520,800L520,600Q520,600 520,600Q520,600 520,600L440,600Q440,600 440,600Q440,600 440,600L440,800Q440,817 428.5,828.5Q417,840 400,840L240,840Q207,840 183.5,816.5Q160,793 160,760ZM480,490L480,490L480,490Q480,490 480,490Q480,490 480,490L480,490L480,490L480,490L480,490Q480,490 480,490Q480,490 480,490L480,490Q480,490 480,490Q480,490 480,490L480,490Z"/> diff --git a/app/src/main/res/drawable/ic_home_24dp_filled.xml b/app/src/main/res/drawable/ic_home_24dp_filled.xml new file mode 100644 index 000000000..0ecb61cd5 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_hot_24dp.xml b/app/src/main/res/drawable/ic_hot_24dp.xml deleted file mode 100644 index 9d4e6643f..000000000 --- a/app/src/main/res/drawable/ic_hot_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_image_24dp.xml b/app/src/main/res/drawable/ic_image_24dp.xml new file mode 100644 index 000000000..b75769c76 --- /dev/null +++ b/app/src/main/res/drawable/ic_image_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml new file mode 100644 index 000000000..270f23612 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_insert_chart_24dp.xml b/app/src/main/res/drawable/ic_insert_chart_24dp.xml new file mode 100644 index 000000000..269264346 --- /dev/null +++ b/app/src/main/res/drawable/ic_insert_chart_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_insert_chart_24dp_filled.xml b/app/src/main/res/drawable/ic_insert_chart_24dp_filled.xml new file mode 100644 index 000000000..bc1717484 --- /dev/null +++ b/app/src/main/res/drawable/ic_insert_chart_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml deleted file mode 100644 index 94455ebed..000000000 --- a/app/src/main/res/drawable/ic_link.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml deleted file mode 100644 index 4c2fb8834..000000000 --- a/app/src/main/res/drawable/ic_list.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_list_alt_24dp.xml b/app/src/main/res/drawable/ic_list_alt_24dp.xml new file mode 100644 index 000000000..26c550a83 --- /dev/null +++ b/app/src/main/res/drawable/ic_list_alt_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_list_alt_24dp_filled.xml b/app/src/main/res/drawable/ic_list_alt_24dp_filled.xml new file mode 100644 index 000000000..7dfdaf99b --- /dev/null +++ b/app/src/main/res/drawable/ic_list_alt_24dp_filled.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_24dp.xml b/app/src/main/res/drawable/ic_local_24dp.xml deleted file mode 100644 index 295300743..000000000 --- a/app/src/main/res/drawable/ic_local_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_local_fire_department_24dp.xml b/app/src/main/res/drawable/ic_local_fire_department_24dp.xml new file mode 100644 index 000000000..7a6e66780 --- /dev/null +++ b/app/src/main/res/drawable/ic_local_fire_department_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_local_fire_department_24dp_filled.xml b/app/src/main/res/drawable/ic_local_fire_department_24dp_filled.xml new file mode 100644 index 000000000..94d8bd32a --- /dev/null +++ b/app/src/main/res/drawable/ic_local_fire_department_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml new file mode 100644 index 000000000..53c25c17e --- /dev/null +++ b/app/src/main/res/drawable/ic_lock_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_lock_24dp_filled.xml b/app/src/main/res/drawable/ic_lock_24dp_filled.xml new file mode 100644 index 000000000..100d6996e --- /dev/null +++ b/app/src/main/res/drawable/ic_lock_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_lock_open_24dp.xml b/app/src/main/res/drawable/ic_lock_open_24dp.xml index 1e9d0db67..5a66a4c50 100644 --- a/app/src/main/res/drawable/ic_lock_open_24dp.xml +++ b/app/src/main/res/drawable/ic_lock_open_24dp.xml @@ -1,9 +1,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q438,120 406.5,145.5Q375,171 364,209Q360,223 347.5,231.5Q335,240 320,240Q303,240 291.5,229Q280,218 283,203Q297,134 352,87Q407,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800Z"/> diff --git a/app/src/main/res/drawable/ic_lock_outline_24dp.xml b/app/src/main/res/drawable/ic_lock_outline_24dp.xml deleted file mode 100644 index a8e4201d1..000000000 --- a/app/src/main/res/drawable/ic_lock_outline_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml deleted file mode 100644 index 717009ad9..000000000 --- a/app/src/main/res/drawable/ic_logout.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logout_24dp.xml b/app/src/main/res/drawable/ic_logout_24dp.xml new file mode 100644 index 000000000..1a951f94b --- /dev/null +++ b/app/src/main/res/drawable/ic_logout_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_mail_24dp.xml b/app/src/main/res/drawable/ic_mail_24dp.xml new file mode 100644 index 000000000..bf7ff491a --- /dev/null +++ b/app/src/main/res/drawable/ic_mail_24dp.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_mail_24dp_filled.xml b/app/src/main/res/drawable/ic_mail_24dp_filled.xml new file mode 100644 index 000000000..75a9dbef7 --- /dev/null +++ b/app/src/main/res/drawable/ic_mail_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_manage_accounts_24dp.xml b/app/src/main/res/drawable/ic_manage_accounts_24dp.xml new file mode 100644 index 000000000..a04d80053 --- /dev/null +++ b/app/src/main/res/drawable/ic_manage_accounts_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_menu_share_24dp.xml b/app/src/main/res/drawable/ic_menu_share_24dp.xml deleted file mode 100644 index dd1be97bf..000000000 --- a/app/src/main/res/drawable/ic_menu_share_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_missing_description_24dp.xml b/app/src/main/res/drawable/ic_missing_description_24dp.xml deleted file mode 100644 index 19d78d193..000000000 --- a/app/src/main/res/drawable/ic_missing_description_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_mood_24dp.xml b/app/src/main/res/drawable/ic_mood_24dp.xml new file mode 100644 index 000000000..ef0755ed2 --- /dev/null +++ b/app/src/main/res/drawable/ic_mood_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_more_horiz_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_24dp.xml index c77413395..577753b35 100644 --- a/app/src/main/res/drawable/ic_more_horiz_24dp.xml +++ b/app/src/main/res/drawable/ic_more_horiz_24dp.xml @@ -1,9 +1,9 @@ + android:width="28dp" + android:height="28dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M240,560Q207,560 183.5,536.5Q160,513 160,480Q160,447 183.5,423.5Q207,400 240,400Q273,400 296.5,423.5Q320,447 320,480Q320,513 296.5,536.5Q273,560 240,560ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM720,560Q687,560 663.5,536.5Q640,513 640,480Q640,447 663.5,423.5Q687,400 720,400Q753,400 776.5,423.5Q800,447 800,480Q800,513 776.5,536.5Q753,560 720,560Z"/> diff --git a/app/src/main/res/drawable/ic_more_vert_24dp.xml b/app/src/main/res/drawable/ic_more_vert_24dp.xml new file mode 100644 index 000000000..e4aa85d59 --- /dev/null +++ b/app/src/main/res/drawable/ic_more_vert_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_more_with_background.xml b/app/src/main/res/drawable/ic_more_with_background.xml deleted file mode 100644 index 72140f5a0..000000000 --- a/app/src/main/res/drawable/ic_more_with_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_music_box_24dp.xml b/app/src/main/res/drawable/ic_music_box_24dp.xml index c0243d935..693ff7099 100644 --- a/app/src/main/res/drawable/ic_music_box_24dp.xml +++ b/app/src/main/res/drawable/ic_music_box_24dp.xml @@ -1,8 +1,13 @@ - - - \ No newline at end of file + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + + + diff --git a/app/src/main/res/drawable/ic_music_box_preview_24dp.xml b/app/src/main/res/drawable/ic_music_box_preview_24dp.xml deleted file mode 100644 index 67901791a..000000000 --- a/app/src/main/res/drawable/ic_music_box_preview_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_mute_24dp.xml b/app/src/main/res/drawable/ic_mute_24dp.xml deleted file mode 100644 index bcdbb5a65..000000000 --- a/app/src/main/res/drawable/ic_mute_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_notebook.xml b/app/src/main/res/drawable/ic_notebook.xml deleted file mode 100644 index 93ff78919..000000000 --- a/app/src/main/res/drawable/ic_notebook.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notifications_24dp.xml b/app/src/main/res/drawable/ic_notifications_24dp.xml index d2f7aaca1..52b220221 100644 --- a/app/src/main/res/drawable/ic_notifications_24dp.xml +++ b/app/src/main/res/drawable/ic_notifications_24dp.xml @@ -1,9 +1,9 @@ - +android:width="24dp" +android:height="24dp" +android:viewportWidth="960" +android:viewportHeight="960"> + diff --git a/app/src/main/res/drawable/ic_notifications_24dp_filled.xml b/app/src/main/res/drawable/ic_notifications_24dp_filled.xml new file mode 100644 index 000000000..59b383c5c --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_notifications_active_24dp.xml b/app/src/main/res/drawable/ic_notifications_active_24dp.xml index 9a60daacf..1aadf8e39 100644 --- a/app/src/main/res/drawable/ic_notifications_active_24dp.xml +++ b/app/src/main/res/drawable/ic_notifications_active_24dp.xml @@ -1,13 +1,9 @@ - - + android:viewportWidth="960" + android:viewportHeight="960"> - - \ No newline at end of file + android:fillColor="#000" + android:pathData="M200,760Q183,760 171.5,748.5Q160,737 160,720Q160,703 171.5,691.5Q183,680 200,680L240,680L240,400Q240,317 290,252.5Q340,188 420,168L420,140Q420,115 437.5,97.5Q455,80 480,80Q505,80 522.5,97.5Q540,115 540,140L540,168Q620,188 670,252.5Q720,317 720,400L720,680L760,680Q777,680 788.5,691.5Q800,703 800,720Q800,737 788.5,748.5Q777,760 760,760L200,760ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM120,400Q103,400 91.5,387Q80,374 82,357Q90,282 124,217.5Q158,153 211,105Q224,94 240.5,95Q257,96 267,110Q277,124 275,140Q273,156 260,168Q221,205 196,254Q171,303 163,360Q161,377 149,388.5Q137,400 120,400ZM840,400Q823,400 811,388.5Q799,377 797,360Q789,303 764,254Q739,205 700,168Q687,156 685,140Q683,124 693,110Q703,96 719.5,95Q736,94 749,105Q802,153 836,217.5Q870,282 878,357Q880,374 868.5,387Q857,400 840,400Z"/> + diff --git a/app/src/main/res/drawable/ic_open_in_new_24dp.xml b/app/src/main/res/drawable/ic_open_in_new_24dp.xml new file mode 100644 index 000000000..e025076d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_open_in_new_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_palette_24dp.xml b/app/src/main/res/drawable/ic_palette_24dp.xml new file mode 100644 index 000000000..58c504c26 --- /dev/null +++ b/app/src/main/res/drawable/ic_palette_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_24dp.xml b/app/src/main/res/drawable/ic_person_24dp.xml new file mode 100644 index 000000000..117cdc7c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_person_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_add_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml deleted file mode 100644 index b42eb2f44..000000000 --- a/app/src/main/res/drawable/ic_person_add_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_person_add_24dp_mirrored.xml b/app/src/main/res/drawable/ic_person_add_24dp_mirrored.xml new file mode 100644 index 000000000..4a460af2d --- /dev/null +++ b/app/src/main/res/drawable/ic_person_add_24dp_mirrored.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_add_24dp_mirrored_filled.xml b/app/src/main/res/drawable/ic_person_add_24dp_mirrored_filled.xml new file mode 100644 index 000000000..4323a7ce9 --- /dev/null +++ b/app/src/main/res/drawable/ic_person_add_24dp_mirrored_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_remove_24dp.xml b/app/src/main/res/drawable/ic_person_remove_24dp.xml deleted file mode 100644 index 10332c28c..000000000 --- a/app/src/main/res/drawable/ic_person_remove_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_person_remove_24dp_mirrored.xml b/app/src/main/res/drawable/ic_person_remove_24dp_mirrored.xml new file mode 100644 index 000000000..242597f77 --- /dev/null +++ b/app/src/main/res/drawable/ic_person_remove_24dp_mirrored.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_photo_24dp.xml b/app/src/main/res/drawable/ic_photo_24dp.xml deleted file mode 100644 index d0ebff06e..000000000 --- a/app/src/main/res/drawable/ic_photo_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_photo_camera_24dp.xml b/app/src/main/res/drawable/ic_photo_camera_24dp.xml new file mode 100644 index 000000000..dfda72eec --- /dev/null +++ b/app/src/main/res/drawable/ic_photo_camera_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_indicator.xml b/app/src/main/res/drawable/ic_play_indicator.xml deleted file mode 100644 index 451e51ec1..000000000 --- a/app/src/main/res/drawable/ic_play_indicator.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_plus_24dp.xml b/app/src/main/res/drawable/ic_plus_24dp.xml deleted file mode 100644 index 2ba0da888..000000000 --- a/app/src/main/res/drawable/ic_plus_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_poll_24dp.xml b/app/src/main/res/drawable/ic_poll_24dp.xml deleted file mode 100644 index dd0c4abe9..000000000 --- a/app/src/main/res/drawable/ic_poll_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_public_24dp.xml b/app/src/main/res/drawable/ic_public_24dp.xml index 6ef182e6f..d987f13de 100644 --- a/app/src/main/res/drawable/ic_public_24dp.xml +++ b/app/src/main/res/drawable/ic_public_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM440,798L440,720Q407,720 383.5,696.5Q360,673 360,640L360,600L168,408Q165,426 162.5,444Q160,462 160,480Q160,601 239.5,692Q319,783 440,798ZM716,696Q757,651 778.5,595.5Q800,540 800,480Q800,382 745.5,301Q691,220 600,184L600,200Q600,233 576.5,256.5Q553,280 520,280L440,280L440,360Q440,377 428.5,388.5Q417,400 400,400L320,400L320,480L560,480Q577,480 588.5,491.5Q600,503 600,520L600,640L640,640Q666,640 687,655.5Q708,671 716,696Z"/> diff --git a/app/src/main/res/drawable/ic_radio_button_unchecked_18dp.xml b/app/src/main/res/drawable/ic_radio_button_unchecked_18dp.xml index 160b2375e..5b13b7937 100644 --- a/app/src/main/res/drawable/ic_radio_button_unchecked_18dp.xml +++ b/app/src/main/res/drawable/ic_radio_button_unchecked_18dp.xml @@ -1,9 +1,9 @@ - + android:viewportWidth="960" + android:viewportHeight="960"> + diff --git a/app/src/main/res/drawable/ic_reblog_18dp.xml b/app/src/main/res/drawable/ic_reblog_18dp.xml deleted file mode 100644 index 029e71198..000000000 --- a/app/src/main/res/drawable/ic_reblog_18dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_reblog_24dp.xml b/app/src/main/res/drawable/ic_reblog_24dp.xml deleted file mode 100644 index 0fe908eda..000000000 --- a/app/src/main/res/drawable/ic_reblog_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_reblog_active_24dp.xml b/app/src/main/res/drawable/ic_reblog_active_24dp.xml deleted file mode 100644 index 48d987fe9..000000000 --- a/app/src/main/res/drawable/ic_reblog_active_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_reblog_direct_24dp.xml b/app/src/main/res/drawable/ic_reblog_direct_24dp.xml index 0f53287da..bf7ff491a 100644 --- a/app/src/main/res/drawable/ic_reblog_direct_24dp.xml +++ b/app/src/main/res/drawable/ic_reblog_direct_24dp.xml @@ -2,9 +2,9 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM800,320L501,507Q496,510 490.5,511.5Q485,513 480,513Q475,513 469.5,511.5Q464,510 459,507L160,320L160,720Q160,720 160,720Q160,720 160,720L800,720Q800,720 800,720Q800,720 800,720L800,320ZM480,440L800,240L160,240L480,440ZM160,320L160,330Q160,325 160,317.5Q160,310 160,301Q160,281 160,271Q160,261 160,272L160,240L160,240L160,272Q160,261 160,271.5Q160,282 160,301Q160,311 160,318.5Q160,326 160,330L160,320L160,720Q160,720 160,720Q160,720 160,720L160,720Q160,720 160,720Q160,720 160,720L160,320Z"/> diff --git a/app/src/main/res/drawable/ic_reblog_private_24dp.xml b/app/src/main/res/drawable/ic_reblog_private_24dp.xml deleted file mode 100644 index 078eaf7a4..000000000 --- a/app/src/main/res/drawable/ic_reblog_private_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml b/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml deleted file mode 100644 index 48b7351c8..000000000 --- a/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_reject_24dp.xml b/app/src/main/res/drawable/ic_reject_24dp.xml deleted file mode 100644 index d11cc5c9c..000000000 --- a/app/src/main/res/drawable/ic_reject_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_repeat_18dp.xml b/app/src/main/res/drawable/ic_repeat_18dp.xml new file mode 100644 index 000000000..a172c47d6 --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_18dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_repeat_24dp.xml b/app/src/main/res/drawable/ic_repeat_24dp.xml index aaa76ae0c..81c58bc57 100644 --- a/app/src/main/res/drawable/ic_repeat_24dp.xml +++ b/app/src/main/res/drawable/ic_repeat_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="?android:attr/textColorTertiary" + android:pathData="M274,760L308,794Q320,806 319.5,822Q319,838 308,850Q296,862 279.5,862.5Q263,863 251,851L148,748Q142,742 139.5,735Q137,728 137,720Q137,712 139.5,705Q142,698 148,692L251,589Q263,577 279.5,577.5Q296,578 308,590Q319,602 319.5,618Q320,634 308,646L274,680L680,680Q680,680 680,680Q680,680 680,680L680,560Q680,543 691.5,531.5Q703,520 720,520Q737,520 748.5,531.5Q760,543 760,560L760,680Q760,713 736.5,736.5Q713,760 680,760L274,760ZM686,280L280,280Q280,280 280,280Q280,280 280,280L280,400Q280,417 268.5,428.5Q257,440 240,440Q223,440 211.5,428.5Q200,417 200,400L200,280Q200,247 223.5,223.5Q247,200 280,200L686,200L652,166Q640,154 640.5,138Q641,122 652,110Q664,98 680.5,97.5Q697,97 709,109L812,212Q818,218 820.5,225Q823,232 823,240Q823,248 820.5,255Q818,262 812,268L709,371Q697,383 680.5,382.5Q664,382 652,370Q641,358 640.5,342Q640,326 652,314L686,280Z"/> diff --git a/app/src/main/res/drawable/ic_repeat_active_24dp.xml b/app/src/main/res/drawable/ic_repeat_active_24dp.xml new file mode 100644 index 000000000..cbf204e5f --- /dev/null +++ b/app/src/main/res/drawable/ic_repeat_active_24dp.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/ic_reply_18dp.xml b/app/src/main/res/drawable/ic_reply_18dp.xml index 234bc07dc..d5ea6d264 100644 --- a/app/src/main/res/drawable/ic_reply_18dp.xml +++ b/app/src/main/res/drawable/ic_reply_18dp.xml @@ -1,10 +1,10 @@ - +android:width="18dp" +android:height="18dp" +android:viewportWidth="960" +android:viewportHeight="960" +android:autoMirrored="true"> + diff --git a/app/src/main/res/drawable/ic_reply_24dp.xml b/app/src/main/res/drawable/ic_reply_24dp.xml index 6085ff0b4..e74cdf22d 100644 --- a/app/src/main/res/drawable/ic_reply_24dp.xml +++ b/app/src/main/res/drawable/ic_reply_24dp.xml @@ -1,10 +1,10 @@ + android:viewportWidth="960" + android:viewportHeight="960" + android:autoMirrored="true"> + android:pathData="M273,480L389,596Q401,608 400.5,624Q400,640 388,652Q376,663 360,663.5Q344,664 332,652L148,468Q136,456 136,440Q136,424 148,412L332,228Q343,217 359.5,217Q376,217 388,228Q400,240 400,256.5Q400,273 388,285L273,400L640,400Q723,400 781.5,458.5Q840,517 840,600L840,720Q840,737 828.5,748.5Q817,760 800,760Q783,760 771.5,748.5Q760,737 760,720L760,600Q760,550 725,515Q690,480 640,480L273,480Z"/> diff --git a/app/src/main/res/drawable/ic_reply_all_24dp.xml b/app/src/main/res/drawable/ic_reply_all_24dp.xml index 7da7c05fe..d5481c5d8 100644 --- a/app/src/main/res/drawable/ic_reply_all_24dp.xml +++ b/app/src/main/res/drawable/ic_reply_all_24dp.xml @@ -1,10 +1,10 @@ + android:viewportWidth="960" + android:viewportHeight="960" + android:autoMirrored="true"> + android:pathData="M193,440L349,596Q361,608 360.5,624Q360,640 348,652Q336,663 320,663.5Q304,664 292,652L108,468Q102,462 99.5,455Q97,448 97,440Q97,432 99.5,425Q102,418 108,412L292,228Q303,217 319.5,217Q336,217 348,228Q360,240 360,256.5Q360,273 348,285L193,440ZM433,480L549,596Q561,608 560.5,624Q560,640 548,652Q536,663 520,663.5Q504,664 492,652L308,468Q302,462 299.5,455Q297,448 297,440Q297,432 299.5,425Q302,418 308,412L492,228Q503,217 519.5,217Q536,217 548,228Q560,240 560,256.5Q560,273 548,285L433,400L680,400Q763,400 821.5,458.5Q880,517 880,600L880,720Q880,737 868.5,748.5Q857,760 840,760Q823,760 811.5,748.5Q800,737 800,720L800,600Q800,550 765,515Q730,480 680,480L433,480Z"/> diff --git a/app/src/main/res/drawable/ic_schedule_24dp.xml b/app/src/main/res/drawable/ic_schedule_24dp.xml new file mode 100644 index 000000000..488a90106 --- /dev/null +++ b/app/src/main/res/drawable/ic_schedule_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml new file mode 100644 index 000000000..774ef0c6a --- /dev/null +++ b/app/src/main/res/drawable/ic_search_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_send_24dp.xml b/app/src/main/res/drawable/ic_send_24dp.xml index 8916aa932..d1f7f13fe 100644 --- a/app/src/main/res/drawable/ic_send_24dp.xml +++ b/app/src/main/res/drawable/ic_send_24dp.xml @@ -1,10 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:autoMirrored="true"> + android:pathData="M792,517L176,777Q156,785 138,773.5Q120,762 120,740L120,220Q120,198 138,186.5Q156,175 176,183L792,443Q817,454 817,480Q817,506 792,517ZM200,680L674,480L200,280L200,420L440,480L200,540L200,680ZM200,680L200,480L200,280L200,420L200,420L200,540L200,540L200,680Z"/> diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml new file mode 100644 index 000000000..93f66c909 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml new file mode 100644 index 000000000..1169f8277 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_slideshow_24dp.xml b/app/src/main/res/drawable/ic_slideshow_24dp.xml new file mode 100644 index 000000000..5d34c0a68 --- /dev/null +++ b/app/src/main/res/drawable/ic_slideshow_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_sort_24dp.xml b/app/src/main/res/drawable/ic_sort_24dp.xml new file mode 100644 index 000000000..0faf7a3b0 --- /dev/null +++ b/app/src/main/res/drawable/ic_sort_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_spellcheck_24dp.xml b/app/src/main/res/drawable/ic_spellcheck_24dp.xml new file mode 100644 index 000000000..3a4363c0a --- /dev/null +++ b/app/src/main/res/drawable/ic_spellcheck_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_star_24dp.xml b/app/src/main/res/drawable/ic_star_24dp.xml index 868914287..5af9a0618 100644 --- a/app/src/main/res/drawable/ic_star_24dp.xml +++ b/app/src/main/res/drawable/ic_star_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + android:fillColor="?android:attr/textColorTertiary" + android:pathData="M354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM480,691L314,791Q303,798 291,797Q279,796 270,789Q261,782 256,771.5Q251,761 254,748L298,559L151,432Q141,423 138.5,411.5Q136,400 140,389Q144,378 152,371Q160,364 174,362L368,345L443,167Q448,155 458.5,149Q469,143 480,143Q491,143 501.5,149Q512,155 517,167L592,345L786,362Q800,364 808,371Q816,378 820,389Q824,400 821.5,411.5Q819,423 809,432L662,559L706,748Q709,761 704,771.5Q699,782 690,789Q681,796 669,797Q657,798 646,791L480,691ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z"/> diff --git a/app/src/main/res/drawable/ic_star_24dp_filled.xml b/app/src/main/res/drawable/ic_star_24dp_filled.xml new file mode 100644 index 000000000..33bc486d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_star_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_tabs.xml rename to app/src/main/res/drawable/ic_tabs_24dp.xml diff --git a/app/src/main/res/drawable/ic_tag_24dp.xml b/app/src/main/res/drawable/ic_tag_24dp.xml new file mode 100644 index 000000000..26ad012a7 --- /dev/null +++ b/app/src/main/res/drawable/ic_tag_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_translate_24dp.xml b/app/src/main/res/drawable/ic_translate_24dp.xml new file mode 100644 index 000000000..22acb3da5 --- /dev/null +++ b/app/src/main/res/drawable/ic_translate_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_trip_24dp.xml b/app/src/main/res/drawable/ic_trip_24dp.xml new file mode 100644 index 000000000..32408118a --- /dev/null +++ b/app/src/main/res/drawable/ic_trip_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_unmute_24dp.xml b/app/src/main/res/drawable/ic_unmute_24dp.xml deleted file mode 100644 index fe37f7fb1..000000000 --- a/app/src/main/res/drawable/ic_unmute_24dp.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_verified_18dp.xml b/app/src/main/res/drawable/ic_verified_18dp.xml new file mode 100644 index 000000000..5d0abca4e --- /dev/null +++ b/app/src/main/res/drawable/ic_verified_18dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_videocam_24dp.xml b/app/src/main/res/drawable/ic_videocam_24dp.xml deleted file mode 100644 index 1614d0261..000000000 --- a/app/src/main/res/drawable/ic_videocam_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_visibility_24dp.xml b/app/src/main/res/drawable/ic_visibility_24dp.xml new file mode 100644 index 000000000..257442183 --- /dev/null +++ b/app/src/main/res/drawable/ic_visibility_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_visibility_off_24dp.xml b/app/src/main/res/drawable/ic_visibility_off_24dp.xml new file mode 100644 index 000000000..5bad7bf7c --- /dev/null +++ b/app/src/main/res/drawable/ic_visibility_off_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_volume_off_24dp.xml b/app/src/main/res/drawable/ic_volume_off_24dp.xml new file mode 100644 index 000000000..3cf9a4c18 --- /dev/null +++ b/app/src/main/res/drawable/ic_volume_off_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_volume_up_24dp.xml b/app/src/main/res/drawable/ic_volume_up_24dp.xml new file mode 100644 index 000000000..e22ac78cd --- /dev/null +++ b/app/src/main/res/drawable/ic_volume_up_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_whatshot_24dp.xml b/app/src/main/res/drawable/ic_whatshot_24dp.xml new file mode 100644 index 000000000..d6c624fec --- /dev/null +++ b/app/src/main/res/drawable/ic_whatshot_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_whatshot_24dp_filled.xml b/app/src/main/res/drawable/ic_whatshot_24dp_filled.xml new file mode 100644 index 000000000..80c9b2b0a --- /dev/null +++ b/app/src/main/res/drawable/ic_whatshot_24dp_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_zoom_in_24dp.xml b/app/src/main/res/drawable/ic_zoom_in_24dp.xml new file mode 100644 index 000000000..7bcddbd35 --- /dev/null +++ b/app/src/main/res/drawable/ic_zoom_in_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_zoom_out_24dp.xml b/app/src/main/res/drawable/ic_zoom_out_24dp.xml new file mode 100644 index 000000000..02977f8e0 --- /dev/null +++ b/app/src/main/res/drawable/ic_zoom_out_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/info_24dp.xml b/app/src/main/res/drawable/info_24dp.xml deleted file mode 100644 index 0f7a508f3..000000000 --- a/app/src/main/res/drawable/info_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/launcher_foreground.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_foreground.xml rename to app/src/main/res/drawable/launcher_foreground.xml diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/launcher_monochrome.xml similarity index 100% rename from app/src/main/res/drawable/ic_launcher_monochrome.xml rename to app/src/main/res/drawable/launcher_monochrome.xml diff --git a/app/src/main/res/drawable/play_indicator.xml b/app/src/main/res/drawable/play_indicator.xml new file mode 100644 index 000000000..48a2ea5ae --- /dev/null +++ b/app/src/main/res/drawable/play_indicator.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/profile_badge_person_24dp.xml b/app/src/main/res/drawable/profile_badge_person_24dp.xml deleted file mode 100644 index 628c29de0..000000000 --- a/app/src/main/res/drawable/profile_badge_person_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/spellcheck.xml b/app/src/main/res/drawable/spellcheck.xml deleted file mode 100644 index 79f2251c1..000000000 --- a/app/src/main/res/drawable/spellcheck.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_splash.xml b/app/src/main/res/drawable/splashscreen.xml similarity index 76% rename from app/src/main/res/drawable/ic_splash.xml rename to app/src/main/res/drawable/splashscreen.xml index 90d7ab930..00cd63dfa 100644 --- a/app/src/main/res/drawable/ic_splash.xml +++ b/app/src/main/res/drawable/splashscreen.xml @@ -6,6 +6,6 @@ + android:drawable="@drawable/launcher_foreground" /> - \ No newline at end of file + diff --git a/app/src/main/res/drawable/tab_icon_bookmarks.xml b/app/src/main/res/drawable/tab_icon_bookmarks.xml new file mode 100644 index 000000000..63425b269 --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_bookmarks.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_direct.xml b/app/src/main/res/drawable/tab_icon_direct.xml new file mode 100644 index 000000000..f11451877 --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_direct.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_home.xml b/app/src/main/res/drawable/tab_icon_home.xml new file mode 100644 index 000000000..69002a0a0 --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_home.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_list.xml b/app/src/main/res/drawable/tab_icon_list.xml new file mode 100644 index 000000000..9eb0b18aa --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_list.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_local.xml b/app/src/main/res/drawable/tab_icon_local.xml new file mode 100644 index 000000000..587d8c1fc --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_local.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_notifications.xml b/app/src/main/res/drawable/tab_icon_notifications.xml new file mode 100644 index 000000000..6584f2991 --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_notifications.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_trending_posts.xml b/app/src/main/res/drawable/tab_icon_trending_posts.xml new file mode 100644 index 000000000..8316cb91d --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_trending_posts.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/tab_icon_trending_tags.xml b/app/src/main/res/drawable/tab_icon_trending_tags.xml new file mode 100644 index 000000000..80e484e64 --- /dev/null +++ b/app/src/main/res/drawable/tab_icon_trending_tags.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/toolbar_icon_arrow_back_with_background.xml b/app/src/main/res/drawable/toolbar_icon_arrow_back_with_background.xml new file mode 100644 index 000000000..2fa0942f1 --- /dev/null +++ b/app/src/main/res/drawable/toolbar_icon_arrow_back_with_background.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/toolbar_icon_more_with_background.xml b/app/src/main/res/drawable/toolbar_icon_more_with_background.xml new file mode 100644 index 000000000..6fe3ce784 --- /dev/null +++ b/app/src/main/res/drawable/toolbar_icon_more_with_background.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_notify.xml b/app/src/main/res/drawable/tusky_notification_icon.xml similarity index 100% rename from app/src/main/res/drawable/ic_notify.xml rename to app/src/main/res/drawable/tusky_notification_icon.xml diff --git a/app/src/main/res/drawable/ic_quicksettings.xml b/app/src/main/res/drawable/tusky_quicksettings_icon.xml similarity index 100% rename from app/src/main/res/drawable/ic_quicksettings.xml rename to app/src/main/res/drawable/tusky_quicksettings_icon.xml diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 9bfecc633..e891a4a12 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -124,7 +124,7 @@ android:contentDescription="@string/about_copy" app:layout_constraintBottom_toBottomOf="@+id/accountInfo" app:layout_constraintEnd_toEndOf="parent" - app:srcCompat="@drawable/ic_content_copy_24" /> + app:srcCompat="@drawable/ic_content_copy_24dp" /> @@ -282,7 +283,7 @@ android:layout_marginTop="8dp" android:drawablePadding="6dp" android:textSize="?attr/status_text_medium" - app:drawableStartCompat="@drawable/ic_briefcase" + app:drawableStartCompat="@drawable/ic_trip_24dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="Account has moved" /> @@ -473,7 +474,7 @@ android:layout_gravity="bottom|end" android:layout_margin="16dp" android:contentDescription="@string/action_mention" - app:srcCompat="@drawable/ic_create_24dp" + app:srcCompat="@drawable/ic_edit_24dp_filled" app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml index c3cfc3e1f..571740e84 100644 --- a/app/src/main/res/layout/activity_compose.xml +++ b/app/src/main/res/layout/activity_compose.xml @@ -39,29 +39,25 @@ android:textStyle="bold" app:tooltipText="@string/description_post_language" /> - + app:srcCompat="@drawable/ic_email_alternate_24dp" /> - + app:srcCompat="@drawable/ic_tag_24dp" /> @@ -226,7 +222,9 @@ android:drawablePadding="8dp" android:padding="8dp" android:text="@string/action_photo_take" - android:textSize="?attr/status_text_medium" /> + android:textSize="?attr/status_text_medium" + app:drawableStartCompat="@drawable/ic_photo_camera_24dp" + app:drawableTint="?android:attr/textColorTertiary" /> + android:textSize="?attr/status_text_medium" + app:drawableStartCompat="@drawable/ic_image_24dp" + app:drawableTint="?android:attr/textColorTertiary" /> + android:textSize="?attr/status_text_medium" + app:drawableStartCompat="@drawable/ic_insert_chart_24dp" + app:drawableTint="?android:attr/textColorTertiary" /> @@ -334,7 +336,7 @@ android:contentDescription="@string/action_hide_media" android:padding="4dp" app:tooltipText="@string/action_hide_media" - tools:src="@drawable/ic_eye_24dp" /> + tools:src="@drawable/ic_visibility_24dp" /> + app:iconGravity="textStart" + app:iconSize="24dp" /> diff --git a/app/src/main/res/layout/activity_edit_filter.xml b/app/src/main/res/layout/activity_edit_filter.xml index 2b104ab68..08fed6c7a 100644 --- a/app/src/main/res/layout/activity_edit_filter.xml +++ b/app/src/main/res/layout/activity_edit_filter.xml @@ -60,7 +60,7 @@ android:text="@string/action_add" android:textColor="?attr/colorOnPrimary" app:chipBackgroundColor="?attr/colorPrimary" - app:chipIcon="@drawable/ic_plus_24dp" + app:chipIcon="@drawable/ic_add_24dp" app:chipIconEnabled="true" app:chipIconTint="?attr/colorOnPrimary" app:chipStrokeWidth="0dp" diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml index 54057fdb4..d147f33af 100644 --- a/app/src/main/res/layout/activity_edit_profile.xml +++ b/app/src/main/res/layout/activity_edit_profile.xml @@ -36,7 +36,7 @@ android:background="#66000000" android:contentDescription="@string/label_header" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_add_a_photo_32dp" /> + app:srcCompat="@drawable/ic_add_a_photo_32dp_filled" /> + app:srcCompat="@drawable/ic_add_a_photo_32dp_filled" /> + android:text="@string/profile_metadata_add" + app:icon="@drawable/ic_add_24dp" + app:iconTint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/activity_filters.xml index 0c0892744..096473090 100644 --- a/app/src/main/res/layout/activity_filters.xml +++ b/app/src/main/res/layout/activity_filters.xml @@ -53,7 +53,7 @@ android:contentDescription="@string/filter_addition_title" app:layout_anchor="@id/filtersList" app:layout_anchorGravity="bottom|end" - app:srcCompat="@drawable/ic_plus_24dp" + app:srcCompat="@drawable/ic_add_24dp" app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_followed_tags.xml b/app/src/main/res/layout/activity_followed_tags.xml index 1b3fdcb2f..1ec058051 100644 --- a/app/src/main/res/layout/activity_followed_tags.xml +++ b/app/src/main/res/layout/activity_followed_tags.xml @@ -44,7 +44,7 @@ android:layout_gravity="bottom|end" android:layout_margin="16dp" android:contentDescription="@string/action_follow_hashtag" - app:srcCompat="@drawable/ic_hashtag" + app:srcCompat="@drawable/ic_tag_24dp" app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_lists.xml b/app/src/main/res/layout/activity_lists.xml index eff66dfe5..01f295674 100644 --- a/app/src/main/res/layout/activity_lists.xml +++ b/app/src/main/res/layout/activity_lists.xml @@ -64,7 +64,7 @@ android:contentDescription="@string/action_create_list" app:layout_anchor="@id/listsRecycler" app:layout_anchorGravity="bottom|end" - app:srcCompat="@drawable/ic_plus_24dp" + app:srcCompat="@drawable/ic_add_24dp" app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_login_webview.xml b/app/src/main/res/layout/activity_login_webview.xml index e14e86d84..dcada4ed9 100644 --- a/app/src/main/res/layout/activity_login_webview.xml +++ b/app/src/main/res/layout/activity_login_webview.xml @@ -48,7 +48,7 @@ android:lineSpacingMultiplier="1.1" android:paddingHorizontal="24dp" android:paddingVertical="12dp" - app:drawableStartCompat="@drawable/info_24dp" + app:drawableStartCompat="@drawable/ic_info_24dp" tools:text="By logging in you agree to the rules of instance.example" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e16683cf5..e2682ef95 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -99,7 +99,7 @@ android:contentDescription="@string/action_compose" app:layout_anchor="@id/viewPager" app:layout_anchorGravity="bottom|end" - app:srcCompat="@drawable/ic_create_24dp" + app:srcCompat="@drawable/ic_edit_24dp_filled" app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/activity_tab_preference.xml b/app/src/main/res/layout/activity_tab_preference.xml index 8161b1fc1..ca39ca4fd 100644 --- a/app/src/main/res/layout/activity_tab_preference.xml +++ b/app/src/main/res/layout/activity_tab_preference.xml @@ -29,7 +29,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fabMargin" android:contentDescription="@string/action_add_tab" - app:srcCompat="@drawable/ic_plus_24dp" + app:srcCompat="@drawable/ic_add_24dp" app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/layout/fragment_view_image.xml b/app/src/main/res/layout/fragment_view_image.xml index 14dbfe42c..7c3b573ad 100644 --- a/app/src/main/res/layout/fragment_view_image.xml +++ b/app/src/main/res/layout/fragment_view_image.xml @@ -49,14 +49,10 @@ app:behavior_peekHeight="@dimen/media_description_sheet_peek_height" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> - + + app:srcCompat="@drawable/ic_close_24dp" /> diff --git a/app/src/main/res/layout/item_announcement.xml b/app/src/main/res/layout/item_announcement.xml index e0b95851d..ff5b4ea69 100644 --- a/app/src/main/res/layout/item_announcement.xml +++ b/app/src/main/res/layout/item_announcement.xml @@ -33,7 +33,7 @@ android:contentDescription="@string/action_add_reaction" android:textColor="?attr/colorOnPrimary" app:chipBackgroundColor="?attr/colorPrimary" - app:chipIcon="@drawable/ic_plus_24dp" + app:chipIcon="@drawable/ic_add_24dp" app:chipIconTint="?attr/colorOnPrimary" app:chipStrokeWidth="0dp" app:closeIconEnabled="false" diff --git a/app/src/main/res/layout/item_blocked_domain.xml b/app/src/main/res/layout/item_blocked_domain.xml index e043e1a3b..ee65f6364 100644 --- a/app/src/main/res/layout/item_blocked_domain.xml +++ b/app/src/main/res/layout/item_blocked_domain.xml @@ -21,7 +21,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_unmute" android:padding="4dp" - app:srcCompat="@drawable/ic_unmute_24dp" + app:srcCompat="@drawable/ic_volume_up_24dp" /> + app:srcCompat="@drawable/ic_close_24dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml index a88789a23..9d13f84f6 100644 --- a/app/src/main/res/layout/item_conversation.xml +++ b/app/src/main/res/layout/item_conversation.xml @@ -287,9 +287,9 @@ app:layout_constraintEnd_toStartOf="@id/status_bookmark" app:layout_constraintStart_toEndOf="@id/status_reply" app:layout_constraintTop_toTopOf="@id/status_reply" - sparkbutton:activeImage="@drawable/ic_favourite_active_24dp" - sparkbutton:iconSize="28dp" - sparkbutton:inactiveImage="@drawable/ic_favourite_24dp" + sparkbutton:activeImage="@drawable/ic_star_24dp_filled" + sparkbutton:iconSize="24dp" + sparkbutton:inactiveImage="@drawable/ic_star_24dp" sparkbutton:primaryColor="@color/tusky_orange" sparkbutton:secondaryColor="@color/tusky_orange_light" /> @@ -303,10 +303,10 @@ app:layout_constraintEnd_toStartOf="@id/status_more" app:layout_constraintStart_toEndOf="@id/status_favourite" app:layout_constraintTop_toTopOf="@id/status_reply" - sparkbutton:activeImage="@drawable/ic_bookmark_active_24dp" - sparkbutton:iconSize="28dp" + sparkbutton:activeImage="@drawable/ic_bookmark_24dp_filled" + sparkbutton:iconSize="24dp" sparkbutton:inactiveImage="@drawable/ic_bookmark_24dp" - sparkbutton:primaryColor="@color/tusky_green" + sparkbutton:primaryColor="@color/tusky_green_dark" sparkbutton:secondaryColor="@color/tusky_green_light" /> + app:srcCompat="@drawable/ic_close_24dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_follow.xml b/app/src/main/res/layout/item_follow.xml index 604b2c740..bc11923a3 100644 --- a/app/src/main/res/layout/item_follow.xml +++ b/app/src/main/res/layout/item_follow.xml @@ -21,7 +21,7 @@ android:paddingEnd="0dp" android:textColor="?android:textColorTertiary" android:textSize="?attr/status_text_medium" - app:drawableStartCompat="@drawable/ic_person_add_24dp" + app:drawableStartCompat="@drawable/ic_person_add_24dp_mirrored_filled" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="Someone followed you" /> diff --git a/app/src/main/res/layout/item_follow_request.xml b/app/src/main/res/layout/item_follow_request.xml index fbd9a9d92..d4120f4b8 100644 --- a/app/src/main/res/layout/item_follow_request.xml +++ b/app/src/main/res/layout/item_follow_request.xml @@ -20,7 +20,7 @@ android:paddingStart="28dp" android:textColor="?android:textColorSecondary" android:textSize="?attr/status_text_medium" - app:drawableStartCompat="@drawable/ic_person_add_24dp" + app:drawableStartCompat="@drawable/ic_person_add_24dp_mirrored_filled" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:ignore="RtlSymmetry" @@ -89,7 +89,7 @@ app:layout_constraintEnd_toStartOf="@id/acceptButton" app:layout_constraintStart_toEndOf="@id/displayNameTextView" app:layout_constraintTop_toBottomOf="@+id/notificationTextView" - app:srcCompat="@drawable/ic_reject_24dp" /> + app:srcCompat="@drawable/ic_close_24dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index e1a99f949..e73f3fcf5 100644 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -22,7 +22,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:textAppearance="?android:attr/textAppearanceListItemSmall" - app:drawableStartCompat="@drawable/ic_list" + app:drawableStartCompat="@drawable/ic_list_alt_24dp" app:drawableTint="?android:attr/textColorSecondary" tools:text="Example list" /> @@ -46,7 +46,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_add_to_list" android:visibility="gone" - app:srcCompat="@drawable/ic_plus_24dp" /> + app:srcCompat="@drawable/ic_add_24dp" /> + app:srcCompat="@drawable/ic_close_24dp" /> diff --git a/app/src/main/res/layout/item_media_preview.xml b/app/src/main/res/layout/item_media_preview.xml index fda34730e..d6dd8181a 100644 --- a/app/src/main/res/layout/item_media_preview.xml +++ b/app/src/main/res/layout/item_media_preview.xml @@ -23,7 +23,7 @@ android:visibility="gone" app:layout_constraintStart_toStartOf="@+id/status_media_preview_container" app:layout_constraintTop_toTopOf="@+id/status_media_preview_container" - app:srcCompat="@drawable/ic_eye_24dp" + app:srcCompat="@drawable/ic_visibility_24dp" app:tint="?android:attr/textColorSecondary" /> + app:srcCompat="@drawable/ic_close_24dp" /> + app:srcCompat="@drawable/ic_close_24dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_report_status.xml b/app/src/main/res/layout/item_report_status.xml index a9ea70ff6..6f3f22c29 100644 --- a/app/src/main/res/layout/item_report_status.xml +++ b/app/src/main/res/layout/item_report_status.xml @@ -146,7 +146,7 @@ app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0" app:layout_constraintStart_toStartOf="@+id/status_media_preview_0" app:layout_constraintTop_toTopOf="@+id/status_media_preview_0" - app:srcCompat="@drawable/ic_play_indicator" + app:srcCompat="@drawable/play_indicator" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/item_scheduled_status.xml b/app/src/main/res/layout/item_scheduled_status.xml index 4d9b5e478..fb2c63780 100644 --- a/app/src/main/res/layout/item_scheduled_status.xml +++ b/app/src/main/res/layout/item_scheduled_status.xml @@ -23,7 +23,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_edit" android:padding="4dp" - app:srcCompat="@drawable/ic_create_24dp" /> + app:srcCompat="@drawable/ic_edit_24dp_filled" /> + app:srcCompat="@drawable/ic_close_24dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_severed_relationship_notification.xml b/app/src/main/res/layout/item_severed_relationship_notification.xml index c80e72da2..c80bf9cb8 100644 --- a/app/src/main/res/layout/item_severed_relationship_notification.xml +++ b/app/src/main/res/layout/item_severed_relationship_notification.xml @@ -15,7 +15,7 @@ android:layout_height="24dp" android:layout_marginStart="28dp" android:importantForAccessibility="no" - android:src="@drawable/heart_broken_24" + android:src="@drawable/ic_heart_broken_24" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?android:textColorSecondary" /> diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml index df0ad99e2..9767905c2 100644 --- a/app/src/main/res/layout/item_status.xml +++ b/app/src/main/res/layout/item_status.xml @@ -23,7 +23,7 @@ android:paddingStart="@dimen/status_info_padding_small" android:textColor="?android:textColorTertiary" android:textSize="?attr/status_text_medium" - app:drawableStartCompat="@drawable/ic_reblog_18dp" + app:drawableStartCompat="@drawable/ic_repeat_18dp" app:drawableTint="?android:textColorTertiary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0" @@ -359,9 +359,9 @@ app:layout_constraintEnd_toStartOf="@id/status_favourite" app:layout_constraintStart_toEndOf="@id/status_reply" app:layout_constraintTop_toTopOf="@id/status_reply" - sparkbutton:activeImage="@drawable/ic_reblog_active_24dp" - sparkbutton:iconSize="28dp" - sparkbutton:inactiveImage="@drawable/ic_reblog_24dp" + sparkbutton:activeImage="@drawable/ic_repeat_active_24dp" + sparkbutton:iconSize="24dp" + sparkbutton:inactiveImage="@drawable/ic_repeat_24dp" sparkbutton:primaryColor="@color/tusky_blue" sparkbutton:secondaryColor="@color/tusky_blue_lighter" /> @@ -387,9 +387,9 @@ app:layout_constraintEnd_toStartOf="@id/status_bookmark" app:layout_constraintStart_toEndOf="@id/status_inset" app:layout_constraintTop_toTopOf="@id/status_inset" - sparkbutton:activeImage="@drawable/ic_favourite_active_24dp" - sparkbutton:iconSize="28dp" - sparkbutton:inactiveImage="@drawable/ic_favourite_24dp" + sparkbutton:activeImage="@drawable/ic_star_24dp_filled" + sparkbutton:iconSize="24dp" + sparkbutton:inactiveImage="@drawable/ic_star_24dp" sparkbutton:primaryColor="@color/tusky_orange" sparkbutton:secondaryColor="@color/tusky_orange_light" /> @@ -415,10 +415,10 @@ app:layout_constraintEnd_toStartOf="@id/status_more" app:layout_constraintStart_toEndOf="@id/status_favourite" app:layout_constraintTop_toTopOf="@id/status_reply" - sparkbutton:activeImage="@drawable/ic_bookmark_active_24dp" - sparkbutton:iconSize="28dp" + sparkbutton:activeImage="@drawable/ic_bookmark_24dp_filled" + sparkbutton:iconSize="24dp" sparkbutton:inactiveImage="@drawable/ic_bookmark_24dp" - sparkbutton:primaryColor="@color/tusky_green" + sparkbutton:primaryColor="@color/tusky_green_dark" sparkbutton:secondaryColor="@color/tusky_green_light" /> @@ -383,9 +383,9 @@ app:layout_constraintEnd_toStartOf="@id/status_bookmark" app:layout_constraintStart_toEndOf="@id/status_inset" app:layout_constraintTop_toTopOf="@id/status_inset" - sparkbutton:activeImage="@drawable/ic_favourite_active_24dp" - sparkbutton:iconSize="28dp" - sparkbutton:inactiveImage="@drawable/ic_favourite_24dp" + sparkbutton:activeImage="@drawable/ic_star_24dp_filled" + sparkbutton:iconSize="24dp" + sparkbutton:inactiveImage="@drawable/ic_star_24dp" sparkbutton:primaryColor="@color/tusky_orange" sparkbutton:secondaryColor="@color/tusky_orange_light" /> @@ -400,10 +400,10 @@ app:layout_constraintEnd_toStartOf="@id/status_more" app:layout_constraintStart_toEndOf="@id/status_favourite" app:layout_constraintTop_toTopOf="@id/status_reply" - sparkbutton:activeImage="@drawable/ic_bookmark_active_24dp" - sparkbutton:iconSize="28dp" + sparkbutton:activeImage="@drawable/ic_bookmark_24dp_filled" + sparkbutton:iconSize="24dp" sparkbutton:inactiveImage="@drawable/ic_bookmark_24dp" - sparkbutton:primaryColor="@color/tusky_green" + sparkbutton:primaryColor="@color/tusky_green_dark" sparkbutton:secondaryColor="@color/tusky_green_light" /> + app:srcCompat="@drawable/ic_close_24dp" /> diff --git a/app/src/main/res/layout/item_unknown_notification.xml b/app/src/main/res/layout/item_unknown_notification.xml index 0446165e1..923efb3a7 100644 --- a/app/src/main/res/layout/item_unknown_notification.xml +++ b/app/src/main/res/layout/item_unknown_notification.xml @@ -22,7 +22,7 @@ android:paddingBottom="14dp"> android:paddingEnd="0dp" android:textColor="?android:textColorSecondary" android:textSize="?attr/status_text_medium" - app:drawableStartCompat="@drawable/help_24dp" + app:drawableStartCompat="@drawable/ic_help_24dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:text="@string/unknown_notification_type" /> diff --git a/app/src/main/res/layout/view_compose_options.xml b/app/src/main/res/layout/view_compose_options.xml index ee8c70e87..497554d20 100644 --- a/app/src/main/res/layout/view_compose_options.xml +++ b/app/src/main/res/layout/view_compose_options.xml @@ -39,7 +39,7 @@ android:layout_marginTop="4dp" android:layout_marginBottom="4dp" android:layout_weight="1" - android:button="@drawable/ic_lock_outline_24dp" + android:button="@drawable/ic_lock_24dp" android:paddingStart="10dp" android:paddingEnd="0dp" android:text="@string/visibility_private" @@ -52,11 +52,11 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_weight="1" - android:button="@drawable/ic_email_24dp" + android:button="@drawable/ic_mail_24dp" android:paddingStart="10dp" android:paddingEnd="0dp" android:text="@string/visibility_direct" android:textColor="?android:textColorTertiary" app:buttonTint="@color/compound_button_color" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/view_poll_preview.xml b/app/src/main/res/layout/view_poll_preview.xml index 02e9a6b1c..09773755e 100644 --- a/app/src/main/res/layout/view_poll_preview.xml +++ b/app/src/main/res/layout/view_poll_preview.xml @@ -11,8 +11,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingHorizontal="@dimen/poll_preview_padding_horizontal" - android:paddingVertical="@dimen/poll_preview_padding_vertical" - tools:parentTag="android.widget.LinearLayout"> + android:paddingVertical="@dimen/poll_preview_padding_vertical"> + app:drawableStartCompat="@drawable/ic_insert_chart_24dp" + app:drawableTint="?android:attr/textColorTertiary" /> + diff --git a/app/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main.xml index a1ca8b75b..590a08ae6 100644 --- a/app/src/main/res/menu/activity_main.xml +++ b/app/src/main/res/menu/activity_main.xml @@ -4,5 +4,6 @@ - \ No newline at end of file + diff --git a/app/src/main/res/menu/activity_notification_requests.xml b/app/src/main/res/menu/activity_notification_requests.xml index 5b9a2944f..44ca7a0d9 100644 --- a/app/src/main/res/menu/activity_notification_requests.xml +++ b/app/src/main/res/menu/activity_notification_requests.xml @@ -4,5 +4,6 @@ diff --git a/app/src/main/res/menu/edit_profile_toolbar.xml b/app/src/main/res/menu/edit_profile_toolbar.xml index 49a913927..088fc54b2 100644 --- a/app/src/main/res/menu/edit_profile_toolbar.xml +++ b/app/src/main/res/menu/edit_profile_toolbar.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - \ No newline at end of file + diff --git a/app/src/main/res/menu/fragment_view_thread.xml b/app/src/main/res/menu/fragment_view_thread.xml index 286ca56ef..4b78aae80 100644 --- a/app/src/main/res/menu/fragment_view_thread.xml +++ b/app/src/main/res/menu/fragment_view_thread.xml @@ -11,7 +11,7 @@ android:id="@+id/action_reveal" android:title="@string/expand_collapse_all_posts" app:showAsAction="ifRoom" - android:icon="@drawable/ic_eye_24dp" /> + android:icon="@drawable/ic_visibility_24dp" /> diff --git a/app/src/main/res/menu/status_favourite.xml b/app/src/main/res/menu/status_favourite.xml index 66188c270..eb55cd1de 100644 --- a/app/src/main/res/menu/status_favourite.xml +++ b/app/src/main/res/menu/status_favourite.xml @@ -2,10 +2,8 @@ diff --git a/app/src/main/res/menu/status_reblog.xml b/app/src/main/res/menu/status_reblog.xml index ee4440cf1..d06d2ba5d 100644 --- a/app/src/main/res/menu/status_reblog.xml +++ b/app/src/main/res/menu/status_reblog.xml @@ -5,21 +5,17 @@ diff --git a/app/src/main/res/menu/view_hashtag_toolbar.xml b/app/src/main/res/menu/view_hashtag_toolbar.xml index 22d3774eb..bb0b184a5 100644 --- a/app/src/main/res/menu/view_hashtag_toolbar.xml +++ b/app/src/main/res/menu/view_hashtag_toolbar.xml @@ -8,27 +8,27 @@ android:title="@string/action_follow" app:showAsAction="ifRoom" app:iconTint="?attr/colorOnSurface" - android:icon="@drawable/ic_person_add_24dp" /> + android:icon="@drawable/ic_person_add_24dp_mirrored" /> + android:icon="@drawable/ic_person_remove_24dp_mirrored" /> + android:icon="@drawable/ic_volume_off_24dp" /> + android:icon="@drawable/ic_volume_up_24dp" /> - \ No newline at end of file + diff --git a/app/src/main/res/menu/view_media_toolbar.xml b/app/src/main/res/menu/view_media_toolbar.xml index e7a2227f4..9717b9b21 100644 --- a/app/src/main/res/menu/view_media_toolbar.xml +++ b/app/src/main/res/menu/view_media_toolbar.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index dd9dd02ba..1e7e5089f 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - - \ No newline at end of file + + + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 31cf5edfb..a2beae68c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -617,7 +617,7 @@ %1$s: %2$s Toto je tvá domovská timeline. Ukazuje poslední posty účtů které sleduješ. \n -\nChceš-li prozkoumat účty, můžeš je objevit v jedné z dalších timelines. Například místní timeline vaší instance [iconics gmd_group]. Nebo je můžete hledat podle jména [ikony gmd_search]; například vyhledejte \"Tusky\" pro náš Mastodon účet. +\nChceš-li prozkoumat účty, můžeš je objevit v jedné z dalších timelines. Například místní timeline vaší instance {{group}}. Nebo je můžete hledat podle jména [ikony gmd_search]; například vyhledejte \"Tusky\" pro náš Mastodon účet. nyní Obnovit Přihlásit se s prohlížečem @@ -742,7 +742,7 @@ Zrušit Zde jsou tvé soukromé zprávy; někdy zvané konverzace nebo přímé zprávy (direct messages, DM). \n -\nSoukromé zprávy se vytvoří nastavením viditelnosti [iconics gmd_public] postu na [iconics gmd_mail] Přímé a zmíněním jednoho nebo více uživatelů v textu. +\nSoukromé zprávy se vytvoří nastavením viditelnosti {{public}} postu na {{mail}} Přímé a zmíněním jednoho nebo více uživatelů v textu. \n \nNa příklad můžeš začít na profilu uživatele a tapnout na tlačítko vytvoření zprávy [iconics gmd_edit] a změnit viditelnost. Smazat @@ -754,4 +754,4 @@ Od %1$s Více od %1$s Pokračování vlákna - \ No newline at end of file + diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 4a839f27d..866d8d9e2 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -114,12 +114,12 @@ Pennyn Beth yw gweinydd\? Yn cysylltu… - Gallwch chi roi cyfeiriad neu barth o unrhyw weinydd yma, fel mastodon.social, twt.cymru, social.tchncs.de, a mwy! -\n -\nOs nad oes gennych chi gyfrif, gallwch chi roi enw\'r gweinydd yr hoffech chi ymuno ag ef a chreu cyfrif yno. -\n -\nGweinydd yw\'r man y mae\'ch gyfrif wedi\'i gynnal, ond gallwch chi gyfathrebu\'n hawdd â phobl a\'u dilyn ar weinyddion eraill fel petaech yn yr unfan. -\n + Gallwch chi roi cyfeiriad neu barth o unrhyw weinydd yma, fel mastodon.social, twt.cymru, social.tchncs.de, a mwy! +\n +\nOs nad oes gennych chi gyfrif, gallwch chi roi enw\'r gweinydd yr hoffech chi ymuno ag ef a chreu cyfrif yno. +\n +\nGweinydd yw\'r man y mae\'ch gyfrif wedi\'i gynnal, ond gallwch chi gyfathrebu\'n hawdd â phobl a\'u dilyn ar weinyddion eraill fel petaech yn yr unfan. +\n \nRhagor o wybodaeth yn joinmastodon.org. Yn Gorffen Llwytho\'r Cyfryngau i Fyny Yn llwytho i fyny… @@ -689,17 +689,17 @@ %1$s: %2$s Delwedd Rheoli rhestrau - Dyma\'ch llinell amser cartref. Mae\'n dangos negeseuon diweddar y cyfrifon rydych chi\'n eu dilyn. -\n -\nEr mwyn archwilio cyfrifon gallwch ddod o hyd iddyn nhw o fewn un o\'r llinellau amser eraill. Er enghraifft, llinellau amser eich gweinydd [iconics gmd_group]. Neu gallwch eu chwilio yn ôl eu henw [iconics gmd_search]; er enghraifft, chwiliwch am Tusky i ddod o hyd i\'n cyfrif Mastodon. + Dyma\'ch llinell amser cartref. Mae\'n dangos negeseuon diweddar y cyfrifon rydych chi\'n eu dilyn. +\n +\nEr mwyn archwilio cyfrifon gallwch ddod o hyd iddyn nhw o fewn un o\'r llinellau amser eraill. Er enghraifft, llinellau amser eich gweinydd {{group}}. Neu gallwch eu chwilio yn ôl eu henw {{search}}; er enghraifft, chwiliwch am Tusky i ddod o hyd i\'n cyfrif Mastodon. Dangos ystadegau negeseuon yn y ffrwd Maint testun rhyngwyneb Gweithgaredd cefndirol Hysbysiadau pan fydd Tusky\'n gweithio\'n y cefndir Yn estyn hysbysiadau… Cynnal a chadw\'r cof dros dro… - Mae eich gweinydd yn gwybod y cafodd y neges hon ei golygu, ond nid oes ganddo gopi o\'r golygiadau, felly nid oes modd eu dangos i chi. -\n + Mae eich gweinydd yn gwybod y cafodd y neges hon ei golygu, ond nid oes ganddo gopi o\'r golygiadau, felly nid oes modd eu dangos i chi. +\n \nDyma broblem Mastodon #25398. Llwytho hysbysiadau diweddaraf Dileu\'r drafft\? @@ -720,10 +720,10 @@ Hoffech chi gadw\'r newidiadau i\'ch proffil\? Delwedd Defnyddio Cynllun y System (du) - Dyma\'ch negeseuon preifat; weithiau\'n cael eu galw\'n sgyrsiau neu negeseuon uniongyrchol. -\n -\nMae negeseuon preifat yn cael eu creu drwy osod y gwelededd [iconics gmd_public] neges i [iconics gmd_mail] Uniongyrchol a chyfeirio at un neu ragor o ddefnyddwyr yn y testun. -\n + Dyma\'ch negeseuon preifat; weithiau\'n cael eu galw\'n sgyrsiau neu negeseuon uniongyrchol. +\n +\nMae negeseuon preifat yn cael eu creu drwy osod y gwelededd {{public}} neges i {{mail}} Uniongyrchol a chyfeirio at un neu ragor o ddefnyddwyr yn y testun. +\n \nEr enghraifft gallwch chi dechrau ar y proffil golwg cyfrif a phwyso\'r botwm creu [iconics gmd_edit] a newid y gwelededd. Yn dad-dewi hashnod #%1$s Yn tewi hashnod #%1$s fel rhybudd @@ -733,10 +733,10 @@ Nawr yn dilyn yr hashnod #%1$s Wedi methu dad-dewi %1$s: %2$s Wedi methu tewi %1$s: %2$s - Dyma\'ch golwg rhestrau. Gallwch chi diffinio nifer o restrau preifat ac yn ychwanegu cyfrifon atyn nhw. -\n -\nSYLWCH y gallwch chi ychwanegu dim ond cyfrifon rydych chi\'n eu dilyn i\'ch rhestrau. -\n + Dyma\'ch golwg rhestrau. Gallwch chi diffinio nifer o restrau preifat ac yn ychwanegu cyfrifon atyn nhw. +\n +\nSYLWCH y gallwch chi ychwanegu dim ond cyfrifon rydych chi\'n eu dilyn i\'ch rhestrau. +\n \nGall y rhestrau hyn yn cael eu defnyddio fel tab yn newisiadau Tabiau Cyfrif [iconics gmd_account_circle] [iconics gmd_navigate_next]. Aelodau\'r rhestr Unrhyw ddefnyddiwr a ddilynir @@ -842,4 +842,4 @@ Rydych wedi derbyn rhybudd gan gymedrolwr. Mae rhai o\'ch negeseuon wedi\'u dileu. Nid yw Tusky yn adnabod y math hwn o hysbysiad ac ni all ei ddangos i chi.Rhowch wybod hefyd i ddatblygwyr Tusky fel y gallant ychwanegu cefnogaeth ar gyfer y math hwn! - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cbeafec24..7ca05b13e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -137,12 +137,12 @@ Titelbild Was ist eine Instanz\? Wird verbunden … - Die Adresse oder Domain einer Instanz kann hier eingegeben werden, wie z. B. mastodon.social, icosahedron.website, social.tchncs.de, oderweitere! -\n -\nWenn du bis jetzt kein Konto hast, kannst du hier den Namen einer Instanz eingeben und dort ein Konto einrichten. -\n -\nEine Instanz ist ein einzelner Ort, an dem dein Konto gehostet ist, aber du kannst dennoch mit anderen Leuten interagieren, als wärt ihr alle auf derselben Website. -\n + Die Adresse oder Domain einer Instanz kann hier eingegeben werden, wie z. B. mastodon.social, icosahedron.website, social.tchncs.de, oderweitere! +\n +\nWenn du bis jetzt kein Konto hast, kannst du hier den Namen einer Instanz eingeben und dort ein Konto einrichten. +\n +\nEine Instanz ist ein einzelner Ort, an dem dein Konto gehostet ist, aber du kannst dennoch mit anderen Leuten interagieren, als wärt ihr alle auf derselben Website. +\n \nWeitere Informationen gibt es auf joinmastodon.org. Hochladen der Datei wird abgeschlossen Wird hochgeladen … @@ -632,9 +632,9 @@ Schlagwort bearbeiten %1$s: %2$s Trotzdem anzeigen - Dies ist deine Startseite. Sie zeigt die neuesten Beiträge von Konten, denen du folgst. -\n -\nDamit du andere Konten entdeckst, kannst du entweder andere Timelines lesen – z. B. die Lokale Timeline deiner Instanz [iconics gmd_group] \u0020– oder du suchst nach Namen [iconics gmd_search] – z. B. kannst du nach Tusky suchen, um unser Mastodon-Konto zu finden. + Dies ist deine Startseite. Sie zeigt die neuesten Beiträge von Konten, denen du folgst. +\n +\nDamit du andere Konten entdeckst, kannst du entweder andere Timelines lesen – z. B. die Lokale Timeline deiner Instanz {{group}} \u0020– oder du suchst nach Namen {{search}} – z. B. kannst du nach Tusky suchen, um unser Mastodon-Konto zu finden. Bild Beitragsstatistiken in der Timeline anzeigen Schriftgröße der Oberfläche @@ -664,10 +664,10 @@ \nBEACHTE, dass du nur Profile hinzufügen kannst, denen du folgst. \n \nDiese Listen können als Tab in den Kontoeinstellungen [iconics gmd_account_circle] [iconics gmd_navigate_next] Tabs festgelegt werden. - Hier befinden sich deine privaten Nachrichten – auch bekannt als Unterhaltungen oder »direct messages« (DM, Direktnachricht). -\n -\nPrivate Nachrichten werden erstellt, indem die Beitragssichtbarkeit [iconics gmd_public] auf [iconics gmd_mail] Direkt gesetzt wird und ein oder mehrere Profile erwähnt werden. -\n + Hier befinden sich deine privaten Nachrichten – auch bekannt als Unterhaltungen oder »direct messages« (DM, Direktnachricht). +\n +\nPrivate Nachrichten werden erstellt, indem die Beitragssichtbarkeit {{public}} auf {{mail}} Direkt gesetzt wird und ein oder mehrere Profile erwähnt werden. +\n \nBeispiel: Du befindest dich auf einer Profilseite und klickst auf die Schaltfläche »Verfassen« [iconics gmd_edit] und änderst anschließend die Sichtbarkeit. Systemdesign verwenden (Schwarz) Wiedergabe fehlgeschlagen: %1$s @@ -778,4 +778,4 @@ Einige deiner Beiträge wurden als sensibel markiert. Moderationsverwarnung Andere Benachrichtigungen wie verlorene Verbindungen oder Moderationsverwarnungen - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 146256c55..c0e48464b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -625,7 +625,7 @@ Contactar con tu servidor ha tardado demasiado tiempo Esta es tu cronología de inicio. Muestra las publicaciones recientes de las cuentas que sigues. \n -\nPara encontrar cuentas, puedes mirar en alguna de las otras cronologías. Por ejemplo, la cronología local de tu instancia [iconics gmd_group]. O puedes buscarlas por nombre [iconics gmd_search]; por ejemplo, busca Tusky para encontrar nuestra cuenta de Mastodon. +\nPara encontrar cuentas, puedes mirar en alguna de las otras cronologías. Por ejemplo, la cronología local de tu instancia {{group}}. O puedes buscarlas por nombre {{search}}; por ejemplo, busca Tusky para encontrar nuestra cuenta de Mastodon. Fallo al añadir a marcadores: %1$s Gestionar listas Fallo al favoritear publicación: %1$s @@ -707,7 +707,7 @@ Ocultar en la cronología de tu instancia Aquí están tus mensajes privados; a veces llamados conversaciones o mensajes directos (MD). \n -\nLos mensajes privados se crean fijando la visibilidad [iconics gmd_public] de una publicación a [iconics gmd_mail] Directo y mencionando a uno o más usuarios. +\nLos mensajes privados se crean fijando la visibilidad {{public}} de una publicación a {{mail}} Directo y mencionando a uno o más usuarios. \n \nPor ejemplo puedes empezar desde el perfil de otro usuario, pulsar el botón de crear [iconics gmd_edit] y cambiar la visibilidad. Se copió la información de versión y dispositivo @@ -774,4 +774,4 @@ Usar la visibilidad predefinida Ahora sigues la etiqueta #%1$s Usar tema del sistema (negro) - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 6b6416598..d257f7182 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -114,12 +114,12 @@ سرایند نمونه چیست؟ در حال وصل شدن… - نشانی یا دامنهٔ هر نمونه‌ای می‌تواند وارد شود، چون mastodon.social, icosahedron.website, social.tchncs.de و بیش‌تر!. -\n -\nاگر هنوز حسابی ندارید، می‌توانید نام نمونه‌ای که می‌خواهید به آن بپیوندید را وارد کرده و در آن‌جا حسابی بسازید. -\n -\nنمونه جاییست که حسابتان رویش میزبانی می‌شود. به راحتی می‌توانید با افراد روی نمونه‌های دیگر ارتباط داشته و دنبالشان کنید؛ انگار که روی یک پایگاه باشید. -\n + نشانی یا دامنهٔ هر نمونه‌ای می‌تواند وارد شود، چون mastodon.social, icosahedron.website, social.tchncs.de و بیش‌تر!. +\n +\nاگر هنوز حسابی ندارید، می‌توانید نام نمونه‌ای که می‌خواهید به آن بپیوندید را وارد کرده و در آن‌جا حسابی بسازید. +\n +\nنمونه جاییست که حسابتان رویش میزبانی می‌شود. به راحتی می‌توانید با افراد روی نمونه‌های دیگر ارتباط داشته و دنبالشان کنید؛ انگار که روی یک پایگاه باشید. +\n \nاطّلاعات بیش‌تر می‌تواند در joinmastodon.org پیدا شود. پایان بارگذاری رسانه در حال بارگذاری… @@ -632,9 +632,9 @@ ویرایش کلیدواژه %1$s: %2$s نمایش آمار فرسته‌ها در خط زمانی - این خط زمانی خانگیتان است. فرسته‌های جدید را از حساب‌هایی که پی‌می‌گیرید نشان می‌دهد. -\n -\nبرای کاوش حساب‌ها می‌توانید آن‌ها را در دیگر خط‌های زمانی (برای نمونه خط زمانی محلّی نمونه‌تان [iconics gmd_group]) یافته یا با نام (برای نمونه Tusky برای حساب ماستودونمان) بجوییدشان [iconics gmd_search]. + این خط زمانی خانگیتان است. فرسته‌های جدید را از حساب‌هایی که پی‌می‌گیرید نشان می‌دهد. +\n +\nبرای کاوش حساب‌ها می‌توانید آن‌ها را در دیگر خط‌های زمانی (برای نمونه خط زمانی محلّی نمونه‌تان {{group}}) یافته یا با نام (برای نمونه Tusky برای حساب ماستودونمان) بجوییدشان {{search}}. تصویر مدیریت سیاهه‌ها بار کردن جدیدترین آگاهی‌ها @@ -667,15 +667,15 @@ ناخموش کردن برچسب #%1$s اکنون برچسب #%1$s دنبال می‌شود دیگر برچسب #%1$s دنبال نمی‌شود - پیام‌های خصوصیتان که گاهی گفت‌وگوها یا پیام‌های مستقیم نامیده می‌شوند این‌جایند. -\n -\nپیام‌های خصوصی با تنظیم نمایانی [iconics gmd_public] فرسته به [iconics gmd_mail] مستقیم و اشاره به کاربر یا کاربرانی در متن ایجاد می‌شود. -\n + پیام‌های خصوصیتان که گاهی گفت‌وگوها یا پیام‌های مستقیم نامیده می‌شوند این‌جایند. +\n +\nپیام‌های خصوصی با تنظیم نمایانی {{public}} فرسته به {{mail}} مستقیم و اشاره به کاربر یا کاربرانی در متن ایجاد می‌شود. +\n \nبرای نمونه می‌توانید در نمای نمایهٔ حسابی روی دکمهٔ ایجاد [iconics gmd_edit] زده و نمایانی را تغییر دهید. - این نمایهٔ سیاهه‌تان است. می‌توانید تعدادی سیاههٔ خصوصی ایحاد کرده و حساب‌ها را بدان بیفزایید. -\n -\nبه خاطر داشته باشید که تنها می‌توانید افرادی را که پی می‌گیرید به سیاهه‌هایتان بیفزایید. -\n + این نمایهٔ سیاهه‌تان است. می‌توانید تعدادی سیاههٔ خصوصی ایحاد کرده و حساب‌ها را بدان بیفزایید. +\n +\nبه خاطر داشته باشید که تنها می‌توانید افرادی را که پی می‌گیرید به سیاهه‌هایتان بیفزایید. +\n \nین سیاهه‌ها می‌توانند به عنوان زبانه‌ای در زبانه‌های ترجیحات حساب [iconics gmd_account_circle] [iconics gmd_navigate_next] استفاده شوند. شکست در خموش کردن %1$s: %2$s شکست در ناخموش کردن %1$s: %2$s @@ -782,4 +782,4 @@ بله دور انداختن تغییرات عنوان؟ نه - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aad9a770d..101773e2b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -637,9 +637,9 @@ Montrer les statistiques des statuts dans les fils %1$d personnes parlent du hashtag %2$s utilisations - Ceci est votre fil d\'accueil. Il affiche les publications récentes des comptes que vous suivez. -\n -\nPour trouver des comptes vous pouvez soit les découvrir dans l\'un des autres fils, par exemple le fil local de votre instance [iconics gmd_group] ; soit les chercher par leur nom [iconics gmd_search], par exemple cherchez « Tusky » pour trouver notre compte Mastodon. + Ceci est votre fil d\'accueil. Il affiche les publications récentes des comptes que vous suivez. +\n +\nPour trouver des comptes vous pouvez soit les découvrir dans l\'un des autres fils, par exemple le fil local de votre instance {{group}} ; soit les chercher par leur nom {{search}}, par exemple cherchez « Tusky » pour trouver notre compte Mastodon. Ajouter Mots-clés ou phrases à filtrer Cacher derrière un avertissement @@ -726,4 +726,4 @@ Créé durant les 30 derniers jours Filtrer Ignorer - \ No newline at end of file + diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index f815be0a8..6b6c29333 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -649,9 +649,9 @@ Cuir facal-luirg ris %1$s: %2$s Tiotal - Seo loidhne-ama do dhachaigh. Seallaidh i na postaichean o chionn goirid aig na cunntasan a leanas tu. -\n -\nAirson cunntasan a rùrachadh, lorg iad air tè dhe na loidhnichean-ama eile; mar eisimpleir, loidhne-ama ionadail an ionstans agad [iconics gmd_group]. Air neo lorg cunntasan a-rèir ainm [iconics gmd_search]; mar eisimpleir, lorg “Tusky” ach am faigh thu grèim air a’ chunntas againne air Mastodon. + Seo loidhne-ama do dhachaigh. Seallaidh i na postaichean o chionn goirid aig na cunntasan a leanas tu. +\n +\nAirson cunntasan a rùrachadh, lorg iad air tè dhe na loidhnichean-ama eile; mar eisimpleir, loidhne-ama ionadail an ionstans agad {{group}}. Air neo lorg cunntasan a-rèir ainm {{search}}; mar eisimpleir, lorg “Tusky” ach am faigh thu grèim air a’ chunntas againne air Mastodon. A bheil thu airson an dreachd a sguabadh às\? Luchdaich na brathan as ùire Tha fios aig an fhrithealaiche gun deach am post seo a dheasachadh ach chan eil lethbhreac dhen deasachadh aige-san is chan urrainn dhuinn a shealltainn dhut. @@ -692,14 +692,14 @@ Tha an fhreagairt agad ’ga cur. Prìobhaideachd nam freagairtean (gun sioncronachadh leis an fhrithealaiche) Seo na teachdaireachdan prìobhaideach agad ris an canar còmhraidhean no teachdaireachdan dìreach (DM) cuideachd. \u0020 -\n -\nAirson teachdaireachd phrìobhaideach a chruthachadh, suidhich faicsinneachd [iconics gmd_public] puist air [iconics gmd_mail] Dìreach agus thoir iomradh air cleachdaiche no dhà san teacsa. \u0020 -\n +\n +\nAirson teachdaireachd phrìobhaideach a chruthachadh, suidhich faicsinneachd {{public}} puist air {{mail}} Dìreach agus thoir iomradh air cleachdaiche no dhà san teacsa. \u0020 +\n \nMar eisimpleir, ’s urrainn dhut tòiseachadh air sealladh pròifil cunntais agus gnogag a thoirt air putan a’ chruthachaidh [iconics gmd_edit] agus an fhaicsinneachd atharrachadh. \u0020 Seo sealladh nan liostaichean agad. ’S urrainn dhut iomadh liosta phrìobhaideach a chruthachadh ’s cunntasan a chur riutha. \u0020 -\n +\n \n \u0020THOIR AN AIRE nach urrainn dhut ach cunntasan a leanas tu a chur ris na liostaichean agad. \u0020 -\n +\n \n \u0020’S urrainn dhut na liostaichean seo a chleachdadh ’nan tabaichean ann an “Roghainnean a’ chunntais” [iconics gmd_account_circle] [iconics gmd_navigate_next] “Tabaichean”. \u0020 Buill na liosta Cleachdaiche sam bith a leanas mi @@ -726,4 +726,4 @@ Mearachd le sguabadh às na criathraige “%1$s” Mearachd le sàbhaladh na criathraige “%1$s” Postaichean a’ treandadh - \ No newline at end of file + diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 0c024bf91..661da982f 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -395,12 +395,12 @@ Descargar Enviando… Rematando o envío de multimedia - Aquí podes escribir o enderezo ou dominio de calquera instancia, como mastodon.gal, icosahedron.website, social.techncs.de, e máis! -\n -\nSe aínda non tes unha conta, podes escribir o nome da instancia á que desexas unirte e crear unha conta nela. -\n -\nUnha instancia é o lugar onde se hospeda a túa conta, pero podes comunicarte facilmente e seguir a persoas noutras instancias como se estiveses alí. -\n + Aquí podes escribir o enderezo ou dominio de calquera instancia, como mastodon.gal, icosahedron.website, social.techncs.de, e máis! +\n +\nSe aínda non tes unha conta, podes escribir o nome da instancia á que desexas unirte e crear unha conta nela. +\n +\nUnha instancia é o lugar onde se hospeda a túa conta, pero podes comunicarte facilmente e seguir a persoas noutras instancias como se estiveses alí. +\n \nPodes atopar máis información en joinmastodon.org. Conectando… Que é unha instancia\? @@ -596,7 +596,7 @@ Seguir cancelo Esta é a túa cronoloxía de inicio. Mostra as publicacións recentes das contas que segues. \n -\nPara atopar contas podes mirar nalgunha das outras cronoloxías. Por exemplo, na cronoloxía local da túa instancia [iconics gmd_group]. Ou buscalas polo seu nome [iconics gmd_search]; por exemplo busca «Tusky» para atopar a nosa conta en Mastodon. +\nPara atopar contas podes mirar nalgunha das outras cronoloxías. Por exemplo, na cronoloxía local da túa instancia {{group}}. Ou buscalas polo seu nome {{search}}; por exemplo busca «Tusky» para atopar a nosa conta en Mastodon. Imaxe O meu filtro Actualizar @@ -656,7 +656,7 @@ Produciuse un fallo ao reproducir: %1$s Aquí están as túas mensaxes privadas; tamén chamadas conversas ou mensaxes directas (DM); \n -\nAs mensaxes privadas créanse establecendo a visibilidade [iconics gmd_public] da publicación como [iconics gmd_mail] Directa e mencionando a unha ou máis usuarias no texto. +\nAs mensaxes privadas créanse establecendo a visibilidade {{public}} da publicación como {{mail}} Directa e mencionando a unha ou máis usuarias no texto. \n \nPor exemplo podes ir ao perfil dunha conta e tocar no botón escribir [iconics gmd_edit] e cambiar a visibilidade. Acalar o cancelo #%1$s cun aviso @@ -775,4 +775,4 @@ Non Desbotar cambios na descrición? Si - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 616fae6eb..22ac9222c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -634,7 +634,7 @@ %1$s: %2$s Ez a kezdőlapod idővonala. Megjeleníti a követett fiókok legfrissebb bejegyzéseit. \u0020 \n \u0020 -\nMás fiókokat más idővonalakon fedezhetsz fel. Például a példányod helyi idővonalán [iconics gmd_group]. Vagy megkeresheted őket név szerint [iconics gmd_search]; például keress rá a Tuskyra, hogy megtaláld a Mastodon-fiókunkat. +\nMás fiókokat más idővonalakon fedezhetsz fel. Például a példányod helyi idővonalán {{group}}. Vagy megkeresheted őket név szerint {{search}}; például keress rá a Tuskyra, hogy megtaláld a Mastodon-fiókunkat. Kép Listák kezelése Felület betűmérete @@ -644,8 +644,8 @@ Gyorsítótár karbantartása… Legújabb értesítések betöltése Töröljük a vázlatot\? - A kiszolgálód tudja, hogy ezt a bejegyzést szerkesztették, de nincs másolata a szekesztésekről, így ezeket nem tudja megjeleníteni. -\n + A kiszolgálód tudja, hogy ezt a bejegyzést szerkesztették, de nincs másolata a szekesztésekről, így ezeket nem tudja megjeleníteni. +\n \nEz egy ismert probléma: #25398-as számú Mastodon jegy. Küldés… A válaszodat épp elküldjük. @@ -677,7 +677,7 @@ Már nem követed a(z) #%1$s hashtaget It találhatóak a privát üzeneteid; melyeket néha beszélgetéseknek vagy közvetlen üzeneteknek hívunk (DM). \u0020 \n \u0020 -\nPrivát üzeneteket az ilyen bejegyzések láthatóságának [iconics gmd_public] publikusról [iconics gmd_mail] közvetlenre állításával, és egy vagy több felhasználó megemlítésével hozhatsz létre. \u0020 +\nPrivát üzeneteket az ilyen bejegyzések láthatóságának {{public}} publikusról {{mail}} közvetlenre állításával, és egy vagy több felhasználó megemlítésével hozhatsz létre. \u0020 \n \u0020 \nPéldául indulhatsz egy profilról, a létrehozás gombra kattintva [iconics gmd_edit], majd a láthatóságot megváltoztatva. \u0020 Felkapott bejegyzések @@ -711,4 +711,4 @@ Hiba a(z) „%1$s” szűrő törlésekor Hiba a(z) „%1$s” szűrő mentésekor „#%1$s” másolva - \ No newline at end of file + diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index b71321aea..6173b6089 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -629,7 +629,7 @@ Sýsla með lista Þetta er tímalínan þín. Hún sýnir nýlegar færslur þeirra sem þú fylgist með. \n -\nTil að skoða hvað aðrir eru að gera getur þú til dæmis uppgötvað viðkomandi í einni af hinum tímalínunum. Til dæmis á staðværu tímalínu netþjónsins þíns [iconics gmd_group]. Eða að þú leitar að þeim eftir nafni [iconics gmd_search]; til dæmis geturðu leitað að Tusky til að finna Mastodon-aðganginn okkar. +\nTil að skoða hvað aðrir eru að gera getur þú til dæmis uppgötvað viðkomandi í einni af hinum tímalínunum. Til dæmis á staðværu tímalínu netþjónsins þíns {{group}}. Eða að þú leitar að þeim eftir nafni {{search}}; til dæmis geturðu leitað að Tusky til að finna Mastodon-aðganginn okkar. Textastærð viðmóts Bakgrunnsvirkni Tilkynningar þegar Tusky er að vinna í bakgrunni @@ -664,7 +664,7 @@ Innsendingin mistókst: %1$s Hér eru einkaskilaboðin þín; stundum kölluð samtöl eða bein skilaboð (DM). \n -\nEinkaskilaboð eru gerð með því að stilla sýnileika [iconics gmd_public] færslu [iconics gmd_mail] á Beint og að minnast á einn eða fleiri notendur í textanum. +\nEinkaskilaboð eru gerð með því að stilla sýnileika {{public}} færslu {{mail}} á Beint og að minnast á einn eða fleiri notendur í textanum. \n \nÞú getur til dæmis farið á notandaaðgang einhvers og ýtt á \'Minnast á\'-hnappinn [iconics gmd_edit] og breytt sýnileikanum. Þetta er listasýnin þín. Þú getur skilgreint fjölmarga einkalista og bætt notendaaðgöngum á þá. @@ -775,4 +775,4 @@ Já Nei Henda breytingum á skýringatexta? - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 88b7a2eb1..7504ef256 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -684,7 +684,7 @@ Usa design di sistema (nero) Questi sono i tuoi messaggi privati; a volte sono chiamati conversazioni o messaggi diretti (DM). \n -\nI messaggi privati sono creati impostando la visibilità [iconics gmd_public] di un post su [iconics gmd_mail] Privato e menzionando uno o più utenti nel testo. +\nI messaggi privati sono creati impostando la visibilità {{public}} di un post su {{mail}} Privato e menzionando uno o più utenti nel testo. \n \nPer esempio puoi andare su un profilo e creare un messaggio [iconics gmd_edit] e cambiare la visibilità. Non segui più l\'hashtag #%1$s @@ -802,4 +802,4 @@ Mostra risultati Sì Scartare le modifiche alla didascalia? - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index f06f240ba..6ee68e96a 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -138,12 +138,12 @@ Overskrift Hva er en instans\? Kobler til… - Addressen eller domenet til enhver instans kan legges til her, f. eks. mastodon.social, icosahedron.website, social.tchncs.de og mer! -\n -\nHvis du ikke har en konto kan du oppgi navnet på instansen du vil bli medlem av, og lage en konto der. -\n -\nEn instans der hvor du har kontoen din, men du kan lett kommunisere med og følge andre personer på andre instanser, som om du var på den samme nettsiden. -\n + Addressen eller domenet til enhver instans kan legges til her, f. eks. mastodon.social, icosahedron.website, social.tchncs.de og mer! +\n +\nHvis du ikke har en konto kan du oppgi navnet på instansen du vil bli medlem av, og lage en konto der. +\n +\nEn instans der hvor du har kontoen din, men du kan lett kommunisere med og følge andre personer på andre instanser, som om du var på den samme nettsiden. +\n \nDu kan finne mer info på joinmastodon.org. Opplasting av media er ferdig Laster opp… @@ -554,9 +554,9 @@ Slutte å følge #%1$s\? Sluttet å følge #%1$s Laster tråd - Dette er Hjemmetidslinjendin. Den viser de nyeste innleggene av kontoer du følger. -\n -\nFor å utforske kontoer kan du enten oppdage dem i en av tidslinjene dine, for eksempel den lokale tidslinjen for instansen din [iconics gmd_group], eller du kan søke etter navnet deres [iconics gmd_search]; søk for eksempel etter Tusky før å finne Mastodonkonten vår. + Dette er Hjemmetidslinjendin. Den viser de nyeste innleggene av kontoer du følger. +\n +\nFor å utforske kontoer kan du enten oppdage dem i en av tidslinjene dine, for eksempel den lokale tidslinjen for instansen din {{group}}, eller du kan søke etter navnet deres {{search}}; søk for eksempel etter Tusky før å finne Mastodonkonten vår. Leserekkefølge Eldste først Skriftstørrelse for brukergrensesnitt @@ -650,4 +650,4 @@ Kunne ikke slette filter \'%1$s\' Kunne ikke lagre filter \'%1$s\' Trendende poster - \ No newline at end of file + diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml index 71f5339bc..1c0ce3c0a 100644 --- a/app/src/main/res/values-night/theme_colors.xml +++ b/app/src/main/res/values-night/theme_colors.xml @@ -35,9 +35,9 @@ @color/white @color/tusky_grey_10 - #CC444B5D + #CC444B5D - @color/tusky_green + @color/tusky_green_dark @color/tusky_red diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f0fb00cd1..712712ee7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -651,13 +651,13 @@ \nJe kunt je lijsten als tabbladen toevoegen in je account-instellingen [iconics gmd_account_circle] [iconics gmd_navigate_next] tabs. \u0020 Inclusief accounts die jou korter dan 3 dagen volgen Dit is je hoofdtijdlijn. Hier zie je de berichten van de mensen die jij volgt. \u0020 -\n -\nOm andere accounts te ontdekken, kan je andere tijdlijnen bekijken, bijvoorbeeld je lokale tijdlijn van jouw server [iconics gmd_group]. Of je kan zoeken op naam [iconics gmd_search], bijvoorbeeld typ \"tusky\" in het zoekveld om onze Mastodonaccount te vinden. +\n +\nOm andere accounts te ontdekken, kan je andere tijdlijnen bekijken, bijvoorbeeld je lokale tijdlijn van jouw server {{group}}. Of je kan zoeken op naam {{search}}, bijvoorbeeld typ \"tusky\" in het zoekveld om onze Mastodonaccount te vinden. Gefilterd, tenzij het een reactie is op je eigen vermelding, of als je het account volgt - Dit zijn je privé berichten, ook wel conversaties of direct messages genoemd (DM). -\n -\nPrivé berichten maak je door het zichtbaarheidsinstellingen [iconics gmd_public] van een bericht op [iconics gmd_mail] Direct te zetten, en dan één of meerdere accounts te vermelden in je bericht. \u0020 -\n + Dit zijn je privé berichten, ook wel conversaties of direct messages genoemd (DM). +\n +\nPrivé berichten maak je door het zichtbaarheidsinstellingen {{public}} van een bericht op {{mail}} Direct te zetten, en dan één of meerdere accounts te vermelden in je bericht. \u0020 +\n \nBijvoorbeeld: je kan op het profiel van een account op de toot-knop [iconics gmd_edit] klikken en dan de zichtbaarheid veranderen. \u0020 Direct De gekozen zichtbaarheid hangt af van het bericht waarop je reageert. @@ -736,4 +736,4 @@ Afspelen mislukt: %1$s Inhoud filteren Boosts van jezelf tonen - \ No newline at end of file + diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 623c021e3..2b868b1a2 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -113,11 +113,11 @@ Bandièra Que es una instància ? Connexion… - Aquí podètz picar l\'adreça o domini de quina que siá instància, \u0020coma mastodont.cat, mastodon.social, icosahedron.website o \u0020fòrca mai ! + Aquí podètz picar l\'adreça o domini de quina que siá instància, \u0020coma mastodont.cat, mastodon.social, icosahedron.website o \u0020fòrca mai ! \n \nSi encara non avètz cap de compte, podètz picar lo nom de l’instància ont vos agradariá \u0020anar e crear un compte enlà. \n -\n +\n \n \nAvètz mas d’informacins a joinmastodon.org. \u0020 Finalizacion del mandadís del mèdia @@ -635,9 +635,9 @@ Fracàs de l’acceptacion de la demanda : %1$s Fracàs del refús de la demanda : %1$s Mostrar las estatisticas dins la cronologia - Aquò es vòstra cronologia. Mòstra las publicacions recentas dels comptes que seguissètz. -\n -\nPer explorar mai de compte podètz siá los descobrir dins d’autres fils, per exemple lo fil local de vòstra instància [iconics gmd_group], siá los trapar per lor nom [iconics gmd_search], per exemple « Tusky » per trobar nòstre compte Mastodon. + Aquò es vòstra cronologia. Mòstra las publicacions recentas dels comptes que seguissètz. +\n +\nPer explorar mai de compte podètz siá los descobrir dins d’autres fils, per exemple lo fil local de vòstra instància {{group}}, siá los trapar per lor nom {{search}}, per exemple « Tusky » per trobar nòstre compte Mastodon. Vòstre servidor sap qu’aquesta publicacion foguèt modificada mas ten pas cap de còpia de las modificacions doncas vos las pòt afichar. \n \nAquò es un problèma de Mastodon #25398. @@ -716,4 +716,4 @@ Ignorar Error de supression del filtre « %1$s » Error en enregistrant lo filtre « %1$s » - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 4e069f20b..34347bc1e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -171,12 +171,12 @@ Cabeçalho O que é uma instância\? A ligar… - O endereço ou domínio de qualquer instância pode ser introduzido aqui, como por exemplo ciberlandia.pt, masto.pt, mastodon.social ou qualquer outra! -\n + O endereço ou domínio de qualquer instância pode ser introduzido aqui, como por exemplo ciberlandia.pt, masto.pt, mastodon.social ou qualquer outra! +\n \nSe ainda não tem uma conta, insira o nome da instância onde pretende participar e crie uma conta nela. -\n +\n \nUma instância é o local onde sua conta é criada, mas pode facilmente seguir e comunicar com pessoas de outras instâncias como se estivessem todos no mesmo site. -\n +\n \nMais informações disponíveis em joinmastodon.org. A Terminar Envio de Conteúdo Multimédia A enviar… @@ -666,7 +666,7 @@ Agora segue a hashtag #%1$s Carregar as notificações mais recentes O seu servidor sabe que esta publicação foi editada, mas não a consegue mostrar porque não tem uma cópia da edição. -\n +\n \nIsto é o problema #25398 do Mastodon . Ninguém Membros da lista @@ -681,17 +681,17 @@ Ação de filtro As suas mensagens privadas estão aqui, também chamadas de conversas ou mensagens diretas (MD/DM). \n -\nAs mensagens privadas são criadas definindo a visibilidade [iconics gmd_public] de uma publicação como [iconics gmd_mail] Direta e mencionando um ou mais utilizadores no texto. -\n +\nAs mensagens privadas são criadas definindo a visibilidade {{public}} de uma publicação como {{mail}} Direta e mencionando um ou mais utilizadores no texto. +\n \nPor exemplo, pode entrar na vista de perfil de uma conta e pressionar o botão de criar publicação [iconics gmd_edit] e alterar a visibilidade. Esta é a sua vista de listas. Pode criar várias listas privadas e adicionar contas nelas. -\n +\n \nAtenção: apenas pode adicionar contas que segue às suas listas. -\n +\n \nEstas listas podem ser usadas como um separador nos separadores das Configurações da Conta [iconics gmd_account_circle] [iconics gmd_navigate_next]. Esta é a sua timeline inicial. Ela mostra as publicações mais recentes das contas que segue. -\n -\nPara explorar contas, pode descobri-las numa das outras timelines. Por exemplo, a timeline local da sua instância [iconics gmd_group]. Ou pode pesquisá-las pelo nome [iconics gmd_search]; por exemplo, pesquisando por Tusky para encontrar a nossa conta Mastodon. +\n +\nPara explorar contas, pode descobri-las numa das outras timelines. Por exemplo, a timeline local da sua instância {{group}}. Ou pode pesquisá-las pelo nome {{search}}; por exemplo, pesquisando por Tusky para encontrar a nossa conta Mastodon. Remover silêncio da hashtag #%1$s Silenciar hashtag #%1$s como um aviso Configurações por timeline @@ -787,4 +787,4 @@ Menção privada Mencionar Resposta privada - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4309b5b0b..e79f845df 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -139,12 +139,12 @@ Заголовок Что такое сервер? Подключаюсь… - Здесь можно указать адрес или домен любого сервера, например mastodon.social, icosahedron.website, social.tchncs.de или какого-нибудь ещё!. \u0020 -\n \u0020 -\nЕсли у вас еще нет учетной записи, вы можете ввести название сервера, к которому хотите присоединиться, и создать на нем новую учетную запись. \u0020 -\n \u0020 -\nСервер — это тот сайт, на котором располагается ваша учетная запись, но вы можете легко общаться с людьми на других серверах и подписываться на них, как будто вы находитесь на одном и том же сайте. \u0020 -\n \u0020 + Здесь можно указать адрес или домен любого сервера, например mastodon.social, icosahedron.website, social.tchncs.de или какого-нибудь ещё!. \u0020 +\n \u0020 +\nЕсли у вас еще нет учетной записи, вы можете ввести название сервера, к которому хотите присоединиться, и создать на нем новую учетную запись. \u0020 +\n \u0020 +\nСервер — это тот сайт, на котором располагается ваша учетная запись, но вы можете легко общаться с людьми на других серверах и подписываться на них, как будто вы находитесь на одном и том же сайте. \u0020 +\n \u0020 \nБолее подробную информацию можно найти на сайте joinmastodon.org. \u0020 Завершение загрузки медиа Загружаем… @@ -658,18 +658,18 @@ Больше не следите за хэштегом #%1$s Нарушение правил Установить точку фокуса - Это ваша домашняя лента. Здесь отображаются последние сообщения от пользователей, на которых вы подписаны. \u0020 -\n \u0020 -\nЧтобы найти людей, вы можете обнаружить профили в других лентах. Например, в местной ленте вашего сервера [iconics gmd_group]. Либо вы можете поискать их по имени [iconics gmd_search]; например, по имени Tusky вы найдете наш профиль Mastodon. - Здесь находятся ваши личные сообщения; иногда их называют беседами или direct messages (DM). \u0020 -\n \u0020 -\nЛичные сообщения создаются путем установки видимости [iconics gmd_public] поста на [iconics gmd_mail] Личное упоминание и упоминания одного или нескольких пользователей в тексте. \u0020 -\n \u0020 + Это ваша домашняя лента. Здесь отображаются последние сообщения от пользователей, на которых вы подписаны. \u0020 +\n \u0020 +\nЧтобы найти людей, вы можете обнаружить профили в других лентах. Например, в местной ленте вашего сервера {{group}}. Либо вы можете поискать их по имени {{search}}; например, по имени Tusky вы найдете наш профиль Mastodon. + Здесь находятся ваши личные сообщения; иногда их называют беседами или direct messages (DM). \u0020 +\n \u0020 +\nЛичные сообщения создаются путем установки видимости {{public}} поста на {{mail}} Личное упоминание и упоминания одного или нескольких пользователей в тексте. \u0020 +\n \u0020 \nНапример, вы можете зайти в профиль пользователя, нажать кнопку создания поста [iconics gmd_edit] и изменить видимость. \u0020 - Это ваш раздел списков. Вы можете создавать личные списки и добавлять в них пользователей. \u0020 -\n \u0020 -\n \u0020Обратите внимание, что в списки можно добавлять только тех пользователей, на которые вы подписаны. \u0020 -\n \u0020 + Это ваш раздел списков. Вы можете создавать личные списки и добавлять в них пользователей. \u0020 +\n \u0020 +\n \u0020Обратите внимание, что в списки можно добавлять только тех пользователей, на которые вы подписаны. \u0020 +\n \u0020 \n \u0020Эти списки можно использовать в качестве вкладок в меню Настройки учетной записи [iconics gmd_account_circle] [iconics gmd_navigate_next] Вкладки. \u0020 У вас есть несохраненные изменения. 1+ @@ -754,4 +754,4 @@ Уведомления от %1$d людей, которых вы можете знать Не удалось удалить фильтр \'%1$s\' Не удалось сохранить фильтр \'%1$s\' - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 3b3422975..be4b82084 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -629,9 +629,9 @@ Dölj helt Lägg till %1$s (helt ord) - Detta är din hemtidslinje. Den visar de senaste inläggen för konton du följer. -\n -\nFör att utforska konton kan du antingen upptäcka dem i någon av de andra tidslinjerna. Till exempel den lokala tidslinjen för din instans [iconics gmd_group]. Eller så kan du söka efter dem efter namn [ikonics gmd_search]; sök till exempel efter Tusky för att hitta vårt Mastodon-konto. + Detta är din hemtidslinje. Den visar de senaste inläggen för konton du följer. +\n +\nFör att utforska konton kan du antingen upptäcka dem i någon av de andra tidslinjerna. Till exempel den lokala tidslinjen för din instans {{group}}. Eller så kan du söka efter dem efter namn [ikonics gmd_search]; sök till exempel efter Tusky för att hitta vårt Mastodon-konto. UI textstorlek Bakgrundsaktivitet Aviseringar när Tusky arbetar i bakgrunden @@ -665,10 +665,10 @@ Dölj på hem-tidslinjen Radera Radera filter \'%1$s\'\? - Här finns dina listor. Du kan skapa flera privata listor, och lägga till konton på dem. -\n -\n OBS att du bara kan lägga till konton på dina listor som du följer. -\n + Här finns dina listor. Du kan skapa flera privata listor, och lägga till konton på dem. +\n +\n OBS att du bara kan lägga till konton på dina listor som du följer. +\n \n De här listorna kan användas som en flik i Kontospecifika inställningar [iconics gmd_account_circle] [iconics gmd_navigate_next] Flikar. Tystar hasttaggen #%1$s som en varning Slutar tysta hashtaggen #%1$s @@ -676,10 +676,10 @@ Följer inte längre hashtaggen #%1$s Kunde inte spela upp: %1$s Vill du spara ändringarna i din profil\? - Här finns dina privata meddelanden, som också kan kallas konversationer eller direktmeddelanden (DM). -\n -\nMeddelanden blir privata när ett inläggs synlighet [iconics gmd_public] ändras till [iconics gmd_mail] Direkt, och en eller flera användare nämns i texten. -\n + Här finns dina privata meddelanden, som också kan kallas konversationer eller direktmeddelanden (DM). +\n +\nMeddelanden blir privata när ett inläggs synlighet {{public}} ändras till {{mail}} Direkt, och en eller flera användare nämns i texten. +\n \nTill exempel kan du starta på ett kontos profil och trycka på skapa-knappen [iconics gmd_edit], och ändra synligheten. Uppladdningen misslyckades: %1$s Populära inlägg @@ -725,4 +725,4 @@ Direkt Kunde inte radera filtret \'%1$s\' Kunde inte spara filtret \'%1$s\' - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 58d7b9301..374071380 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -564,9 +564,9 @@ Bağlantı noktası %1$d ile %2$d arasında olmalıdır Alternatif metin Konu yükleniyor - Bu senin ana ağ akışın. Takip ettiğin hesapların son gönderileri burada yer alacak. -\n -\nTakip edebileceğin hesapları diğer ağ akışlarından keşfedebilirsin, örneğin kendi sunucunun yerel zaman tünelinden [iconics gmd_group]. Veya hesapları adlarıyla arayabilirsin [iconics gmd_search], örneğin Mastodon hesabımızı bulmak için Tusky adıyla araman yeterli. + Bu senin ana ağ akışın. Takip ettiğin hesapların son gönderileri burada yer alacak. +\n +\nTakip edebileceğin hesapları diğer ağ akışlarından keşfedebilirsin, örneğin kendi sunucunun yerel zaman tünelinden {{group}}. Veya hesapları adlarıyla arayabilirsin {{search}}, örneğin Mastodon hesabımızı bulmak için Tusky adıyla araman yeterli. Okuma sırası Önce en eski Önce en yeni @@ -663,15 +663,15 @@ Süzgeci sil \'%1$s\'\? Sil Profil değişikliklerinizi kaydetmek istiyor musunuz\? - İşte özel iletileriniz; bazen konuşmalar veya doğrudan iletiler (Dİ) olarak da adlandırılır. -\n -\nÖzel iletiler, bir gönderinin [iconics gmd_public] görünürlüğünü [iconics gmd_mail] Doğrudan olarak ayarlayarak ve metinde bir veya daha fazla kullanıcıdan bahsederek oluşturulur. -\n + İşte özel iletileriniz; bazen konuşmalar veya doğrudan iletiler (Dİ) olarak da adlandırılır. +\n +\nÖzel iletiler, bir gönderinin {{public}} görünürlüğünü {{mail}} Doğrudan olarak ayarlayarak ve metinde bir veya daha fazla kullanıcıdan bahsederek oluşturulur. +\n \nÖrneğin, bir hesabın profil görünümünde başlayabilir ve oluştur düğmesine [iconics gmd_edit] dokunabilir ve görünürlüğü değiştirebilirsiniz. - Bu sizin liste görünümünüzdür. Bir dizi özel liste tanımlayabilir ve bunlara hesaplar ekleyebilirsiniz. -\n -\n Yalnızca takip ettiğiniz hesapları listelerinize ekleyebileceğinizi unutmayın. -\n + Bu sizin liste görünümünüzdür. Bir dizi özel liste tanımlayabilir ve bunlara hesaplar ekleyebilirsiniz. +\n +\n Yalnızca takip ettiğiniz hesapları listelerinize ekleyebileceğinizi unutmayın. +\n \n \u0020Bu listeler Hesap tercihleri [iconics gmd_account_circle] [iconics gmd_navigate_next] Sekmelerinde sekme olarak kullanılabilir. Uyarı olarak #%1$s etiketini susturma Etiket sesi kapatılıyor #%1$s @@ -778,4 +778,4 @@ Yanıtladı Yanıt olarak %1$s Devam eden konu - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index da50f0323..0af2d7648 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -655,7 +655,7 @@ Показувати статистику допису у стрічці Це ваша головна стрічка. Вона показує останні дописи облікових записів, за якими ви стежите. \n -\nЩоб переглянути облікові записи, ви можете знайти їх в одній з інших стрічок. Наприклад, на локальній стрічці вашого сервера [iconics gmd_group]. Або ви можете шукати їх за іменами [iconics gmd_search]; наприклад, шукайте Tusky, щоб знайти наш обліковий запис Mastodon. +\nЩоб переглянути облікові записи, ви можете знайти їх в одній з інших стрічок. Наприклад, на локальній стрічці вашого сервера {{group}}. Або ви можете шукати їх за іменами {{search}}; наприклад, шукайте Tusky, щоб знайти наш обліковий запис Mastodon. Зображення Керувати списками Розмір шрифту інтерфейсу @@ -681,7 +681,7 @@ Сховати з домашньої стрічки Тут розміщено ваші приватні повідомлення; іноді їх називають розмовами або прямими повідомленнями (DM). \n -\nПриватні повідомлення створюються шляхом налаштування видимості [iconics gmd_public] допису на [iconics gmd_mail] Особисту і згадування в тексті одного або кількох користувачів. +\nПриватні повідомлення створюються шляхом налаштування видимості {{public}} допису на {{mail}} Особисту і згадування в тексті одного або кількох користувачів. \n \nНаприклад, ви можете почати з перегляду профілю облікового запису, натиснути кнопку створення [iconics gmd_edit] і змінити видимість. Не вдалося відтворити: %1$s @@ -780,4 +780,4 @@ Відповідь Приватна згадка Приватна відповідь - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ef30ffa5c..eca93a38b 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -64,12 +64,12 @@ Tải về Đang tải… Đã tải xong tập tin - Bạn phải nhập một tên miền. Ví dụ mastodon.social, icosahedron.website, social.tchncs.de và vô số khác! -\n -\nNếu chưa có tài khoản, bạn phải tạo tài khoản ở đó trước. -\n -\nMáy chủ, nói cách khác là một cộng đồng nơi mà bạn đăng ký tài khoản trên đó, nhưng bạn vẫn có thể dễ dàng giao tiếp và theo dõi mọi người trên các máy chủ khác. -\n + Bạn phải nhập một tên miền. Ví dụ mastodon.social, icosahedron.website, social.tchncs.de và vô số khác! +\n +\nNếu chưa có tài khoản, bạn phải tạo tài khoản ở đó trước. +\n +\nMáy chủ, nói cách khác là một cộng đồng nơi mà bạn đăng ký tài khoản trên đó, nhưng bạn vẫn có thể dễ dàng giao tiếp và theo dõi mọi người trên các máy chủ khác. +\n \nTham khảo joinmastodon.org \u0020 Đang kết nối… Ảnh bìa @@ -612,9 +612,9 @@ Sửa từ %1$s: %2$s Hiện số tương tác tút - Đây là bảng tin của bạn. Nó sẽ hiện tút gần đây từ những người bạn theo dõi. -\n -\nĐể khám phá mọi người, bạn có thể xem qua ở các bảng tin khác. Ví dụ: [iconics gmd_group] Bảng tin máy chủ của bạn. Hoặc bạn cũng có thể [iconics gmd_search] tìm theo tên người dùng; ví dụ như Tusky. + Đây là bảng tin của bạn. Nó sẽ hiện tút gần đây từ những người bạn theo dõi. +\n +\nĐể khám phá mọi người, bạn có thể xem qua ở các bảng tin khác. Ví dụ: {{group}} Bảng tin máy chủ của bạn. Hoặc bạn cũng có thể {{search}} tìm theo tên người dùng; ví dụ như Tusky. Hình ảnh Quản lý danh sách Tải những thông báo mới nhất @@ -642,10 +642,10 @@ Xóa bộ lọc \'%1$s\'\? Xóa Bạn có chắc muốn lưu thay đổi\? - Đây là tin nhắn riêng; đôi khi gọi là thảo luận hoặc nhắn riêng (DM). -\n -\nTin nhắn riêng được tạo bằng cách chọn tùy chọn kiểu tút [iconics gmd_public] thành [iconics gmd_mail] Nhắn riêng và có nhắc đến một người nào đó. -\n + Đây là tin nhắn riêng; đôi khi gọi là thảo luận hoặc nhắn riêng (DM). +\n +\nTin nhắn riêng được tạo bằng cách chọn tùy chọn kiểu tút {{public}} thành {{mail}} Nhắn riêng và có nhắc đến một người nào đó. +\n \nVí dụ: bạn có thể xem hồ sơ của một người và nhấn vào nút [iconics gmd_edit] và đổi kiểu tút. \u0020 Đây là danh sách. Bạn có thể tạo nhiều danh sách riêng tư và thêm người dùng vào đó. \n @@ -760,4 +760,4 @@ Bỏ thay đổi chú thích? Có Không - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1d150530a..e38427d54 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -628,7 +628,7 @@ 在时间线中显示嘟文统计数字 这是你的 主时间线。它展示你所关注账户最近发表的嘟文。 \n -\n要探索账户， 你可以浏览其他时间线。比如，你的账户所在实例服务器的本地时间线 [iconics gmd_group]。你也可以按名称 [iconics gmd_search]进行搜索；比如，搜索Tusky 来寻找我们的 Mastodon 账户。 +\n要探索账户， 你可以浏览其他时间线。比如，你的账户所在实例服务器的本地时间线 {{group}}。你也可以按名称 {{search}}进行搜索；比如，搜索Tusky 来寻找我们的 Mastodon 账户。 图片 管理列表 加载最新通知 @@ -658,7 +658,7 @@ 你要保存你的个人资料更改吗？ 这是你的 私信；有时也称为对话或直接消息 (DM)。 \n -\n私信需要将嘟文的可见性 [iconics gmd_public] 设为 [iconics gmd_mail] Direct 并在文本中提及一名或多名用户。 +\n私信需要将嘟文的可见性 {{public}} 设为 {{mail}} Direct 并在文本中提及一名或多名用户。 \n \n你可以在账户的个人资料视图中，轻按“创建”按钮 [iconics gmd_edit] 并更改可见性。 以警告形式对话题标签 #%1$s 静音 @@ -774,4 +774,4 @@ 否 是 放弃字幕更改？ - \ No newline at end of file + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 1a6762d9c..6acbcbe5f 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -41,6 +41,7 @@ + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index efdcafb06..564ff28d9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,7 +7,8 @@ #56a7e1 #ca8f04 #fab207 - #00731B + #00731B + #19a341 #25d069 #CCFFD8 #DF1553 @@ -37,6 +38,7 @@ #8c2b90d9 #8f000000 + #CC16191f #44000000 #66FFFFFF #44000000 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 6be5fe36d..10bf92ddf 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -25,8 +25,6 @@ -2 - 20dp - 12dp 11.75dp @@ -67,7 +65,7 @@ 1dp 24dp - 16dp + 18dp 8dp 0dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23a55d1c2..d904fb85e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -830,9 +830,9 @@ Edit keyword %1$s: %2$s - This is your home timeline. It shows the recent posts of the accounts you follow.\n\nTo explore accounts you can either discover them in one of the other timelines. For example the local timeline of your instance [iconics gmd_group]. Or you can search them by name [iconics gmd_search]; for example search for Tusky to find our Mastodon account. - Here are your private messages; sometimes called conversations or direct messages (DM).\n\nPrivate messages are created by setting the visibility [iconics gmd_public] of a post to [iconics gmd_mail] Direct and mentioning one or more users in the text.\n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility. - This is your lists view. You can define a number of private lists and add accounts to that.\n\nNOTE that you can only add accounts you follow to your lists.\n\nThese lists can be used as a tab in Account preferences [iconics gmd_account_circle] [iconics gmd_navigate_next] Tabs. + This is your home timeline. It shows the recent posts of the accounts you follow.\n\nTo explore accounts you can either discover them in one of the other timelines. For example the local timeline of your instance {{group}}. Or you can search them by name {{search}}; for example search for Tusky to find our Mastodon account. + Here are your private messages; sometimes called conversations or direct messages (DM).\n\nPrivate messages are created by setting the visibility {{public}} of a post to {{mail}} Direct and mentioning one or more users in the text.\n\nFor example you can start on the profile view of an account and tap the create button [iconics gmd_edit] and change the visibility. + This is your lists view. You can define a number of private lists and add accounts to that.\n\nNOTE that you can only add accounts you follow to your lists.\n\nThese lists can be used as a tab in Account preferences {{manage_accounts}} {{chevron_right}} Tabs. Load newest notifications Copy version and device information diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index caba32269..e6997f5a7 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -31,7 +31,7 @@ @@ -110,6 +110,11 @@ @style/Widget.Material3.Chip.Filter @style/TuskyPreferenceTheme + + @drawable/ic_arrow_back_24dp + @style/TuskySearchViewStyle + + @color/toolbarIconBackgroundColor + + diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml index 519a2b63a..73494bb86 100644 --- a/app/src/main/res/values/theme_colors.xml +++ b/app/src/main/res/values/theme_colors.xml @@ -35,7 +35,7 @@ @color/tusky_grey_20 @color/white - #CCEBEFF4 + #CCEBEFF4 @color/tusky_green_lighter diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 864249c54..01c18776d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -36,7 +36,6 @@ kotlin = "2.1.20" image-cropper = "4.3.2" material = "1.12.0" material-drawer = "9.0.2" -material-typeface = "4.0.0.3-kotlin" mockito-inline = "5.2.0" mockito-kotlin = "5.4.0" moshi = "1.15.2" @@ -111,7 +110,6 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t image-cropper = { module = "com.github.CanHub:Android-Image-Cropper", version.ref = "image-cropper" } material-drawer-core = { module = "com.mikepenz:materialdrawer", version.ref = "material-drawer" } material-drawer-iconics = { module = "com.mikepenz:materialdrawer-iconics", version.ref = "material-drawer" } -material-typeface = { module = "com.mikepenz:google-material-typeface", version.ref = "material-typeface" } mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito-kotlin" } mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito-inline" } mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }