owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
This commit is contained in:
LucasGGamerM
2023-06-21 15:50:10 -03:00
parent 1810821983 a70d39065c
commit fd0a741ff2
43 changed files with 3253 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/res/color/chip_material_background.xml Normal file
View File

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

4
mastodon/src/main/res/drawable/bordered_rectangle_rounded_corners.xml Normal file
View File

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

3
mastodon/src/main/res/drawable/ic_fluent_beaker_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M8 4.5h1v6.238c0 0.375-0.094 0.744-0.273 1.074l-3.584 6.603C4.51 19.581 5.353 21 6.68 21h10.638c1.327 0 2.171-1.419 1.538-2.585l-3.584-6.603C15.093 11.482 15 11.113 15 10.738V4.5h1c0.414 0 0.75-0.336 0.75-0.75S16.414 3 16 3H8C7.586 3 7.25 3.336 7.25 3.75S7.586 4.5 8 4.5zm2.5 6.238V4.5h3v6.238c0 0.625 0.156 1.24 0.454 1.79l0.8 1.472H9.246l0.8-1.473c0.298-0.549 0.454-1.164 0.454-1.789zM8.432 15.5h7.136l1.971 3.63c0.09 0.167-0.03 0.37-0.22 0.37H6.681c-0.19 0-0.31-0.203-0.22-0.37l1.97-3.63z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_bed_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M6.75 4h10.5c1.462 0 2.658 1.142 2.745 2.582L20 6.75v3.354c1.097 0.31 1.915 1.283 1.994 2.459L22 12.75v7.5c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.743-0.648L20.5 20.25V18h-17v2.25c0 0.38-0.282 0.694-0.648 0.743L2.75 21c-0.38 0-0.693-0.282-0.743-0.648L2 20.25v-7.5c0-1.259 0.846-2.32 2-2.647V6.75c0-1.463 1.142-2.658 2.582-2.745L6.75 4zm12.5 7.5H4.75c-0.647 0-1.18 0.492-1.244 1.122L3.5 12.75v3.75h17v-3.75c0-0.647-0.492-1.18-1.122-1.243L19.25 11.5zm-2-6H6.75c-0.647 0-1.18 0.492-1.244 1.122L5.5 6.75V10H7c0-0.552 0.448-1 1-1h2c0.513 0 0.935 0.386 0.993 0.883L11 10h2c0-0.552 0.448-1 1-1h2c0.513 0 0.936 0.386 0.993 0.883L17 10h1.5V6.75c0-0.647-0.492-1.18-1.122-1.244L17.25 5.5z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_bin_recycle_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M7.035 3.5c-0.9 0-1.629 0.675-1.737 1.527C5.362 5.01 5.43 5 5.5 5h13c0.07 0 0.137 0.01 0.201 0.027C18.593 4.175 17.865 3.5 16.965 3.5h-9.93zM6.85 19.83c0.04 0.381 0.362 0.67 0.745 0.67h8.807c0.383 0 0.705-0.289 0.746-0.67L18.59 6.496C18.56 6.498 18.53 6.5 18.5 6.5h-13c-0.031 0-0.061-0.002-0.091-0.005L6.85 19.83zM3.803 5.6C3.596 3.676 5.101 2 7.035 2h9.93c1.933 0 3.439 1.677 3.231 3.6L18.64 19.991C18.517 21.134 17.552 22 16.403 22H7.596c-1.149 0-2.113-0.866-2.237-2.008L3.803 5.599zm7.989 4.81c0.099-0.149 0.316-0.149 0.415 0l0.67 1c0.23 0.344 0.695 0.436 1.04 0.206 0.344-0.23 0.436-0.697 0.206-1.04l-0.669-1c-0.693-1.037-2.216-1.037-2.909 0l-0.669 1c-0.23 0.343-0.138 0.81 0.207 1.04 0.344 0.23 0.81 0.138 1.04-0.207l0.669-1zM9.636 12.6c0.355 0.212 0.47 0.673 0.257 1.028l-0.364 0.607c-0.2 0.333 0.04 0.757 0.428 0.757h0.793c0.414 0 0.75 0.336 0.75 0.75s-0.336 0.75-0.75 0.75H9.957c-1.554 0-2.514-1.696-1.715-3.029l0.365-0.607c0.213-0.355 0.673-0.47 1.029-0.257zm4.473 1.028c-0.213-0.356-0.098-0.816 0.258-1.03 0.355-0.212 0.816-0.097 1.028 0.259l0.364 0.607c0.799 1.333-0.161 3.028-1.715 3.028H13.25c-0.415 0-0.75-0.336-0.75-0.75s0.335-0.75 0.75-0.75h0.794c0.388 0 0.628-0.424 0.429-0.757l-0.364-0.607z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_checkmark_starburst_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M9.836 2.034c0.112 0.038 0.222 0.084 0.329 0.136l1.283 0.632c0.348 0.171 0.756 0.171 1.104 0l1.283-0.632c1.362-0.67 3.01-0.11 3.681 1.253l0.074 0.162 0.063 0.167 0.46 1.353c0.125 0.368 0.414 0.656 0.781 0.781l1.354 0.46c1.438 0.49 2.207 2.052 1.718 3.49-0.039 0.112-0.084 0.222-0.137 0.329l-0.631 1.283c-0.172 0.348-0.172 0.756 0 1.104l0.631 1.283c0.671 1.362 0.11 3.01-1.252 3.681-0.107 0.053-0.217 0.099-0.33 0.137l-1.353 0.46c-0.367 0.125-0.656 0.414-0.78 0.781l-0.461 1.354c-0.49 1.438-2.051 2.207-3.49 1.718-0.112-0.039-0.222-0.084-0.328-0.137l-1.283-0.631c-0.348-0.172-0.756-0.172-1.104 0l-1.283 0.631c-1.363 0.671-3.011 0.11-3.682-1.252-0.052-0.107-0.098-0.217-0.136-0.33l-0.46-1.353c-0.126-0.367-0.414-0.656-0.782-0.78l-1.353-0.461c-1.438-0.49-2.207-2.051-1.718-3.49 0.038-0.112 0.084-0.222 0.136-0.328l0.632-1.283c0.171-0.348 0.171-0.756 0-1.104L2.17 10.165C1.5 8.802 2.06 7.154 3.423 6.483c0.106-0.052 0.216-0.098 0.329-0.136l1.353-0.46C5.473 5.76 5.761 5.472 5.886 5.104l0.46-1.353c0.49-1.438 2.052-2.207 3.49-1.718zm-2.07 2.2l-0.46 1.354c-0.275 0.809-0.91 1.443-1.718 1.718l-1.353 0.46c-0.051 0.019-0.101 0.04-0.15 0.064-0.619 0.304-0.874 1.053-0.569 1.672l0.632 1.283c0.377 0.766 0.377 1.664 0 2.43l-0.632 1.282c-0.024 0.049-0.045 0.099-0.062 0.15-0.222 0.653 0.127 1.363 0.78 1.586l1.354 0.46c0.809 0.275 1.443 0.91 1.718 1.718l0.46 1.354c0.018 0.05 0.039 0.1 0.063 0.15 0.305 0.619 1.054 0.873 1.673 0.569l1.283-0.632c0.766-0.377 1.664-0.377 2.43 0l1.282 0.632c0.049 0.023 0.099 0.044 0.15 0.061 0.653 0.223 1.363-0.127 1.586-0.78l0.46-1.354c0.275-0.808 0.91-1.443 1.718-1.718l1.354-0.46c0.05-0.018 0.1-0.038 0.15-0.062 0.619-0.305 0.873-1.054 0.569-1.674l-0.632-1.283c-0.377-0.765-0.377-1.663 0-2.429l0.632-1.283c0.023-0.048 0.044-0.098 0.061-0.15 0.223-0.653-0.127-1.363-0.78-1.585l-1.354-0.46c-0.808-0.276-1.443-0.91-1.718-1.719l-0.46-1.353-0.029-0.076-0.033-0.074-0.062-0.111c-0.336-0.538-1.031-0.744-1.612-0.458l-1.283 0.632c-0.765 0.377-1.663 0.377-2.429 0L9.502 3.516c-0.048-0.024-0.098-0.045-0.15-0.062C8.7 3.232 7.99 3.581 7.768 4.234zM10.05 14.39l5.42-5.42c0.292-0.292 0.767-0.292 1.06 0 0.266 0.267 0.29 0.683 0.073 0.977L16.53 10.03l-6 6c-0.286 0.286-0.74 0.29-1.031 0.028L9.424 15.98l-2.5-3C6.658 12.662 6.7 12.189 7.02 11.924c0.289-0.241 0.706-0.228 0.979 0.016l0.077 0.08 1.974 2.369 5.42-5.42-5.42 5.42z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_doctor_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M9.75 4.5C9.612 4.5 9.5 4.612 9.5 4.75v4c0 0.414-0.336 0.75-0.75 0.75h-4C4.612 9.5 4.5 9.612 4.5 9.75v4.5c0 0.138 0.112 0.25 0.25 0.25h4c0.414 0 0.75 0.336 0.75 0.75v4c0 0.138 0.112 0.25 0.25 0.25h4.5c0.138 0 0.25-0.112 0.25-0.25v-4c0-0.414 0.336-0.75 0.75-0.75h4c0.138 0 0.25-0.112 0.25-0.25v-4.5c0-0.138-0.112-0.25-0.25-0.25h-4c-0.414 0-0.75-0.336-0.75-0.75v-4c0-0.138-0.112-0.25-0.25-0.25h-4.5zM8 4.75C8 3.784 8.784 3 9.75 3h4.5C15.216 3 16 3.784 16 4.75V8h3.25C20.216 8 21 8.784 21 9.75v4.5c0 0.966-0.784 1.75-1.75 1.75H16v3.25c0 0.966-0.784 1.75-1.75 1.75h-4.5C8.784 21 8 20.216 8 19.25V16H4.75C3.784 16 3 15.216 3 14.25v-4.5C3 8.784 3.784 8 4.75 8H8V4.75z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_premium_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M17.999 3c0.24 0 0.465 0.115 0.605 0.307l0.055 0.086 3.263 6.028 0.038 0.093 0.012 0.04 0.02 0.102 0.006 0.094c0 0.069-0.01 0.136-0.027 0.2l-0.047 0.125-0.038 0.069c-0.022 0.036-0.047 0.07-0.075 0.102l0.06-0.078-0.025 0.035-9.25 10.505c-0.08 0.106-0.183 0.184-0.297 0.232L12.2 20.973l-0.078 0.017L12 21l-0.1-0.006-0.118-0.026c-0.06-0.017-0.119-0.043-0.174-0.076l-0.009-0.007c-0.047-0.029-0.09-0.063-0.13-0.104l-9.29-10.546-0.026-0.032-0.04-0.059c-0.056-0.09-0.093-0.192-0.106-0.301L2 9.75l0.003-0.066 0.013-0.089C2.022 9.565 2.03 9.537 2.04 9.51l0.022-0.06 0.029-0.057 3.248-6C5.454 3.18 5.662 3.039 5.897 3.007L5.999 3h12zm-3.002 7.5H8.998l3 7.687 2.999-7.687zm-7.608 0h-2.98l5.351 6.074L7.389 10.5zm12.198 0h-2.979l-2.368 6.07 5.347-6.07zm-10.616-6H6.445L4.007 9h3.524l1.44-4.5zm4.48 0h-2.905L9.105 9h5.785l-1.44-4.5zm4.1 0h-2.525l1.44 4.5h3.522l-2.436-4.5z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_shape_intersect_20_filled.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M2 4.5C2 3.12 3.12 2 4.5 2h6C11.88 2 13 3.12 13 4.5V7h2.5C16.88 7 18 8.12 18 9.5v6c0 1.38-1.12 2.5-2.5 2.5h-6C8.12 18 7 16.88 7 15.5V13H4.5C3.12 13 2 11.88 2 10.5v-6zM7 12V9.5C7 8.12 8.12 7 9.5 7H12V4.5C12 3.672 11.328 3 10.5 3h-6C3.672 3 3 3.672 3 4.5v6C3 11.328 3.672 12 4.5 12H7zm1 1v2.5C8 16.328 8.672 17 9.5 17h6c0.828 0 1.5-0.672 1.5-1.5v-6C17 8.672 16.328 8 15.5 8H13v2.5c0 1.38-1.12 2.5-2.5 2.5H8z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_shape_intersect_20_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M2 4.5C2 3.12 3.12 2 4.5 2h6C11.88 2 13 3.12 13 4.5V7h2.5C16.88 7 18 8.12 18 9.5v6c0 1.38-1.12 2.5-2.5 2.5h-6C8.12 18 7 16.88 7 15.5V13H4.5C3.12 13 2 11.88 2 10.5v-6zm10 0C12 3.672 11.328 3 10.5 3h-6C3.672 3 3 3.672 3 4.5v6C3 11.328 3.672 12 4.5 12H7V9.5c0-0.356 0.074-0.695 0.209-1.001 0.24-0.548 0.67-0.994 1.207-1.253L8.5 7.21C8.805 7.074 9.144 7 9.5 7H12V4.5zm-4 6.207V12h0.293L12 8.293V8h-1.293L8 10.707zm0.017-1.43l1.26-1.26c-0.65 0.097-1.163 0.61-1.26 1.26zM13 8v2.5c0 1.38-1.12 2.5-2.5 2.5H8v2.5C8 16.328 8.672 17 9.5 17h6c0.828 0 1.5-0.672 1.5-1.5v-6C17 8.672 16.328 8 15.5 8H13zm-3.293 4H10.5c0.828 0 1.5-0.672 1.5-1.5V9.707L9.707 12z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_shape_subtract_20_filled.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M4.5 2C3.12 2 2 3.12 2 4.5v6C2 11.88 3.12 13 4.5 13H7v2.5C7 16.88 8.12 18 9.5 18h6c1.38 0 2.5-1.12 2.5-2.5v-6C18 8.12 16.88 7 15.5 7H13V4.5C13 3.12 11.88 2 10.5 2h-6zM8 9.5C8 8.672 8.672 8 9.5 8h6C16.328 8 17 8.672 17 9.5v6c0 0.828-0.672 1.5-1.5 1.5h-6C8.672 17 8 16.328 8 15.5v-6z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_shape_union_20_filled.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M4.5 2C3.12 2 2 3.12 2 4.5v6C2 11.88 3.12 13 4.5 13H7v2.5C7 16.88 8.12 18 9.5 18h6c1.38 0 2.5-1.12 2.5-2.5v-6C18 8.12 16.88 7 15.5 7H13V4.5C13 3.12 11.88 2 10.5 2h-6z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_shape_union_20_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
<path android:pathData="M4.5 2C3.12 2 2 3.12 2 4.5v6c0 0.818 0.393 1.544 1 2l0.004 0.003c0.038 0.029 0.078 0.056 0.117 0.083 0.344 0.227 0.746 0.372 1.18 0.406h0.007C4.37 12.998 4.435 13 4.5 13H7v2.5c0 0.241 0.034 0.474 0.098 0.695l0.014 0.048c0.101 0.324 0.266 0.62 0.48 0.872 0.246 0.29 0.556 0.523 0.909 0.677l0.026 0.011C8.826 17.93 9.155 18 9.5 18h6c0.073 0 0.145-0.003 0.216-0.01 1.208-0.103 2.171-1.066 2.275-2.274v-0.008C17.997 15.64 18 15.57 18 15.5v-6c0-0.355-0.074-0.693-0.208-1-0.154-0.352-0.387-0.663-0.677-0.908L17.09 7.57c-0.26-0.214-0.563-0.377-0.895-0.473C15.975 7.034 15.741 7 15.5 7H13V4.5c0-0.067-0.003-0.133-0.008-0.2-0.034-0.433-0.179-0.835-0.406-1.179L12.58 3.115C12.554 3.075 12.527 3.037 12.5 3c-0.457-0.607-1.183-1-2.001-1h-6zm6.647 1.146l-8 8C3.052 10.952 3 10.733 3 10.5V9.557L9.557 3H10.5c0.232 0 0.45 0.053 0.647 0.146zm-7.294 8.708l8-8C11.949 4.048 12 4.267 12 4.5v0.793L5.293 12H4.5c-0.231 0-0.45-0.053-0.647-0.146zM12 6.707V7.5c0 0.214 0.135 0.397 0.325 0.468l-4.357 4.357C7.898 12.135 7.714 12 7.5 12H6.707L12 6.707zM13.707 8h1.586L8 15.293v-1.586L13.707 8zm2.697 0.303c0.313 0.237 0.53 0.594 0.584 1.002l-7.682 7.683c-0.409-0.053-0.766-0.27-1.003-0.584l8.101-8.101zM17 10.707v1.586L12.293 17h-1.586L17 10.707zm0 3v1.586L15.293 17h-1.586L17 13.707zM3 8.143V6.557L6.557 3h1.586L3 8.143zm0-3V4.5C3 3.672 3.672 3 4.5 3h0.643L3 5.143z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

