Instance configuration: the easy parts (#2341)
* Add data model for instance configuration * Support instance.configuration.statuses.max_characters * Support instance.configuration.statuses.characters_reserved_per_url * Support instance.configuration.polls.max_options and max_characters_per_option * Pacify ktlint * Support instance-configured poll durations * Fixup versions for migration after rebase
This commit is contained in:
parent
cdefcc441f
commit
7114575497
14 changed files with 1016 additions and 52 deletions
|
@ -37,7 +37,6 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:entries="@array/poll_duration_names"
|
||||
app:layout_constraintBottom_toBottomOf="@id/addChoiceButton"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/addChoiceButton"
|
||||
|
|
|
@ -164,6 +164,12 @@
|
|||
<item>@string/duration_1_day</item>
|
||||
<item>@string/duration_3_days</item>
|
||||
<item>@string/duration_7_days</item>
|
||||
<item>@string/duration_14_days</item>
|
||||
<item>@string/duration_30_days</item>
|
||||
<item>@string/duration_60_days</item>
|
||||
<item>@string/duration_90_days</item>
|
||||
<item>@string/duration_180_days</item>
|
||||
<item>@string/duration_365_days</item>
|
||||
</string-array>
|
||||
|
||||
<integer-array name="poll_duration_values"> <!-- values in seconds, corresponding to poll_duration_names -->
|
||||
|
@ -174,6 +180,12 @@
|
|||
<item>86400</item>
|
||||
<item>259200</item>
|
||||
<item>604800</item>
|
||||
<item>1209600</item>
|
||||
<item>2592000</item>
|
||||
<item>5184000</item>
|
||||
<item>7776000</item>
|
||||
<item>15552000</item>
|
||||
<item>31536000</item>
|
||||
</integer-array>
|
||||
|
||||
<string-array name="mute_duration_names">
|
||||
|
|
|
@ -580,6 +580,12 @@
|
|||
<string name="duration_1_day">1 day</string>
|
||||
<string name="duration_3_days">3 days</string>
|
||||
<string name="duration_7_days">7 days</string>
|
||||
<string name="duration_14_days">14 days</string>
|
||||
<string name="duration_30_days">30 days</string>
|
||||
<string name="duration_60_days">60 days</string>
|
||||
<string name="duration_90_days">90 days</string>
|
||||
<string name="duration_180_days">180 days</string>
|
||||
<string name="duration_365_days">365 days</string>
|
||||
<string name="add_poll_choice">Add choice</string>
|
||||
<string name="poll_allow_multiple_choices">Multiple choices</string>
|
||||
<string name="poll_new_choice_hint">Choice %d</string>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue