Settings and other things

mastodon/src/main/res/anim/fade_out_fast.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+	android:duration="200"
+	android:interpolator="@android:anim/decelerate_interpolator"
+	android:fromAlpha="1.0"
+	android:toAlpha="0.0"/>

mastodon/src/main/res/drawable/bg_inline_button.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+	<item>
+		<shape>
+			<solid android:color="?colorPollVoted"/>
+			<corners android:radius="4dp"/>
+		</shape>
+	</item>
+</ripple>

mastodon/src/main/res/drawable/ic_fluent_dark_theme_24_regular.xml

@@ -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="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10zm0-1.5v-17c4.694 0 8.5 3.806 8.5 8.5s-3.806 8.5-8.5 8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_gif_24_regular.xml

@@ -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="M18.75 3.501c1.795 0 3.25 1.455 3.25 3.25v10.503c0 1.794-1.455 3.25-3.25 3.25H5.25c-1.795 0-3.25-1.456-3.25-3.25V6.75C2 4.955 3.455 3.5 5.25 3.5h13.5zm0 1.5H5.25c-0.966 0-1.75 0.784-1.75 1.75v10.503c0 0.966 0.784 1.75 1.75 1.75h13.5c0.966 0 1.75-0.784 1.75-1.75V6.75C20.5 5.784 19.716 5 18.75 5zM8.015 8.872c0.596 0 1.018 0.082 1.502 0.314 0.31 0.15 0.442 0.523 0.293 0.834-0.15 0.31-0.523 0.442-0.834 0.293-0.3-0.144-0.54-0.19-0.961-0.19-0.867 0-1.504 0.796-1.504 1.872 0 1.077 0.638 1.876 1.504 1.876 0.428 0 0.791-0.18 0.98-0.501L9 13.355v-0.734H8.625c-0.314 0-0.573-0.23-0.618-0.532L8 11.997c0-0.314 0.232-0.574 0.533-0.619l0.092-0.006h1.002c0.314 0 0.573 0.23 0.618 0.532l0.007 0.093-0.002 1.547-0.006 0.056-0.021 0.09-0.02 0.055c-0.377 0.89-1.241 1.376-2.188 1.376-1.626 0-2.754-1.413-2.754-3.126 0-1.713 1.127-3.123 2.754-3.123zm4.614 0.122c0.314 0 0.574 0.232 0.618 0.533l0.007 0.092v4.763c0 0.345-0.28 0.625-0.625 0.625-0.314 0-0.574-0.232-0.618-0.533l-0.007-0.092V9.619c0-0.345 0.28-0.625 0.625-0.625zm2.996 0l1.997 0.007c0.345 0.002 0.624 0.282 0.623 0.627-0.001 0.314-0.233 0.573-0.535 0.617l-0.092 0.006-1.371-0.005V12h1.123c0.314 0 0.574 0.232 0.618 0.534l0.007 0.092c0 0.314-0.231 0.573-0.533 0.618l-0.092 0.007-1.123-0.001v1.115c0 0.314-0.23 0.574-0.532 0.619l-0.092 0.006c-0.314 0-0.574-0.23-0.619-0.532l-0.006-0.093V9.617c0-0.314 0.233-0.573 0.534-0.616l0.093-0.007z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_link_24_regular.xml