3
mastodon/src/main/res/drawable/ic_fluent_umbrella_24_regular.xml Normal file
View File

@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
<path android:pathData="M10.248 10.912c0.473-0.398 1.077-0.733 1.752-0.733s1.28 0.335 1.752 0.733c0.23 0.195 0.413 0.391 0.537 0.538 0.062 0.073 0.108 0.132 0.138 0.172l0.036 0.05c0.14 0.206 0.372 0.328 0.62 0.328 0.249 0 0.482-0.124 0.621-0.33 0.03-0.038 0.112-0.147 0.173-0.22 0.125-0.147 0.307-0.343 0.538-0.537 0.473-0.4 1.076-0.734 1.752-0.734 0.675 0 1.279 0.335 1.751 0.733 0.231 0.195 0.414 0.391 0.538 0.538l0.173 0.22c0.185 0.274 0.526 0.394 0.84 0.297C21.786 11.87 22 11.579 22 11.25 22 6.575 17.953 2 12 2S2 6.575 2 11.25c0 0.33 0.215 0.62 0.53 0.717 0.315 0.097 0.656-0.024 0.84-0.296l0.174-0.221c0.124-0.147 0.307-0.343 0.538-0.537 0.472-0.4 1.076-0.734 1.751-0.734 0.676 0 1.28 0.335 1.752 0.733 0.23 0.195 0.413 0.391 0.538 0.538 0.061 0.073 0.144 0.182 0.173 0.22 0.14 0.206 0.372 0.33 0.62 0.33 0.25 0 0.481-0.122 0.62-0.328l0.037-0.05c0.03-0.04 0.076-0.1 0.138-0.172 0.124-0.147 0.307-0.343 0.537-0.537zM3.793 9.277C4.713 6.185 7.743 3.5 12 3.5c4.257 0 7.287 2.685 8.207 5.777-0.55-0.332-1.24-0.598-2.04-0.598-1.175 0-2.113 0.575-2.72 1.087-0.134 0.114-0.256 0.227-0.364 0.335-0.108-0.108-0.23-0.221-0.364-0.335C14.113 9.254 13.175 8.68 12 8.68c-1.175 0-2.113 0.575-2.72 1.087-0.134 0.114-0.255 0.227-0.363 0.335-0.108-0.108-0.23-0.221-0.364-0.335C7.946 9.254 7.008 8.68 5.832 8.68c-0.8 0-1.49 0.266-2.04 0.598zM12 11.18c-0.236 0-0.49 0.082-0.75 0.24V19c0 0.828-0.672 1.5-1.5 1.5s-1.5-0.672-1.5-1.5v-0.25C8.25 18.336 7.914 18 7.5 18s-0.75 0.336-0.75 0.75V19c0 1.657 1.343 3 3 3s3-1.343 3-3v-7.582c-0.26-0.157-0.514-0.24-0.75-0.24z" android:fillColor="@color/fluent_default_icon_tint"/>
</vector>

