Extract settings styles to remove require cycle

mhoran · Apr 12, 2024 · 27b09f4 · 27b09f4
1 parent 8146a8d
commit 27b09f4
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 49 deletions.
diff --git a/src/usecase/login/LoginForm.tsx b/src/usecase/login/LoginForm.tsx
@@ -13,7 +13,7 @@ import { ConnectedProps, connect } from 'react-redux';
 import { ConnectionError } from '../../lib/weechat/connection';
 import { StoreState } from '../../store';
 import UndoTextInput from '../shared/UndoTextInput';
-import { styles } from '../settings/SettingsNavigator';
+import { styles } from '../settings/styles';
 import { setConnectionInfoAction } from '../../store/actions';
 
 const connector = connect((state: StoreState) => ({

diff --git a/src/usecase/settings/SettingsNavigator.tsx b/src/usecase/settings/SettingsNavigator.tsx
@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { StyleSheet } from 'react-native';
 import { ConnectionError } from '../../lib/weechat/connection';
 import LoginForm from '../login/LoginForm';
 import UploadSettings from './UploadSettings';
@@ -35,49 +34,3 @@ const SettingsNavigator: React.FC<Props> = ({
 };
 
 export default SettingsNavigator;
-
-export const styles = StyleSheet.create({
-  container: {
-    backgroundColor: '#f8f8f8',
-    flex: 1,
-    padding: 20
-  },
-  header: {
-    textAlign: 'center',
-    color: '#4157af',
-    fontSize: 20
-  },
-  text: {
-    padding: 10,
-    color: '#4157af',
-    fontSize: 18
-  },
-  input: {
-    marginVertical: 10,
-    padding: 10,
-    borderBottomWidth: 2,
-    fontSize: 18,
-    borderColor: '#4157af',
-    color: '#4157af'
-  },
-  centeredButton: {
-    flexDirection: 'row',
-    justifyContent: 'center'
-  },
-  button: {
-    borderWidth: 2,
-    borderColor: '#4157af',
-    width: 200,
-    backgroundColor: '#f8f8f8',
-    paddingHorizontal: 20,
-    paddingVertical: 10,
-    borderRadius: 20
-  },
-  buttonText: {
-    textAlign: 'center',
-    color: '#4157af',
-    fontWeight: '400',
-    fontSize: 18,
-    textTransform: 'uppercase'
-  }
-});
diff --git a/src/usecase/settings/UploadSettings.tsx b/src/usecase/settings/UploadSettings.tsx
@@ -13,7 +13,7 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 import { ConnectedProps, connect } from 'react-redux';
 import { StoreState } from '../../store';
 import UndoTextInput from '../shared/UndoTextInput';
-import { styles } from './SettingsNavigator';
+import { styles } from './styles';
 import { setMediaUploadOptionsAction } from '../../store/actions';
 
 const connector = connect((state: StoreState) => ({

diff --git a/src/usecase/settings/styles.ts b/src/usecase/settings/styles.ts
@@ -0,0 +1,47 @@
+import { StyleSheet } from 'react-native';
+
+export const styles = StyleSheet.create({
+  container: {
+    backgroundColor: '#f8f8f8',
+    flex: 1,
+    padding: 20
+  },
+  header: {
+    textAlign: 'center',
+    color: '#4157af',
+    fontSize: 20
+  },
+  text: {
+    padding: 10,
+    color: '#4157af',
+    fontSize: 18
+  },
+  input: {
+    marginVertical: 10,
+    padding: 10,
+    borderBottomWidth: 2,
+    fontSize: 18,
+    borderColor: '#4157af',
+    color: '#4157af'
+  },
+  centeredButton: {
+    flexDirection: 'row',
+    justifyContent: 'center'
+  },
+  button: {
+    borderWidth: 2,
+    borderColor: '#4157af',
+    width: 200,
+    backgroundColor: '#f8f8f8',
+    paddingHorizontal: 20,
+    paddingVertical: 10,
+    borderRadius: 20
+  },
+  buttonText: {
+    textAlign: 'center',
+    color: '#4157af',
+    fontWeight: '400',
+    fontSize: 18,
+    textTransform: 'uppercase'
+  }
+});