27eefbf65a
* do not add media urls to status text * add scrolling to content * add arrow icon and animation to replying-to toggle * remove unnecessary compose_button_colors.xml * improve toot button * improve bottom bar, add bottom sheet for compose options, dedicated cw button * fix crash on Android < API 21 * move media picking from dialog to bottom sheet * add small style tootbutton * fix colors/button background for light theme * add icons to media chose bottom sheet * improve hide media button, delete unused styles * fix crash on dev build when taking photo * consolidate drawables * consolidate strings and ids, add tooltips to buttons * allow media only toots * change error message to show max size of upload correctly * fix button color * add emoji * code cleanup * Merge branch 'master' into compose_activity_refactoring # Conflicts: # app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java * fix hidden snackbar * improve hint text color * add SendTootService * fix timeline refreshing * toot saving and error handling for sendtootservice * restructure some code * convert EditTextTyped to Kotlin * fixed pick media button disabled color * force sensitive media when content warning is shown * add db cache for emojis & fix tests * reorder buttons to match mastodon web * add possibility to cancel sending of toot * correctly delete sent toots * refresh SavedTootActivity after toot was sent * remove unused resources * correct params for toot saving in SendTootService * consolidate strings * bugfix * remove unused resources * fix notifications on old android for SendTootService * fix crash
69 lines
No EOL
2.9 KiB
XML
69 lines
No EOL
2.9 KiB
XML
<merge xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
tools:parentTag="android.widget.LinearLayout">
|
|
|
|
<RadioGroup
|
|
android:id="@+id/visibilityRadioGroup"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginBottom="@dimen/compose_options_margin"
|
|
android:layout_marginLeft="@dimen/compose_options_margin"
|
|
android:layout_marginRight="@dimen/compose_options_margin"
|
|
android:layout_marginTop="6dp"
|
|
android:checkedButton="@+id/radio_public"
|
|
android:orientation="vertical">
|
|
|
|
<android.support.v7.widget.AppCompatRadioButton
|
|
android:id="@+id/publicRadioButton"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_weight="1"
|
|
android:paddingEnd="0dp"
|
|
android:paddingStart="10dp"
|
|
android:text="@string/visibility_public"
|
|
android:textColor="?android:textColorTertiary"
|
|
app:buttonTint="?attr/compound_button_color" />
|
|
|
|
<android.support.v7.widget.AppCompatRadioButton
|
|
android:id="@+id/unlistedRadioButton"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_weight="1"
|
|
android:paddingEnd="0dp"
|
|
android:paddingStart="10dp"
|
|
android:text="@string/visibility_unlisted"
|
|
android:textColor="?android:textColorTertiary"
|
|
app:buttonTint="?attr/compound_button_color" />
|
|
|
|
<android.support.v7.widget.AppCompatRadioButton
|
|
android:id="@+id/privateRadioButton"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginBottom="4dp"
|
|
android:layout_marginTop="4dp"
|
|
android:layout_weight="1"
|
|
android:paddingEnd="0dp"
|
|
android:paddingStart="10dp"
|
|
android:text="@string/visibility_private"
|
|
android:textColor="?android:textColorTertiary"
|
|
app:buttonTint="?attr/compound_button_color" />
|
|
|
|
<android.support.v7.widget.AppCompatRadioButton
|
|
android:id="@+id/directRadioButton"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="5dp"
|
|
android:layout_weight="1"
|
|
android:paddingEnd="0dp"
|
|
android:paddingStart="10dp"
|
|
android:text="@string/visibility_direct"
|
|
android:textColor="?android:textColorTertiary"
|
|
app:buttonTint="?attr/compound_button_color" />
|
|
|
|
</RadioGroup>
|
|
|
|
</merge> |