221
mastodon/src/main/res/layout/edit_timeline.xml
View File

@@ -1,22 +1,201 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageButton
style="?android:editTextStyle"
android:id="@+id/button"
android:contentDescription="@string/sk_timeline_icon"
android:paddingHorizontal="14dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="4dp"
android:layout_marginStart="24dp"
android:layout_marginBottom="16dp" />
<org.joinmastodon.android.ui.views.TextInputFrameLayout
android:id="@+id/input"
android:layout_marginStart="-8dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content" />
</LinearLayout>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageButton
android:id="@+id/button"
style="?android:editTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/sk_timeline_icon"
android:paddingHorizontal="14dp" />
<EditText
android:id="@+id/input"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="24dp"
android:layout_weight="1" />
</LinearLayout>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?colorPollVoted" />
<Button
android:id="@+id/advanced"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="16dp"
android:minHeight="32dp"
android:background="@drawable/bg_inline_button"
android:elevation="0dp"
android:fontFamily="sans-serif-medium"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
android:text="@string/sk_advanced_options_show" />
<LinearLayout
android:id="@+id/tag_wrap"
android:orientation="vertical"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sk_edit_timeline_tag_main"
android:layout_marginStart="24dp"
android:layout_marginBottom="12dp"
android:layout_marginTop="8dp"
android:drawableStart="@drawable/ic_fluent_number_symbol_20_filled"
android:drawablePadding="12dp"
android:drawableTint="?android:textColorSecondary"
android:textColor="?android:textColorSecondary" />
<EditText
android:id="@+id/tag_main"
android:hint="@string/sk_edit_timeline_tag_hint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sk_edit_timeline_tag_any"
android:layout_marginStart="24dp"
android:layout_marginBottom="12dp"
android:drawableStart="@drawable/ic_fluent_shape_union_20_filled"
android:drawablePadding="12dp"
android:drawableTint="?android:textColorSecondary"
android:textColor="?android:textColorSecondary" />
<com.hootsuite.nachos.NachoTextView
style="@style/Widget.Mastodon.EditText"
android:id="@+id/tags_any"
android:hint="@string/sk_edit_timeline_tags_hint"
android:paddingVertical="8sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
app:chipBackground="?colorAccentLightest"
app:chipTextColor="?android:textColorPrimary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sk_edit_timeline_tag_all"
android:layout_marginStart="24dp"
android:layout_marginBottom="12dp"
android:drawableStart="@drawable/ic_fluent_shape_intersect_20_filled"
android:drawablePadding="12dp"
android:drawableTint="?android:textColorSecondary"
android:textColor="?android:textColorSecondary" />
<com.hootsuite.nachos.NachoTextView
style="@style/Widget.Mastodon.EditText"
android:id="@+id/tags_all"
android:hint="@string/sk_edit_timeline_tags_hint"
android:paddingVertical="8sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
app:chipBackground="?colorAccentLightest"
app:chipTextColor="?android:textColorPrimary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sk_edit_timeline_tag_none"
android:layout_marginStart="24dp"
android:layout_marginBottom="8dp"
android:drawableStart="@drawable/ic_fluent_shape_subtract_20_filled"
android:drawablePadding="16dp"
android:drawableTint="?android:textColorSecondary"
android:textColor="?android:textColorSecondary" />
<com.hootsuite.nachos.NachoTextView
style="@style/Widget.Mastodon.EditText"
android:id="@+id/tags_none"
android:hint="@string/sk_edit_timeline_tags_hint"
android:paddingVertical="8sp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
app:chipBackground="?colorAccentLightest"
app:chipTextColor="?android:textColorPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="8dp"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
android:text="@string/sk_edit_timeline_tags_explanation" />
<LinearLayout
android:id="@+id/local_only"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
android:minHeight="48dp"
android:gravity="center_vertical"
android:layoutDirection="locale">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingVertical="8dp"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:drawableStart="@drawable/ic_fluent_eye_24_regular"
android:drawableTint="?android:textColorPrimary"
android:drawablePadding="16dp"
android:text="@string/sk_hashtag_timeline_local_only_switch" />
<Switch
android:id="@+id/local_only_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:focusable="false"
android:clickable="false"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