@@ -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.25 7C9.664 7 10 7.336 10 7.75c0 0.377-0.277 0.688-0.64 0.742L9.25 8.5H7c-1.933 0-3.5 1.567-3.5 3.5 0 1.864 1.457 3.388 3.294 3.494L7 15.5h2.25c0.414 0 0.75 0.336 0.75 0.75 0 0.377-0.277 0.688-0.64 0.742L9.25 17H7c-2.761 0-5-2.239-5-5 0-2.678 2.105-4.864 4.75-4.994L7 7h2.25zM17 7c2.761 0 5 2.239 5 5 0 2.678-2.105 4.864-4.75 4.994L17 17h-2.25C14.336 17 14 16.664 14 16.25c0-0.377 0.277-0.688 0.64-0.742l0.11-0.008H17c1.933 0 3.5-1.567 3.5-3.5 0-1.864-1.457-3.388-3.294-3.494L17 8.5h-2.25C14.336 8.5 14 8.164 14 7.75c0-0.377 0.277-0.688 0.64-0.742L14.75 7H17zM7 11.25h10c0.414 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.743L17 12.75H7c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.694 0.648-0.743L7 11.25h10H7z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_person_add_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="25dp" android:height="24dp" android:viewportWidth="25" android:viewportHeight="24">
+    <path android:pathData="M17.916 12c3.038 0 5.5 2.463 5.5 5.5 0 3.038-2.462 5.5-5.5 5.5-3.037 0-5.5-2.462-5.5-5.5 0-3.037 2.463-5.5 5.5-5.5zm-5.477 2c-0.297 0.463-0.537 0.966-0.709 1.5H4.669c-0.414 0-0.75 0.335-0.75 0.75v0.577c0 0.535 0.192 1.053 0.54 1.46 1.253 1.469 3.22 2.214 5.957 2.214 0.597 0 1.157-0.035 1.68-0.106 0.246 0.495 0.553 0.954 0.912 1.367-0.795 0.16-1.66 0.24-2.592 0.24-3.146 0-5.532-0.906-7.098-2.74-0.58-0.679-0.898-1.543-0.898-2.435v-0.578C2.42 15.007 3.427 14 4.669 14h7.77zm5.477 0l-0.09 0.008c-0.204 0.037-0.364 0.198-0.402 0.402l-0.008 0.09V17H14.92l-0.09 0.008c-0.204 0.037-0.365 0.198-0.402 0.402L14.42 17.5l0.008 0.09c0.037 0.204 0.198 0.365 0.402 0.402L14.92 18h2.495l0.001 2.5 0.008 0.09c0.038 0.204 0.198 0.365 0.402 0.402L17.916 21l0.09-0.008c0.204-0.037 0.365-0.198 0.402-0.402l0.008-0.09V18h2.504l0.09-0.008c0.204-0.037 0.365-0.198 0.402-0.402l0.008-0.09-0.008-0.09c-0.037-0.204-0.198-0.365-0.402-0.402L20.92 17h-2.505l0.001-2.5-0.008-0.09c-0.037-0.204-0.198-0.365-0.402-0.402L17.916 14zm-7.5-11.995c2.762 0 5 2.239 5 5s-2.238 5-5 5c-2.761 0-5-2.239-5-5s2.239-5 5-5zm0 1.5c-1.933 0-3.5 1.567-3.5 3.5s1.567 3.5 3.5 3.5 3.5-1.567 3.5-3.5-1.567-3.5-3.5-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_fluent_prohibited_24_regular.xml

@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="25dp" android:height="24dp" android:viewportWidth="25" android:viewportHeight="24">
+    <path android:pathData="M12.416 2c5.523 0 10 4.477 10 10s-4.477 10-10 10-10-4.477-10-10 4.477-10 10-10zm6.517 4.543L6.96 18.517c1.477 1.238 3.38 1.983 5.457 1.983 4.694 0 8.5-3.806 8.5-8.5 0-2.077-0.745-3.98-1.983-5.457zM12.416 3.5c-4.694 0-8.5 3.806-8.5 8.5 0 2.077 0.745 3.98 1.983 5.457L17.873 5.483C16.396 4.245 14.493 3.5 12.416 3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>

mastodon/src/main/res/drawable/ic_ntf_logo.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.7096,17.7682C19.4819,17.4391 21.8955,15.7408 22.199,14.1888C22.6769,11.7442 22.6376,8.2231 22.6376,8.2231C22.6376,3.4504 19.4929,2.0516 19.4929,2.0516C17.9073,1.3274 15.1846,1.023 12.356,1H12.2865C9.4579,1.023 6.7369,1.3274 5.1513,2.0516C5.1513,2.0516 2.0066,3.4504 2.0066,8.2231C2.0066,8.5125 2.0051,8.8169 2.0035,9.1339C1.9991,10.0135 1.9943,10.9896 2.0199,12.0083C2.1341,16.6755 2.8805,21.2752 7.2202,22.4175C9.2213,22.944 10.9392,23.0542 12.323,22.9785C14.832,22.8403 16.2406,22.0883 16.2406,22.0883L16.1577,20.2779C16.1577,20.2779 14.3648,20.8402 12.3511,20.7717C10.356,20.7037 8.2496,20.5577 7.9269,18.1221C7.8972,17.9082 7.8823,17.6794 7.8823,17.4391C7.8823,17.4391 9.8408,17.9152 12.323,18.0283C13.8407,18.0974 15.2639,17.9399 16.7096,17.7682ZM18.8747,14.3719V8.5932C18.8747,7.4121 18.5723,6.4736 17.9648,5.7792C17.3382,5.0849 16.518,4.729 15.4997,4.729C14.3212,4.729 13.4291,5.1792 12.8392,6.0799L12.2657,7.0359L11.692,6.0799C11.1023,5.1792 10.21,4.729 9.0316,4.729C8.0134,4.729 7.193,5.0849 6.5664,5.7792C5.9589,6.4736 5.6565,7.4121 5.6565,8.5932V14.3719H7.959V8.763C7.959,7.5805 8.4594,6.9806 9.4602,6.9806C10.5665,6.9806 11.1211,7.6925 11.1211,9.1001V12.1701H13.4101V9.1001C13.4101,7.6925 13.9647,6.9806 15.071,6.9806C16.0718,6.9806 16.5722,7.5805 16.5722,8.763V14.3719H18.8747Z"
-      android:fillColor="#000000"
+      android:fillColor="#fff"
       android:fillType="evenOdd"/>
 </vector>

