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.

Sign up for GitHub

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

chore(demo): improve loading views #1107

Merged
merged 7 commits into from
Mar 4, 2025
Merged

chore(demo): improve loading views #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e154842
chore: set loading-screen background to white
hgray-instawork Mar 3, 2025
3dcfc52
chore: use the `no-header` version of the loading screen
hgray-instawork Mar 3, 2025
c98a749
chore: set top padding
hgray-instawork Mar 3, 2025
3eeb579
Revert "chore: use the `no-header` version of the loading screen"
hgray-instawork Mar 3, 2025
573f556
chore: remove title from default loading-screen
hgray-instawork Mar 3, 2025
f4909c2
chore: simplify template
hgray-instawork Mar 4, 2025
0a87bc4
chore: simplify padding
hgray-instawork Mar 4, 2025
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
3 changes: 2 additions & 1 deletion demo/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
SafeAreaInsetsContext,
SafeAreaProvider,
} from 'react-native-safe-area-context';
import { Platform, View } from 'react-native';
import Behaviors from './src/Behaviors';
import { BottomTabBar } from './src/Core';
import { BottomTabBarContextProvider } from './src/Contexts';
Expand All @@ -14,7 +15,6 @@ import Hyperview from 'hyperview';
import LoadingScreen from './src/loading-screen';
import { NavigationContainer } from '@react-navigation/native';
import React from 'react';
import { View } from 'react-native';

// this value needs to match the path prefix where the app is hosted
// our demo app is hosted under instawork.github.io/hyperview
Expand Down Expand Up @@ -49,6 +49,7 @@ export default () => (
paddingBottom: insets?.bottom,
paddingLeft: insets?.left,
paddingRight: insets?.right,
paddingTop: insets?.top,
}}
>
<NavigationContainer linking={linking}>
Expand Down
1 change: 1 addition & 0 deletions demo/backend/_includes/templates/loading-screen.xml.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% include 'templates/styles.xml.njk' %}
</styles>
<body style="body" safe-area="true">
{% set hv_title = "" %}
{% include 'templates/header.xml.njk' %}
<view style="loading">
<text style="loading-text">Loading…</text>
Expand Down
1 change: 1 addition & 0 deletions demo/backend/_includes/templates/styles.xml.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
paddingBottom="16"
paddingLeft="24"
paddingRight="24"
height="48"
/>
<style
id="header-btn"
Expand Down
1 change: 1 addition & 0 deletions demo/src/loading-screen/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const LoadingScreen = (props: Props) => {
<View
style={{
alignItems: 'center',
backgroundColor: 'white',
flex: 1,
gap: 10,
justifyContent: 'center',
Expand Down