13
mastodon/src/main/res/layout/list_timeline_editor.xml
View File

@@ -50,15 +50,6 @@
android:gravity="center_vertical"
android:layoutDirection="locale">
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="16dp"
android:importantForAccessibility="no"
android:tint="?android:textColorPrimary"
android:src="@drawable/ic_fluent_rss_24_regular"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -66,6 +57,9 @@
android:paddingVertical="8dp"
android:textSize="16sp"
android:textColor="?android:textColorPrimary"
android:drawableStart="@drawable/ic_fluent_rss_24_regular"
android:drawableTint="?android:textColorPrimary"
android:drawablePadding="16dp"
android:text="@string/sk_list_exclusive_switch" />
<Switch
@@ -73,7 +67,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:duplicateParentState="true"
android:focusable="false"
android:clickable="false"/>

12
mastodon/src/main/res/values/nachos_attrs.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="NachoTextView">
<attr name="chipHorizontalSpacing" format="reference|dimension" />
<attr name="chipBackground" format="reference|color"/>
<attr name="chipCornerRadius" format="reference|dimension"/>
<attr name="chipTextColor" format="reference|color"/>
<attr name="chipTextSize" format="reference|dimension"/>
<attr name="chipHeight" format="reference|dimension"/>
<attr name="chipVerticalSpacing" format="reference|dimension"/>
</declare-styleable>
</resources>

