Page MenuHomePhabricator

D11316.diff
No OneTemporary

D11316.diff

diff --git a/native/profile/keyserver-selection-bottom-sheet.react.js b/native/profile/keyserver-selection-bottom-sheet.react.js
--- a/native/profile/keyserver-selection-bottom-sheet.react.js
+++ b/native/profile/keyserver-selection-bottom-sheet.react.js
@@ -199,11 +199,13 @@
<View style={styles.container}>
<View style={styles.keyserverDetailsContainer}>
<View style={styles.keyserverHeaderContainer}>
- <Pill
- label={keyserverAdminUserInfo.username}
- backgroundColor={colors.codeBackground}
- icon={cloudIcon}
- />
+ <View style={styles.keyserverPillContainer}>
+ <Pill
+ label={keyserverAdminUserInfo.username}
+ backgroundColor={colors.codeBackground}
+ icon={cloudIcon}
+ />
+ </View>
<View style={styles.statusIndicatorContainer}>
<StatusIndicator connectionInfo={keyserverInfo.connection} />
</View>
@@ -225,7 +227,7 @@
keyserverDetailsContainer: {
alignItems: 'center',
justifyContent: 'space-between',
- paddingVertical: 16,
+ padding: 16,
backgroundColor: 'modalAccentBackground',
marginBottom: 24,
borderRadius: 8,
@@ -234,8 +236,12 @@
flexDirection: 'row',
alignItems: 'center',
},
+ keyserverPillContainer: {
+ flex: 1,
+ alignItems: 'baseline',
+ },
statusIndicatorContainer: {
- marginLeft: 8,
+ marginLeft: 24,
},
keyserverURLText: {
color: 'modalForegroundLabel',
diff --git a/native/profile/keyserver-selection-list-item.react.js b/native/profile/keyserver-selection-list-item.react.js
--- a/native/profile/keyserver-selection-list-item.react.js
+++ b/native/profile/keyserver-selection-list-item.react.js
@@ -2,7 +2,7 @@
import { useNavigation } from '@react-navigation/native';
import * as React from 'react';
-import { TouchableOpacity } from 'react-native';
+import { View, TouchableOpacity } from 'react-native';
import type { KeyserverInfo } from 'lib/types/keyserver-types.js';
import type { GlobalAccountUserInfo } from 'lib/types/user-types.js';
@@ -53,12 +53,16 @@
style={styles.keyserverListItemContainer}
onPress={onPress}
>
- <Pill
- label={keyserverAdminUserInfo.username}
- backgroundColor={colors.codeBackground}
- icon={cloudIcon}
- />
- <StatusIndicator connectionInfo={keyserverInfo.connection} />
+ <View style={styles.keyserverPillContainer}>
+ <Pill
+ label={keyserverAdminUserInfo.username}
+ backgroundColor={colors.codeBackground}
+ icon={cloudIcon}
+ />
+ </View>
+ <View style={styles.keyserverStatusIndicatorContainer}>
+ <StatusIndicator connectionInfo={keyserverInfo.connection} />
+ </View>
</TouchableOpacity>
),
[
@@ -68,6 +72,8 @@
keyserverInfo.connection,
onPress,
styles.keyserverListItemContainer,
+ styles.keyserverPillContainer,
+ styles.keyserverStatusIndicatorContainer,
],
);
@@ -82,6 +88,13 @@
paddingHorizontal: 24,
paddingVertical: 10,
},
+ keyserverPillContainer: {
+ flex: 1,
+ alignItems: 'baseline',
+ },
+ keyserverStatusIndicatorContainer: {
+ marginLeft: 32,
+ },
};
export default KeyserverSelectionListItem;

File Metadata

Mime Type
text/plain
Expires
Fri, Jan 10, 5:32 AM (7 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2845597
Default Alt Text
D11316.diff (3 KB)

Event Timeline