use m3 switches in dialogs

closes #653
sk22 · Jul 10, 2023 · 7d74a9a · 7d74a9a
1 parent fb21487
commit 7d74a9a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 37 deletions.
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
@@ -270,7 +270,7 @@ protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<Ti
         advancedBtn.setVisibility(advancedOptionsAvailable ? View.VISIBLE : View.GONE);
         advancedBtn.setOnClickListener(l -> {
             advancedBtn.setSelected(!advancedBtn.isSelected());
-            advancedBtn.setText(advancedBtn.isSelected() ? R.string.sk_advanced_options_hide : R.string.sk_advanced_options_show);
+			advancedBtn.setText(advancedBtn.isSelected() ? R.string.sk_advanced_options_hide : R.string.sk_advanced_options_show);
 			divider.setVisibility(advancedBtn.isSelected() ? View.VISIBLE : View.GONE);
             tagWrap.setVisibility(advancedBtn.isSelected() ? View.VISIBLE : View.GONE);
 			UiUtils.beginLayoutTransition((ViewGroup) view);
@@ -297,7 +297,7 @@ protected void makeTimelineEditor(@Nullable TimelineDefinition item, Consumer<Ti
             if (hasAdvanced) {
                 advancedBtn.setSelected(true);
                 advancedBtn.setText(R.string.sk_advanced_options_hide);
-                tagWrap.setVisibility(View.VISIBLE);
+				tagWrap.setVisibility(View.VISIBLE);
 				divider.setVisibility(View.VISIBLE);
             }
         }

diff --git a/mastodon/src/main/res/layout/edit_timeline.xml b/mastodon/src/main/res/layout/edit_timeline.xml
@@ -24,6 +24,7 @@
 				android:minHeight="48dp"
 				android:minWidth="48dp"
 				android:tint="?colorM3OnSurface"
+				android:tooltipText="@string/sk_timeline_icon"
 				android:contentDescription="@string/sk_timeline_icon" />
 
 			<EditText
@@ -186,7 +187,7 @@
 					android:drawablePadding="16dp"
 					android:text="@string/sk_hashtag_timeline_local_only_switch" />
 
-				<Switch
+				<org.joinmastodon.android.ui.views.M3Switch
 					android:id="@+id/local_only_switch"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"

diff --git a/mastodon/src/main/res/layout/list_timeline_editor.xml b/mastodon/src/main/res/layout/list_timeline_editor.xml
@@ -3,44 +3,45 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginHorizontal="24dp">
-        <TextView
-            android:id="@+id/text"
-            android:text="@string/sk_list_replies_policy"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:paddingVertical="8dp"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:gravity="center_vertical"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="16sp" />
-
-        <Button
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="32dp"
-            android:background="@drawable/bg_inline_button"
-            android:elevation="0dp"
-            android:ellipsize="none"
-            android:fontFamily="sans-serif-medium"
-            android:singleLine="true"
-            android:stateListAnimator="@null"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="16sp" />
-    </org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
 
     <org.joinmastodon.android.ui.views.TextInputFrameLayout
         android:id="@+id/input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <LinearLayout
+	<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="8dp"
+		android:layout_marginHorizontal="24dp">
+		<TextView
+			android:id="@+id/text"
+			android:text="@string/sk_list_replies_policy"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:paddingVertical="8dp"
+			android:singleLine="true"
+			android:ellipsize="none"
+			android:gravity="center_vertical"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="16sp" />
+
+		<Button
+			android:id="@+id/button"
+			style="@style/Widget.Mastodon.M3.Button.Outlined"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:background="@drawable/bg_button_m3_tonal"
+			android:ellipsize="none"
+			android:singleLine="true"
+			android:stateListAnimator="@null"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="16sp" />
+	</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
+
+
+	<LinearLayout
         android:id="@+id/exclusive"
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -62,7 +63,7 @@
             android:drawablePadding="16dp"
             android:text="@string/sk_list_exclusive_switch" />
 
-        <Switch
+        <org.joinmastodon.android.ui.views.M3Switch
             android:id="@+id/exclusive_checkbox"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -76,7 +77,6 @@
         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_list_exclusive_switch_explanation" />