5
mastodon/src/main/res/values/nachos_colors.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="chip_default_text_color">#DE000000</color>
<color name="chip_default_icon_background_color">#517FA4</color>
</resources>

7
mastodon/src/main/res/values/nachos_dimens.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="chip_default_padding_edge">12dp</dimen>
<dimen name="chip_default_padding_between_image">8dp</dimen>
<dimen name="chip_default_left_margin">0dp</dimen>
<dimen name="chip_default_right_margin">0dp</dimen>
</resources>

3
mastodon/src/main/res/values/nachos_strings.xml Normal file
View File

@@ -0,0 +1,3 @@
<resources>
<string name="chip_ellipsis">&#8230;</string>
</resources>

10
mastodon/src/main/res/values/nachos_styles.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="DefaultChipSuggestionTextView">
<item name="chipHorizontalSpacing">6dp</item>
<item name="chipBackground">@color/chip_material_background</item>
<item name="chipTextSize">14sp</item>
<item name="chipHeight">32dp</item>
<item name="chipVerticalSpacing">4dp</item>
</style>
</resources>

19
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -228,8 +228,25 @@
<string name="sk_icon_globe">Globe</string>
<string name="sk_icon_pin">Pin</string>
<string name="sk_icon_feed">Feed</string>
<string name="sk_icon_beaker">Beaker</string>
<string name="sk_icon_bed">Bed</string>
<string name="sk_icon_recycle_bin">Recycle bin</string>
<string name="sk_icon_verified">Verified</string>
<string name="sk_icon_doctor">Doctor</string>
<string name="sk_icon_diamond">Diamond</string>
<string name="sk_icon_umbrella">Umbrella</string>
<string name="sk_edit_timeline">Edit timeline</string>
<string name="sk_add_timeline">Add timeline</string>
<string name="sk_edit_timelines">Edit timelines</string>
<string name="sk_edit_timeline_tag_main">Posts containing hashtag…</string>
<string name="sk_edit_timeline_tag_any">…or any of these</string>
<string name="sk_edit_timeline_tag_all">…and every one of these</string>
<string name="sk_edit_timeline_tag_none">…but none of these</string>
<string name="sk_edit_timeline_tag_hint">Enter hashtag…</string>
<string name="sk_edit_timeline_tags_hint">Enter hashtags…</string>
<string name="sk_edit_timeline_tags_explanation">Please note that the server handles these operations. Combining them might not be supported.</string>
<string name="sk_hashtag_timeline_local_only_switch">Show only local posts?</string>
<string name="sk_add_timeline_tag_error_empty">Hashtag must not be empty</string>
<string name="sk_alt_button">ALT</string>
<string name="sk_post_edited">edited</string>
<string name="sk_notification_type_update">Edited posts</string>
@@ -309,4 +326,6 @@
<string name="sk_exclusive_list">Exclusive list</string>
<string name="sk_list_exclusive_switch">Make list exclusive</string>
<string name="sk_list_exclusive_switch_explanation">Members of an exclusive list will not show up on your home timeline – if your instance supports it.</string>
<string name="sk_advanced_options_show">Show advanced options</string>
<string name="sk_advanced_options_hide">Hide advanced options</string>
</resources>