mastodon/src/main/res/layout/item_settings_footer.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="24dp"
+	android:textSize="16dp"
+	android:textColor="?android:textColorSecondary"
+	android:gravity="center"
+	tools:text="Visual appearance"/>

mastodon/src/main/res/layout/item_settings_header.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:textSize="14dp"
+	android:fontFamily="sans-serif-medium"
+	android:textColor="?android:colorAccent"
+	android:padding="16dp"
+	tools:text="Visual appearance"/>

mastodon/src/main/res/layout/item_settings_notification_policy.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="32dp"
+	android:layoutDirection="locale"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:gravity="center_vertical"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="20dp"
+		android:fontFamily="sans-serif-medium"
+		android:singleLine="true"
+		android:ellipsize="end"
+		android:text="@string/notify_me_when"/>
+
+	<Button
+		android:id="@+id/button"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_marginStart="8dp"
+		android:background="@drawable/bg_inline_button"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="20dp"
+		android:fontFamily="sans-serif-medium"
+		android:paddingLeft="4dp"
+		android:paddingRight="4dp"
+		android:stateListAnimator="@null"
+		android:elevation="0dp"
+		tools:text="@string/notify_followed"/>
+
+</LinearLayout>

mastodon/src/main/res/layout/item_settings_switch.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="horizontal"
+	android:layout_width="match_parent"
+	android:layout_height="48dp"
+	android:gravity="center_vertical"
+	android:layoutDirection="locale">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="32dp"
+		android:importantForAccessibility="no"
+		android:tint="?android:textColorPrimary"
+		tools:src="@drawable/ic_fluent_star_24_regular"/>
+
+	<TextView
+		android:id="@+id/text"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:textSize="16dp"
+		android:textColor="?android:textColorPrimary"
+		android:singleLine="true"
+		android:ellipsize="end"
+		tools:text="@string/theme_true_black"/>
+
+	<Switch
+		android:id="@+id/checkbox"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="12dp"
+		android:clickable="false"/>
+
+</LinearLayout>

mastodon/src/main/res/layout/item_settings_text.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="48dp"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp"
+	android:gravity="center_vertical"
+	android:textSize="16dp"
+	android:textColor="?android:textColorPrimary"
+	android:singleLine="true"
+	android:ellipsize="end"
+	tools:text="daffdsa"/>

mastodon/src/main/res/layout/item_settings_theme.xml

@@ -0,0 +1,28 @@
+<?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"
+	android:paddingLeft="16dp"
+	android:paddingRight="16dp"
+	android:paddingBottom="8dp"
+	android:clipChildren="false"
+	android:clipToPadding="false">
+
+	<include layout="@layout/item_settings_theme_subitem" android:id="@+id/theme_auto"/>
+
+	<Space
+		android:layout_width="0dp"
+		android:layout_height="1dp"
+		android:layout_weight="1"/>
+
+	<include layout="@layout/item_settings_theme_subitem" android:id="@+id/theme_light"/>
+
+	<Space
+		android:layout_width="0dp"
+		android:layout_height="1dp"
+		android:layout_weight="1"/>
+
+	<include layout="@layout/item_settings_theme_subitem" android:id="@+id/theme_dark"/>
+
+</LinearLayout>

