From 29d320a658e9472719dec3596a524870e14d3aff Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 3 Nov 2022 19:56:03 -0500
Subject: [PATCH] Fix spacing around column headings, remove unused column
 settings

---
 app/soapbox/components/sub_navigation.tsx     |  46 +-----------------
 .../components/column_settings.js             | Bin 1935 -> 0 bytes
 .../containers/column_settings_container.js   | Bin 502 -> 0 bytes
 .../features/community_timeline/index.tsx     |   7 +--
 .../features/hashtag-timeline/index.tsx       |  10 ++--
 .../components/column_settings.js             | Bin 2227 -> 0 bytes
 .../containers/column_settings_container.js   | Bin 496 -> 0 bytes
 .../features/public_timeline/index.tsx        |   8 +--
 8 files changed, 17 insertions(+), 54 deletions(-)
 delete mode 100644 app/soapbox/features/community_timeline/components/column_settings.js
 delete mode 100644 app/soapbox/features/community_timeline/containers/column_settings_container.js
 delete mode 100644 app/soapbox/features/public_timeline/components/column_settings.js
 delete mode 100644 app/soapbox/features/public_timeline/containers/column_settings_container.js

diff --git a/app/soapbox/components/sub_navigation.tsx b/app/soapbox/components/sub_navigation.tsx
index b8e2b310d8..1e6afb85a7 100644
--- a/app/soapbox/components/sub_navigation.tsx
+++ b/app/soapbox/components/sub_navigation.tsx
@@ -4,34 +4,22 @@ import { defineMessages, useIntl } from 'react-intl';
 // import { connect } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 
