Skip to content

Commit

Permalink
change design to conform to revite, seperate debug builds
Browse files Browse the repository at this point in the history
  • Loading branch information
TaiAurori committed May 18, 2022
1 parent 01ded0e commit df155fc
Show file tree
Hide file tree
Showing 23 changed files with 246 additions and 230 deletions.
18 changes: 9 additions & 9 deletions App.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,31 +176,31 @@ class MainView extends React.Component {
<ScrollView style={{flex: 1}}>
<Text style={{fontWeight: 'bold', margin: 5, marginLeft: 10, marginTop: 10}}>INCOMING REQUESTS</Text>
<View>
{[...client.users.values()].filter((x) => x.relationship === RelationshipStatus.Incoming).map(f => {
{[...client.users.values()].filter((x) => x.relationship === "Incoming").map(f => {
return <Button style={{justifyContent: 'flex-start'}} key={f._id} onPress={() => app.openProfile(f)}>
<MiniProfile user={f} scale={1.15} />
</Button>
})}
</View>
<Text style={{fontWeight: 'bold', margin: 5, marginLeft: 10, marginTop: 10}}>OUTGOING REQUESTS</Text>
<View>
{[...client.users.values()].filter((x) => x.relationship === RelationshipStatus.Outgoing).map(f => {
{[...client.users.values()].filter((x) => x.relationship === "Outgoing").map(f => {
return <Button style={{justifyContent: 'flex-start'}} key={f._id} onPress={() => app.openProfile(f)}>
<MiniProfile user={f} scale={1.15} />
</Button>
})}
</View>
<Text style={{fontWeight: 'bold', margin: 5, marginLeft: 10}}>FRIENDS</Text>
<View>
{[...client.users.values()].filter((x) => x.relationship === RelationshipStatus.Friend).map(f => {
{[...client.users.values()].filter((x) => x.relationship === "Friend").map(f => {
return <Button style={{justifyContent: 'flex-start'}} key={f._id} onPress={() => app.openProfile(f)}>
<MiniProfile user={f} scale={1.15} />
</Button>
})}
</View>
<Text style={{fontWeight: 'bold', margin: 5, marginLeft: 10}}>BLOCKED</Text>
<View>
{[...client.users.values()].filter((x) => x.relationship === RelationshipStatus.Blocked).map(f => {
{[...client.users.values()].filter((x) => x.relationship === "Blocked").map(f => {
return <Button style={{justifyContent: 'flex-start'}} key={f._id} onPress={() => app.openProfile(f)}>
<MiniProfile user={f} scale={1.15} />
</Button>
Expand All @@ -214,7 +214,7 @@ class MainView extends React.Component {
<View style={styles.iconContainer}>
<ChannelIcon channel={this.state.currentChannel} />
</View>
<Text style={{flex: 1}}>{
<Text style={{flex: 1, fontWeight: "bold", fontSize: 16}}>{
this.state.currentChannel.channel_type == "DirectMessage" ?
this.state.currentChannel.recipient?.username :
this.state.currentChannel.channel_type == "SavedMessages" ?
Expand Down Expand Up @@ -288,10 +288,10 @@ class MainView extends React.Component {
<View style={styles.app}>
{/* <View style={{alignItems: 'center', justifyContent: 'center', flex: 1}}>
<Text style={{fontWeight: 'bold', fontSize: 48}}>RVMob</Text>
<TextInput placeholderTextColor={currentTheme.textSecondary} style={{borderRadius: 8, padding: 3, paddingLeft: 10, paddingRight: 10, margin: 8, width: "80%", backgroundColor: currentTheme.backgroundSecondary, color: currentTheme.textPrimary}} placeholder={"Email"} onChangeText={(text) => {
<TextInput placeholderTextColor={currentTheme.foregroundSecondary} style={{borderRadius: 8, padding: 3, paddingLeft: 10, paddingRight: 10, margin: 8, width: "80%", backgroundColor: currentTheme.backgroundSecondary, color: currentTheme.foregroundPrimary}} placeholder={"Email"} onChangeText={(text) => {
this.setState({emailInput: text})
}} value={this.state.emailInput} />
<TextInput placeholderTextColor={currentTheme.textSecondary} style={{borderRadius: 8, padding: 3, paddingLeft: 10, paddingRight: 10, margin: 8, width: "80%", backgroundColor: currentTheme.backgroundSecondary, color: currentTheme.textPrimary}} placeholder={"Password"} onChangeText={(text) => {
<TextInput placeholderTextColor={currentTheme.foregroundSecondary} style={{borderRadius: 8, padding: 3, paddingLeft: 10, paddingRight: 10, margin: 8, width: "80%", backgroundColor: currentTheme.backgroundSecondary, color: currentTheme.foregroundPrimary}} placeholder={"Password"} onChangeText={(text) => {
this.setState({passwordInput: text})
}} value={this.state.passwordInput} />
{this.state.logInError && <Text>{this.state.logInError.message}</Text>}
Expand All @@ -316,7 +316,7 @@ class MainView extends React.Component {
}} /> */}
<View style={{alignItems: 'center', justifyContent: 'center', flex: 1}}>
<Text style={{fontWeight: 'bold', fontSize: 48}}>RVMob</Text>
<Input placeholderTextColor={currentTheme.textSecondary} style={{minWidth: "80%", width: "80%"}} placeholder={"Token"} onChangeText={(text) => {
<Input placeholderTextColor={currentTheme.foregroundSecondary} style={{minWidth: "80%", width: "80%"}} placeholder={"Token"} onChangeText={(text) => {
this.setState({tokenInput: text})
}} value={this.state.tokenInput} />
{this.state.logInError ? <Text>{this.state.logInError.message || this.state.logInError}</Text> : null}
Expand Down Expand Up @@ -355,7 +355,7 @@ export const ChannelHeader = ({children}) => {
return <View style={styles.channelHeader}>
<TouchableOpacity style={styles.headerIcon} onPress={() => {app.openLeftMenu()}}>
<View style={styles.iconContainer}>
<MaterialIcon name="menu" size={20} color={currentTheme.textPrimary} />
<MaterialIcon name="menu" size={20} color={currentTheme.foregroundPrimary} />
</View>
</TouchableOpacity>
{children}
Expand Down
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
applicationIdSuffix '.debug'
}
release {
// Caution! In production, you need to generate your own keystore file.
Expand Down
2 changes: 2 additions & 0 deletions android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:
-keep class com.facebook.hermes.unicode.** { *; }
-keep class com.facebook.jni.** { *; }
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions android/app/src/debug/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<resources>
<string name="app_name">RVMob Canary</string>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/main/assets/index.android.bundle

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">RVMob</string>
<string name="app_name">RVMob</string>
</resources>
Loading

0 comments on commit df155fc

Please sign in to comment.