mastodon/src/main/res/layout/item_settings_theme_subitem.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:layout_width="100dp"
+	android:layout_height="wrap_content">
+
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="100dp"
+		android:layout_height="121dp"
+		android:elevation="1dp"
+		android:foreground="?android:selectableItemBackground"
+		android:duplicateParentState="true"
+		tools:src="@drawable/theme_auto"/>
+
+	<TextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="20dp"
+		android:layout_marginTop="8dp"
+		android:textAppearance="@style/m3_body_medium"
+		android:gravity="center"
+		android:singleLine="true"
+		android:ellipsize="end"
+		tools:text="@string/theme_auto"/>
+
+	<ImageView
+		android:id="@+id/checkbox"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:layout_marginTop="8dp"
+		android:layout_gravity="center_horizontal"
+		android:src="@drawable/ic_round_checkbox"/>
+
+</LinearLayout>

mastodon/src/main/res/menu/notification_policy.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/notify_anyone" android:title="@string/notify_anyone" android:icon="@drawable/ic_fluent_earth_24_filled"/>
+	<item android:id="@+id/notify_follower" android:title="@string/notify_follower" android:icon="@drawable/ic_fluent_people_checkmark_24_regular"/>
+	<item android:id="@+id/notify_followed" android:title="@string/notify_followed" android:icon="@drawable/ic_fluent_people_checkmark_24_regular"/>
+	<item android:id="@+id/notify_none" android:title="@string/notify_none" android:icon="@drawable/ic_fluent_prohibited_24_regular"/>
+</menu>

mastodon/src/main/res/values-night/styles.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Dark"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Dark.TrueBlack"/>
 </resources>

mastodon/src/main/res/values/strings.xml

@@ -130,7 +130,7 @@
 	<string name="notification_channel_audio_player">Audio playback</string>
 	<string name="play">Play</string>
 	<string name="pause">Pause</string>
-	<string name="log_out">Log out</string>
+	<string name="log_out">Sign out</string>
 	<string name="add_account">Add account</string>
 	<string name="search_hint">Search</string>
 	<string name="hashtags">Hashtags</string>
@@ -236,4 +236,32 @@
 	</plurals>
 	<string name="media_attachment_unsupported_type">File %s is of an unsupported type</string>
 	<string name="media_attachment_too_big">File %1$s exceeds the size limit of %2$s MB</string>
+	<string name="settings_theme">Visual appearance</string>
+	<string name="theme_auto">Automatic</string>
+	<string name="theme_light">Light</string>
+	<string name="theme_dark">Dark</string>
+	<string name="theme_true_black">True black mode</string>
+	<string name="settings_behavior">Behavior</string>
+	<string name="settings_gif">Play animated avatars and emoji</string>
+	<string name="settings_custom_tabs">Use in-app browser</string>
+	<string name="settings_notifications">Notifications</string>
+	<string name="notify_me_when">Notify me when</string>
+	<string name="notify_anyone">anyone</string>
+	<string name="notify_follower">a follower</string>
+	<string name="notify_followed">someone I follow</string>
+	<string name="notify_none">no one</string>
+	<string name="notify_favorites">Favorites my post</string>
+	<string name="notify_follow">Follows me</string>
+	<string name="notify_reblog">Reblogs my post</string>
+	<string name="notify_mention">Mentions me</string>
+	<string name="settings_boring">The boring zone</string>
+	<string name="settings_account">Account settings</string>
+	<string name="settings_contribute">Contribute to Mastodon</string>
+	<string name="settings_tos">Terms of service</string>
+	<string name="settings_privacy_policy">Privacy policy</string>
+	<string name="settings_spicy">The spicy zone</string>
+	<string name="settings_clear_cache">Clear media cache</string>
+	<string name="settings_app_version">Mastodon for Android v%1$s (%2$d)</string>
+	<string name="media_cache_cleared">Media cache cleared</string>
+	<string name="confirm_log_out">Are you sure you want to sign out?</string>
 </resources>

mastodon/src/main/res/values/styles.xml

@@ -92,7 +92,12 @@
 		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
 	</style>
 
+	<style name="Theme.Mastodon.Dark.TrueBlack">
+		<item name="colorWindowBackground">#000</item>
+	</style>
+
 	<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
 
 	<style name="Theme.Mastodon.Toolbar" parent="android:ThemeOverlay.Material.ActionBar">
 		<item name="android:colorPrimary">@color/gray_50</item>
@@ -282,4 +287,8 @@
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">3dp</item>
 	</style>
+
+	<style name="window_fade_out">
+		<item name="android:windowExitAnimation">@anim/fade_out_fast</item>
+	</style>
 </resources>