-// import { openModal } from 'soapbox/actions/modals';
-// import { useAppDispatch } from 'soapbox/hooks';
-
 import { CardHeader, CardTitle } from './ui';
 
 const messages = defineMessages({
   back: { id: 'column_back_button.label', defaultMessage: 'Back' },
-  settings: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
 });
 
 interface ISubNavigation {
-  message: String,
+  message: React.ReactNode,
+  /** @deprecated Unused. */
   settings?: React.ComponentType,
 }
 
 const SubNavigation: React.FC<ISubNavigation> = ({ message }) => {
   const intl = useIntl();
-  // const dispatch = useAppDispatch();
   const history = useHistory();
 
-  // const ref = useRef(null);
-
-  // const [scrolled, setScrolled] = useState(false);
-
-  // const onOpenSettings = () => {
-  //   dispatch(openModal('COMPONENT', { component: Settings }));
-  // };
-
   const handleBackClick = () => {
     if (window.history && window.history.length === 1) {
       history.push('/');
@@ -40,36 +28,6 @@ const SubNavigation: React.FC<ISubNavigation> = ({ message }) => {
     }
   };
 
-  // const handleBackKeyUp = (e) => {
-  //   if (e.key === 'Enter') {
-  //     handleClick();
-  //   }
-  // }
-
-  // const handleOpenSettings = () => {
-  //   onOpenSettings();
-  // }
-
-  // useEffect(() => {
-  //   const handleScroll = throttle(() => {
-  //     if (this.node) {
-  //       const { offsetTop } = this.node;
-
-  //       if (offsetTop > 0) {
-  //         setScrolled(true);
-  //       } else {
-  //         setScrolled(false);
-  //       }
-  //     }
-  //   }, 150, { trailing: true });
-
-  //   window.addEventListener('scroll', handleScroll);
-
-  //   return () => {
-  //     window.removeEventListener('scroll', handleScroll);
-  //   };
-  // }, []);
-
   return (
     <CardHeader
       aria-label={intl.formatMessage(messages.back)}
diff --git a/app/soapbox/features/community_timeline/components/column_settings.js b/app/soapbox/features/community_timeline/components/column_settings.js
deleted file mode 100644
index 52781f1f4b2dae98e9080bf8f1f490b510f12704..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1935
zcmbVM!EW0y488j+cykIQHhRtKqF8_d1=g)-dm9Erv6WbxEO`>$CNTW(qhvdAk~SF@
z<X}nU6ZzhwL|JKr@Mv`PvaPs<mC+@H6|HCJHo{MV=whBY%dkH;?t6c9UzRnprR2vr
zK5iz4<C()ff^9&kUp&Kmg>nixUkSw@xV3D}?G(OfQ!+%J_gm18E0_sNqB4dO?=!7F
z*N9s6QC72RsW)+^sRzXs+E`Fby7WP#%x8`$)cQrQ*OK?iQ54f(X%s7wF%(+aF_7(2
zQuH|vi;yis*%uGVQ8$w&0LY}ad=AugK8H|>b%9i1<hMiLKdUA7-BQHD#fQ*NgZ7H9
z;2W<O(d5G5ZqHqiNoFl9w5&_jw_|~CkgME+7cY9O4POjYKod|s7OArgoG_gM650p)
zIcn#7V?=uCREmUs;(uykcs})EJqvaYrzVI>R-GhhwJ4Zc69+r9M5|h5?*(>TosDaW
z6aYg_ax=N=Ywv_`&T^g_N}R%QxBqhBWTynM5H@lISdZn<ur>-NzCnPST)dKQ#O^m%
z@+8bW#j^o6yzS#IMy6@O8Pz$;pq%3R40xKNK*<j>DCcA>MDFUMIa30+QCDF)R2X#_
z&W<B<CE-_{F$pM2E@|j?JcSVNTcXS2;`(5Ho{lu_ygW`JkkM%RYLdo@6RrGw_jaEQ
zqtlJURSVW+Nn<+0O~O0>#uz`sHr_<`bsbU=sVYVGJ89epiP|35PX+I*xrzPq-!&sM
z(G1~%1Q#rkrbfRVBoG772Tx38=%w3?L?fX)9m1UuNi!%&Omx|g42z`s5!yn(S$Z!*
z!z;NBe|i@DTzMM&R|}FYxlEe(?NaEHpE$+grVdlk(|=-^XF8?n=uhL@_nF>NOHE($
z%0-?A2F`Gyv7nhEF0_){2c8S|UwnK#KBdD<9r`IH{yzBb&psl=J*V#1Tkm8+4?92`
H1a0sa;GT)V

diff --git a/app/soapbox/features/community_timeline/containers/column_settings_container.js b/app/soapbox/features/community_timeline/containers/column_settings_container.js
deleted file mode 100644
index d208380894105f50ddc27d0057de0860bc11c7bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 502
zcmZ8e!EVDK488Lez6GR=-dA;(?gJ`yw`rOXaZ}U=B5<TuRsMY@BW+q_2^;+0GY{AG
zArjoc2Jg`ljBtpdgDRr2^cJxhF4bBHH}|zjdn9tcO*Pn~@hz764%K?~AI#u_Ppeb_
zOjLNb;XHJHCMuE)vVnCxdP<z;mfr<d@QjI|GyR?n;aAwj&?neH$|Y<*K;8tvjChB|
zta9p6nvZ0~D&626T`N_KQStNc%%3jxhV1b{E}L?svO*S!NJI2f3K0BuGC`j3nhimF
z!bX)#fEg^Gtdif08EVj4Gy3NN=aGQdSo1cn1&6@P^id5S%y6dpyX1=*b#~|F4N5+{
G&E$Vh5UWxE

diff --git a/app/soapbox/features/community_timeline/index.tsx b/app/soapbox/features/community_timeline/index.tsx
index 8c0adc2cb6..4fd4e1d0a5 100644
--- a/app/soapbox/features/community_timeline/index.tsx
+++ b/app/soapbox/features/community_timeline/index.tsx
@@ -10,8 +10,6 @@ import { useAppDispatch, useSettings } from 'soapbox/hooks';
 
 import Timeline from '../ui/components/timeline';
 
-import ColumnSettings from './containers/column_settings_container';
-
 const messages = defineMessages({
   title: { id: 'column.community', defaultMessage: 'Local timeline' },
 });
@@ -44,7 +42,10 @@ const CommunityTimeline = () => {
 
   return (
     <Column label={intl.formatMessage(messages.title)} transparent withHeader={false}>
-      <SubNavigation message={intl.formatMessage(messages.title)} settings={ColumnSettings} />
+      <div className='px-4 sm:p-0'>
+        <SubNavigation message={intl.formatMessage(messages.title)} />
+      </div>
+
       <PullToRefresh onRefresh={handleRefresh}>
         <Timeline
           scrollKey={`${timelineId}_timeline`}
diff --git a/app/soapbox/features/hashtag-timeline/index.tsx b/app/soapbox/features/hashtag-timeline/index.tsx
index a8b97cbab0..7ead1a9f57 100644
--- a/app/soapbox/features/hashtag-timeline/index.tsx
+++ b/app/soapbox/features/hashtag-timeline/index.tsx
@@ -3,10 +3,10 @@ import { FormattedMessage } from 'react-intl';
 
 import { connectHashtagStream } from 'soapbox/actions/streaming';
 import { expandHashtagTimeline, clearTimeline } from 'soapbox/actions/timelines';
-import ColumnHeader from 'soapbox/components/column_header';
+import SubNavigation from 'soapbox/components/sub_navigation';
 import { Column } from 'soapbox/components/ui';
 import Timeline from 'soapbox/features/ui/components/timeline';
-import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
+import { useAppDispatch } from 'soapbox/hooks';
 
 import type { Tag as TagEntity } from 'soapbox/types/entities';
 
@@ -27,7 +27,6 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
   const tags = params?.tags || { any: [], all: [], none: [] };
 
   const dispatch = useAppDispatch();
-  const hasUnread = useAppSelector<boolean>(state => (state.timelines.getIn([`hashtag:${id}`, 'unread']) as number) > 0);
   const disconnects = useRef<(() => void)[]>([]);
 
   // Mastodon supports displaying results from multiple hashtags.
@@ -100,7 +99,10 @@ export const HashtagTimeline: React.FC<IHashtagTimeline> = ({ params }) => {
 
   return (
     <Column label={`#${id}`} transparent withHeader={false}>
-      <ColumnHeader active={hasUnread} title={title()} />
+      <div className='px-4 pt-4 sm:p-0'>
+        <SubNavigation message={title()} />
+      </div>
+
       <Timeline
         scrollKey='hashtag_timeline'
         timelineId={`hashtag:${id}`}
diff --git a/app/soapbox/features/public_timeline/components/column_settings.js b/app/soapbox/features/public_timeline/components/column_settings.js
deleted file mode 100644
index 1d7022fa4e8d9bf991e52f4e8bdc407634fe338b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2227
zcmcgtO>f&U488kT@TL?<Z1kGdL$Lq_dgxZPy$yrmIEt-JmOP1W6Bz#Qqhvc@Zqs2H
z8suP0<P-Vcqb$lw8-#nKtEX+nEv$_$fmQTAL$|;_1)__2;Aw{azH!g{t=qD!F<nZ2
zisR#EV%VNJ+!NRag!;)dyj3Wtu;Oc>_#L-4&AFYzjW%V9$XERmw1*YU1SL@!Ly5PU
zR$ppFt@<dd(`u<VQKqQ}#TD8}P)xG)K?j+S98swJN$0ubeR3E^^j8|iT4X5-t?VI?
z?NSo-ISz}EEkfBB5AjJilO_Pjq_%tx)b(l(Op3ffDlqiR%=e$x68ml`V&UQ$w9}xy
zpd<Lk>qRuVFu2}x7i2QE78Y98rRv+Uz&FU%%7Pa!ysr&k3{*f9P(2o@vkaUtodIH6
z2l_c`=X+y>dg)XOg?-?^Yhn0m>ce^#>>S1>2+On@C1|xMQk4@2JF|rAT4k>Vc3ho}
zYl##9Lrrosx#(-}gmBJso*GJ=!f>{Ka^PgA7_bmFbOczB<<PJ;3MRfmfUA{wCf$hL
zuW89+mU)V211$U8$GsbwBn3~Y&VvlfDK5`|CkYCa{3wHRMq?pXF{|pO6j|7nmki~F
z9f0%VfwN+E!>KK9hyxTQmo#-dq8LQ`p6IlwxIB74&qtDUW<E?Ikb~Lu6~&EHCtUjh
z@BKa*W~ZBnix#ZO;>L82o3Lwt$rwMwHrj;tIcF3^vQp!};>JCYs_kk0RPer<tH{6p
zy=den8X`Q>;2lpSiP0}d3B<tT(H&D6y6QHAY9w<f0^6w&H-m&kLzjA=Vi7mrnJx5-
zrQ3oTzLYv=KRgG1tUL++sRfxXxs03F-BRe1kG$f5lMd9fk!2ofmxiO#7HK#7{5sD&
zVyWf#obpjDRdV~^Nvfov&*PgUb-N!z(%_Rbj?q}qy+e-CN^b9H^wWRhgTA9>tpsjI
k&M6&c;?T#G`19bK-+PM?_sMa;emX}l^zj2|gP;xm0O&343jhEB

diff --git a/app/soapbox/features/public_timeline/containers/column_settings_container.js b/app/soapbox/features/public_timeline/containers/column_settings_container.js
deleted file mode 100644
index 63a629007df0fe29ea7925be61f99b8fe691cec8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 496
zcmZ9J&u+sY494#~g>L~VqxV(arF(!%-EEpCM%*-N0ueY;rz-D0lR^I>OJMN#!+dnZ
z=mWt8talDA!3>As2dDxXOD_SN>0GUa=t^CSv`3=OwXp_!G_J**U!_{F{(}jfcX1W7
zfI*qF_5C!s0?Jpi$a=oVp`*ylRPueN72IPa7|ggQL-^r$!H*F(5K{`9H;@+rP!z9l
z*Q;D=l;$m2jnhxx*-F)7R{XXr_PvXvA$z=$Ws|p5!Y6t_nu1%F0N!mE2jmHVlN)GH
z*r<F6P{i`VC;3?#s6lJZ(yyDA`vD$v&C|RV90JeF7d3b=Q%~ii<dY3`^5y9PN<R9`
F@IShVsD=Ol

diff --git a/app/soapbox/features/public_timeline/index.tsx b/app/soapbox/features/public_timeline/index.tsx
index 6fe5afec8f..34017a0d3f 100644
--- a/app/soapbox/features/public_timeline/index.tsx
+++ b/app/soapbox/features/public_timeline/index.tsx
@@ -14,8 +14,6 @@ import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks';
 import PinnedHostsPicker from '../remote_timeline/components/pinned_hosts_picker';
 import Timeline from '../ui/components/timeline';
 
-import ColumnSettings from './containers/column_settings_container';
-
 const messages = defineMessages({
   title: { id: 'column.public', defaultMessage: 'Fediverse timeline' },
   dismiss: { id: 'fediverse_tab.explanation_box.dismiss', defaultMessage: 'Don\'t show again' },
@@ -65,8 +63,12 @@ const CommunityTimeline = () => {
 
   return (
     <Column label={intl.formatMessage(messages.title)} transparent withHeader={false}>
-      <SubNavigation message={intl.formatMessage(messages.title)} settings={ColumnSettings} />
+      <div className='px-4 sm:p-0'>
+        <SubNavigation message={intl.formatMessage(messages.title)} />
+      </div>
+
       <PinnedHostsPicker />
+
       {showExplanationBox && <div className='mb-4'>
         <Accordion
           headline={<FormattedMessage id='fediverse_tab.explanation_box.title' defaultMessage='What is the Fediverse?' />}