Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Header and statusbar #2183

Merged
merged 2 commits into from
Jul 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion native/android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources>
<string name="app_name">Guardian Ghost</string>
<string name="expo_splash_screen_resize_mode" translatable="false">native</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">true</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
<string name="expo_system_ui_user_interface_style" translatable="false">dark</string>
</resources>
2 changes: 1 addition & 1 deletion native/android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<item name="android:editTextStyle">@style/ResetEditText</item>
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">#17101F</item>
<item name="android:windowBackground">@color/activityBackground</item>
</style>
<style name="ResetEditText" parent="@android:style/Widget.EditText">
Expand Down
3 changes: 1 addition & 2 deletions native/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"supportsTablet": false
},
"androidStatusBar": {
"barStyle": "light-content",
"translucent": true
"barStyle": "light-content"
},
"android": {

Expand Down
3 changes: 1 addition & 2 deletions native/app/Root.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as SplashScreen from "expo-splash-screen";
import { NavigationContainer, type NavigationContainerRef, type Theme } from "@react-navigation/native";
import { useEffect, useRef } from "react";
import { StatusBar, useWindowDimensions, Platform, Appearance } from "react-native";
import { useWindowDimensions, Platform, Appearance } from "react-native";
import { enableFreeze, enableScreens } from "react-native-screens";
import { object, parse, string } from "valibot";
import Toast from "react-native-toast-message";
Expand Down Expand Up @@ -166,7 +166,6 @@ function Root() {

return (
<GestureHandlerRootView>
{appReady && <StatusBar translucent={true} barStyle={"light-content"} />}
<NavigationContainer ref={navigationRef} theme={navigationContainerTheme}>
<App />
<Toast />
Expand Down
2 changes: 1 addition & 1 deletion native/app/UI/CharacterHeaderButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function CharacterHeaderButtons() {
}, []);

return (
<Animated.View style={[viewAnimationStyle, { flexDirection: "row", gap: 10 }]}>
<Animated.View style={[viewAnimationStyle, { flexDirection: "row", gap: 10, paddingBottom: 8 }]}>
{ggCharacters.map((ggCharacter, index) => {
return (
<TouchableOpacity
Expand Down
6 changes: 0 additions & 6 deletions native/app/UI/MainDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,7 @@ export default function MainDrawer() {
sceneContainerStyle: {
backgroundColor: "#17101F",
},
headerStyle: {
backgroundColor: "#17101F",
borderBottomWidth: StyleSheet.hairlineWidth,
borderBottomColor: "#2A1D38",
},
headerTintColor: "white",
drawerActiveBackgroundColor: "blue",
headerRight: MenuButton,
headerTitle: CharacterHeaderButtons,
headerBackground: InventoryHeader,
Expand Down
18 changes: 15 additions & 3 deletions native/app/inventory/pages/InventoryHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Animated, {
useSharedValue,
withSpring,
} from "react-native-reanimated";
import { View, StyleSheet } from "react-native";

import { useGGStore } from "@/app/store/GGStore.ts";

Expand Down Expand Up @@ -39,8 +40,19 @@ export default function InventoryHeader() {
}, []);

return (
<Animated.View style={[viewAnimationStyle, { flex: 1 }]}>
<Image style={{ flex: 1 }} transition={initialPageLoaded ? 150 : 0} source={characterBackgroundEmblem} />
</Animated.View>
<View style={{ flex: 1 }}>
<Animated.View style={[viewAnimationStyle, { flex: 1 }]}>
<Image style={{ flex: 1 }} transition={initialPageLoaded ? 150 : 0} source={characterBackgroundEmblem} />
</Animated.View>
<View
style={{
width: "100%",
height: StyleSheet.hairlineWidth,
backgroundColor: "grey",
position: "absolute",
bottom: 0,
}}
/>
</View>
);
}