owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
0589612df9ce59504bf71f070ca1c778d8adceed
moshidon/mastodon/src/main/res/layout
History
LucasGGamerM 0589612df9 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_gifv.xml
#	mastodon/src/main/res/layout/display_item_photo.xml
#	mastodon/src/main/res/layout/display_item_video.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/menu/profile.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-gl-rES/strings_sk.xml
#	mastodon/src/main/res/values-in-rID/strings_sk.xml
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	metadata/it-IT/full_description.txt
#	metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
..
alt_badge.xml
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:51:26 +01:00
button_bar_activation.xml
fix button bar layout in onboarding activation for smaller widths
2022-11-13 12:58:33 +01:00
button_bar_one.xml
Reporting
2022-03-07 14:01:40 +03:00
button_bar_two.xml
Fixes
2022-03-31 20:54:49 +03:00
compose_action.xml
hide scheduling options when editing
2023-01-27 15:05:17 -03:00
compose_fab.xml
generify fab button
2023-02-07 14:10:31 +01:00
compose_media_thumb.xml
fix cut off text
2023-01-18 13:57:50 -03:00
compose_poll_option.xml
feat(accessibility): add contentDesc/toolTip to poll options
2023-01-09 17:21:38 +01:00
design_layout_tab_icon.xml
Profiles
2022-02-07 15:07:12 +03:00
design_layout_tab_text.xml
Profiles
2022-02-07 15:07:12 +03:00
discover_info_banner.xml
New home layout with public timelines (#288)
2023-01-20 17:30:11 -03:00
display_item_account_card.xml
Notifications
2022-03-05 12:59:27 +03:00
display_item_account.xml
Search now actually searches, yay
2022-03-31 17:49:54 +03:00
display_item_audio.xml
Fix #151
2022-05-13 19:18:29 +03:00
display_item_extended_footer.xml
change edit history icon
2022-11-11 13:03:39 +01:00
display_item_filter_warning.xml
fix overlapping text
2023-02-13 16:32:52 +01:00
display_item_footer.xml
fix(favourite): set correct gravity for animation
2023-02-17 22:35:46 +01:00
display_item_gap.xml
Home timeline auto-refresh
2022-04-28 23:22:55 +03:00
display_item_gifv.xml
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:51:26 +01:00
display_item_header.xml
Merge remote-tracking branch 'megalodon_main/main'
2023-03-21 20:25:51 -03:00
display_item_link_card.xml
Link cards
2022-02-22 07:17:16 +03:00
display_item_photo.xml
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:51:26 +01:00
display_item_poll_footer.xml
Poll voting
2022-02-16 03:58:13 +03:00
display_item_poll_option.xml
fix poll option displaying wrong own vote
2022-12-10 17:10:55 -03:00
display_item_reblog_or_reply_line.xml
reply part before reblog part
2023-03-16 19:14:28 +01:00
display_item_text.xml
hide expand/collapse to screen reader
2023-02-06 16:54:54 +01:00
display_item_video.xml
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:51:26 +01:00
display_item_warning.xml
Its pretty much done i think
2023-02-01 21:39:54 -03:00
edit_timeline.xml
Pinnable timelines (#338)
2023-01-27 14:32:04 -03:00
fragment_compose.xml
Merge remote-tracking branch 'megalodon_main/main'
2023-03-21 20:25:51 -03:00
fragment_content_report_posts.xml
Reporting
2022-03-07 14:01:40 +03:00
fragment_discover.xml
scale text according to system
2023-01-10 11:13:04 -03:00
fragment_image_description.xml
scroll image in alt text editor
2023-01-27 14:42:30 -03:00
fragment_lists.xml
Undoing all the stuff that was broken
2022-12-11 15:55:28 -03:00
fragment_login.xml
New login screen
2022-12-04 01:34:03 +03:00
fragment_notifications.xml
Notifications
2022-03-05 12:59:27 +03:00
fragment_onboarding_activation.xml
Minor onboarding tweaks
2023-02-12 14:25:03 +03:00
fragment_onboarding_common.xml
Update onboarding
2023-01-27 15:24:48 -03:00
fragment_onboarding_follow_suggestions.xml
Minor onboarding tweaks
2023-02-12 14:25:03 +03:00
fragment_onboarding_profile_setup.xml
Signup flow redesign WIP
2023-01-30 01:54:13 +03:00
fragment_onboarding_rules.xml
adapt upstream changes
2023-01-27 15:37:51 -03:00
fragment_onboarding_signup.xml
Signup flow redesign WIP
2023-01-30 01:54:13 +03:00
fragment_profile_about.xml
Finishing moving all the relevant strings to strings_mo.xml
2023-01-23 18:56:50 -03:00
fragment_profile.xml
Fixing thy profile page
2023-02-07 18:32:46 -03:00
fragment_report_choice.xml
Reporting
2022-03-07 14:01:40 +03:00
fragment_report_comment.xml
support admin notifications
2023-01-27 15:33:40 -03:00
fragment_report_done.xml
Reporting
2022-03-07 14:01:40 +03:00
fragment_report_posts.xml
Fixes
2022-03-31 20:54:49 +03:00
fragment_search.xml
Search now actually searches, yay
2022-03-31 17:49:54 +03:00
fragment_splash.xml
Fixing compile problems. Merging the language picker from megalodon.
2022-12-14 19:23:06 -03:00
fragment_welcome_custom.xml
Refactoring names to custom. Thank you @sk22 for this amazing piece of commit
2022-12-17 21:19:40 -03:00
header_onboarding_login.xml
Fix #500
2023-02-12 04:03:09 +03:00
header_welcome_custom.xml
feat(welcome): use URI InputType (#454)
2023-03-11 13:01:11 +01:00
home_toolbar.xml
rearrange home menus
2023-01-27 14:46:16 -03:00
item_account_list.xml
fix text scaling height and margin issues
2023-02-03 16:24:30 +01:00
item_account_switcher.xml
Revert "refactor(account-switcher-sheet): remove duplicated code"
2023-03-18 17:03:15 -03:00
item_autocomplete_user.xml
Compose: auto-complete mentions, hashtags, and emojis
2022-03-17 06:28:36 +03:00
item_boost_menu.xml
change missing icons
2023-01-27 15:37:36 -03:00
item_discover_account.xml
Revert "Fixing it"
2023-01-16 15:26:27 -03:00
item_emoji_section.xml
scale text according to system
2023-01-10 11:13:04 -03:00
item_instance_catalog.xml
Update onboarding
2023-01-27 15:24:48 -03:00
item_instance_category.xml
scale text according to system
2023-01-10 11:13:04 -03:00
item_instance_custom.xml
support akkoma local visibility / but it still doesnt compile
2023-01-27 15:29:44 -03:00
item_instance_login.xml
New login screen
2022-12-04 01:34:03 +03:00
item_list_header_simple.xml
Editing the InstanceRulesFragment for allowing a more coherent color scheme
2022-12-30 19:42:16 -03:00
item_list_header.xml
Fixes
2022-03-31 20:54:49 +03:00
item_mute_duration.xml
refactor(mute-user-timer): add bottom padding for design consistency
2023-03-06 21:07:48 -03:00
item_privacy_policy_link.xml
More onboarding updates
2023-01-27 15:36:27 -03:00
item_profile_about_add_row.xml
Fix state save/restore and move colors to attrs
2022-02-13 16:16:20 +03:00
item_profile_about_editable.xml
move metadata to profile
2023-02-03 14:50:06 +01:00
item_profile_about.xml
add missing margin
2023-02-06 13:53:28 +01:00
item_recent_searches_header.xml
fix cut off text
2023-01-18 13:57:50 -03:00
item_report_choice.xml
feat(reportChoice): set radioIcon importantForAccessibility to no
2023-01-09 19:21:20 +01:00
item_server_rule.xml
scale text according to system
2023-01-10 11:13:04 -03:00
item_settings_button.xml
improve settings items
2022-12-29 17:48:44 -03:00
item_settings_footer.xml
Use sp units for text sizes where they don't break layout
2022-04-07 18:26:45 +03:00
item_settings_header.xml
Accessibility improvements
2022-04-07 19:46:54 +03:00
item_settings_notification_policy.xml
scale text according to system
2023-01-10 11:13:04 -03:00
item_settings_switch.xml
Unbreak weird switch items thing
2023-02-02 15:13:20 -03:00
item_settings_text.xml
display image cache size
2023-01-18 14:00:15 -03:00
item_settings_theme_subitem.xml
feat(settingsThemeItem): hide image for accessibility
2023-01-09 19:12:19 +01:00
item_settings_theme.xml
Settings and other things
2022-04-06 03:11:15 +03:00
item_settings_update.xml
Pulling better button from megalodon, thanks @sk22!
2023-02-02 15:20:34 -03:00
item_text.xml
Pinnable timelines (#338)
2023-01-27 14:32:04 -03:00
item_trending_hashtag.xml
Discover stuff
2022-03-02 12:38:14 +03:00
item_trending_link.xml
Discover stuff
2022-03-02 12:38:14 +03:00
item_user_row_m3.xml
Signup flow redesign WIP
2023-01-30 01:54:13 +03:00
list_timeline_editor.xml
implement editing lists
2023-01-18 13:35:26 -03:00
loader_fragment_overlay_toolbar.xml
Profiles
2022-02-07 15:07:12 +03:00
onboarding_profile_field.xml
Minor onboarding stuff
2023-02-10 21:09:06 +03:00
overlay_image_alt_text.xml
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:51:26 +01:00
photo_viewer_ui.xml
use color attributes instead of fixed colors
2022-12-22 14:33:46 -03:00
place_holder_display_item.xml
Now it acctually shows a missing posts warning below every filtered post. Still a long way to go
2023-01-29 18:24:34 -03:00
profile_toolbar.xml
Profiles
2022-02-07 15:07:12 +03:00
recycler_fragment_no_refresh.xml
Profiles
2022-02-07 15:07:12 +03:00
recycler_fragment_with_fab.xml
generify fab button
2023-02-07 14:10:31 +01:00
tab_bar.xml
feat: implement notification badge using markers from @sk22.
2023-03-21 19:55:34 -03:00