diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index de3e08952b..e302376146 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,7 +1,5 @@
PODS:
- boost (1.76.0)
- - BVLinearGradient (2.6.2):
- - React-Core
- CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- FBLazyVector (0.68.5)
@@ -430,7 +428,6 @@ PODS:
DEPENDENCIES:
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@@ -529,8 +526,6 @@ SPEC REPOS:
EXTERNAL SOURCES:
boost:
:podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
- BVLinearGradient:
- :path: "../node_modules/react-native-linear-gradient"
DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
FBLazyVector:
@@ -636,7 +631,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: a7c83b31436843459a1961bfd74b96033dc77234
- BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
FBLazyVector: 2b47ff52037bd9ae07cc9b051c9975797814b736
diff --git a/package-lock.json b/package-lock.json
index a4e6f4cf94..caee00aea5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,6 @@
"react-native-inappbrowser-reborn": "3.7.0",
"react-native-ios-context-menu": "1.15.3",
"react-native-keychain": "8.1.1",
- "react-native-linear-gradient": "2.6.2",
"react-native-paper": "4.12.4",
"react-native-popover-view": "4.1.0",
"react-native-reanimated": "2.14.4",
@@ -17055,15 +17054,6 @@
"resolved": "https://registry.npmjs.org/react-native-keychain/-/react-native-keychain-8.1.1.tgz",
"integrity": "sha512-8fxgeHKwGcL657eAYpdBTkDIxNhbIHI+kyyO0Yac2dgVAN184JoIwQcW2z6snahwDaCObQOu0biLFHnsH+4KSg=="
},
- "node_modules/react-native-linear-gradient": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.6.2.tgz",
- "integrity": "sha512-Z8Xxvupsex+9BBFoSYS87bilNPWcRfRsGC0cpJk72Nxb5p2nEkGSBv73xZbEHnW2mUFvP+huYxrVvjZkr/gRjQ==",
- "peerDependencies": {
- "react": "*",
- "react-native": "*"
- }
- },
"node_modules/react-native-pager-view": {
"version": "5.4.15",
"resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.15.tgz",
@@ -32160,12 +32150,6 @@
"resolved": "https://registry.npmjs.org/react-native-keychain/-/react-native-keychain-8.1.1.tgz",
"integrity": "sha512-8fxgeHKwGcL657eAYpdBTkDIxNhbIHI+kyyO0Yac2dgVAN184JoIwQcW2z6snahwDaCObQOu0biLFHnsH+4KSg=="
},
- "react-native-linear-gradient": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/react-native-linear-gradient/-/react-native-linear-gradient-2.6.2.tgz",
- "integrity": "sha512-Z8Xxvupsex+9BBFoSYS87bilNPWcRfRsGC0cpJk72Nxb5p2nEkGSBv73xZbEHnW2mUFvP+huYxrVvjZkr/gRjQ==",
- "requires": {}
- },
"react-native-pager-view": {
"version": "5.4.15",
"resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-5.4.15.tgz",
diff --git a/package.json b/package.json
index 6afc3a6046..b96aff0a9a 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,6 @@
"react-native-inappbrowser-reborn": "3.7.0",
"react-native-ios-context-menu": "1.15.3",
"react-native-keychain": "8.1.1",
- "react-native-linear-gradient": "2.6.2",
"react-native-paper": "4.12.4",
"react-native-popover-view": "4.1.0",
"react-native-reanimated": "2.14.4",
diff --git a/source/views/home/button.tsx b/source/views/home/button.tsx
index 0d8bbbc7af..e6cfad30ff 100644
--- a/source/views/home/button.tsx
+++ b/source/views/home/button.tsx
@@ -2,7 +2,6 @@ import * as React from 'react'
import {View, Text, StyleSheet, Platform} from 'react-native'
import Icon from 'react-native-vector-icons/Entypo'
import type {ViewType} from '../views'
-import LinearGradient from 'react-native-linear-gradient'
import {Touchable} from '@frogpond/touchable'
import {transparent} from '@frogpond/colors'
import {homescreenForegroundDark, homescreenForegroundLight} from './colors'
@@ -17,95 +16,23 @@ export function HomeScreenButton({view, onPress}: Props): JSX.Element {
let foreground =
view.foreground === 'light' ? styles.lightForeground : styles.darkForeground
- return (
-
-
-
- {view.title}
-
-
- )
-}
-
-type TouchableButtonProps = {
- onPress: () => void
- label: string
- children: React.ReactChildren | JSX.Element
- tint: string
- gradient?: [string, string]
-}
-
-function TouchableButton(props: TouchableButtonProps) {
- let {onPress, label, children, tint, gradient} = props
-
- if (Platform.OS === 'android') {
- return (
-
-
- {children}
-
-
- )
- } else {
- return (
-
-
- {children}
-
-
- )
- }
-}
-
-type TouchableWrapperProps = {
- onPress: () => void
- label: string
- children: React.ReactChildren | JSX.Element
-}
-
-function TouchableWrapper({onPress, children, label}: TouchableWrapperProps) {
return (
- {children}
+
+
+ {view.title}
+
)
}
-type TintProps = {
- children: React.ReactChildren | JSX.Element
- tint: string
- gradient?: [string, string]
-}
-
-function Tint({tint = 'black', gradient, children}: TintProps) {
- if (!gradient) {
- let bg = {backgroundColor: tint}
- return {children}
- }
-
- return (
-
- {children}
-
- )
-}
-
export const CELL_MARGIN = 10
const cellVerticalPadding = 8
const cellHorizontalPadding = 4
diff --git a/source/views/streaming/webcams/thumbnail.tsx b/source/views/streaming/webcams/thumbnail.tsx
index 64e8f46187..49a37671b5 100644
--- a/source/views/streaming/webcams/thumbnail.tsx
+++ b/source/views/streaming/webcams/thumbnail.tsx
@@ -4,7 +4,6 @@ import {Touchable} from '@frogpond/touchable'
import * as c from '@frogpond/colors'
import {images as webcamImages} from '../../../../images/webcams'
import {trackedOpenUrl} from '@frogpond/open-url'
-import LinearGradient from 'react-native-linear-gradient'
import type {Webcam} from './types'
import transparentPixel from '../../../../images/transparent.png'
@@ -25,7 +24,6 @@ export const StreamThumbnail = (props: Props): JSX.Element => {
let [r, g, b] = accentColor
let baseColor = `rgba(${r}, ${g}, ${b}, 1)`
- let startColor = `rgba(${r}, ${g}, ${b}, 0.1)`
let width = viewportWidth / 2 - CELL_MARGIN * 1.5
let cellRatio = 2.15625
@@ -54,9 +52,7 @@ export const StreamThumbnail = (props: Props): JSX.Element => {
/>
-
- {name}
-
+ {name}
diff --git a/source/views/views.ts b/source/views/views.ts
index 5fca291e30..c61db28279 100644
--- a/source/views/views.ts
+++ b/source/views/views.ts
@@ -1,5 +1,4 @@
import * as c from '@frogpond/colors'
-import type {Gradient} from '@frogpond/colors'
import {RootViewsParamList} from '../navigation/types'
import {NavigationKey as menus} from './menus'
@@ -23,7 +22,6 @@ type CommonView = {
icon: string
foreground: 'light' | 'dark'
tint: string
- gradient?: Gradient
}
type NativeView = {
@@ -45,8 +43,7 @@ export const allViews: Array = [
title: 'Menus',
icon: 'bowl',
foreground: 'light',
- tint: c.emerald,
- gradient: c.grassToLime,
+ tint: c.grassToLime[0],
},
{
type: 'view',
@@ -54,8 +51,7 @@ export const allViews: Array = [
title: 'SIS',
icon: 'fingerprint',
foreground: 'light',
- tint: c.goldenrod,
- gradient: c.yellowToGoldDark,
+ tint: c.yellowToGoldDark[0],
},
{
type: 'view',
@@ -63,8 +59,7 @@ export const allViews: Array = [
title: 'Building Hours',
icon: 'clock',
foreground: 'light',
- tint: c.wave,
- gradient: c.lightBlueToBlueDark,
+ tint: c.lightBlueToBlueDark[0],
},
{
type: 'view',
@@ -72,8 +67,7 @@ export const allViews: Array = [
title: 'Calendar',
icon: 'calendar',
foreground: 'light',
- tint: c.coolPurple,
- gradient: c.magentaToPurple,
+ tint: c.magentaToPurple[0],
},
{
type: 'view',
@@ -81,8 +75,7 @@ export const allViews: Array = [
title: 'Directory',
icon: 'v-card',
foreground: 'light',
- tint: c.indianRed,
- gradient: c.redToPurple,
+ tint: c.redToPurple[0],
},
{
type: 'view',
@@ -90,8 +83,7 @@ export const allViews: Array = [
title: 'Streaming Media',
icon: 'video',
foreground: 'light',
- tint: c.denim,
- gradient: c.lightBlueToBlueLight,
+ tint: c.lightBlueToBlueLight[0],
},
{
type: 'view',
@@ -99,8 +91,7 @@ export const allViews: Array = [
title: 'News',
icon: 'news',
foreground: 'light',
- tint: c.eggplant,
- gradient: c.purpleToIndigo,
+ tint: c.purpleToIndigo[0],
},
{
type: 'url',
@@ -108,8 +99,7 @@ export const allViews: Array = [
title: 'Campus Map',
icon: 'map',
foreground: 'light',
- tint: c.coffee,
- gradient: c.navyToNavy,
+ tint: c.navyToNavy[0],
},
{
type: 'view',
@@ -117,8 +107,7 @@ export const allViews: Array = [
title: 'Important Contacts',
icon: 'phone',
foreground: 'light',
- tint: c.crimson,
- gradient: c.orangeToRed,
+ tint: c.orangeToRed[0],
},
{
type: 'view',
@@ -126,8 +115,7 @@ export const allViews: Array = [
title: 'Transportation',
icon: 'address',
foreground: 'light',
- tint: c.cardTable,
- gradient: c.grayToDarkGray,
+ tint: c.grayToDarkGray[0],
},
{
type: 'view',
@@ -135,8 +123,7 @@ export const allViews: Array = [
title: 'Campus Dictionary',
icon: 'open-book',
foreground: 'light',
- tint: c.olive,
- gradient: c.pinkToHotpink,
+ tint: c.pinkToHotpink[0],
},
{
type: 'view',
@@ -144,8 +131,7 @@ export const allViews: Array = [
title: 'Student Orgs',
icon: 'globe',
foreground: 'light',
- tint: c.wave,
- gradient: c.darkBlueToIndigo,
+ tint: c.darkBlueToIndigo[0],
},
{
type: 'view',
@@ -153,8 +139,7 @@ export const allViews: Array = [
title: 'More',
icon: 'link',
foreground: 'light',
- tint: c.lavender,
- gradient: c.seafoamToGrass,
+ tint: c.seafoamToGrass[0],
},
{
type: 'view',
@@ -162,8 +147,7 @@ export const allViews: Array = [
title: 'stoPrint',
icon: 'print',
foreground: 'light',
- tint: c.periwinkle,
- gradient: c.tealToSeafoam,
+ tint: c.tealToSeafoam[0],
},
{
type: 'view',
@@ -172,7 +156,6 @@ export const allViews: Array = [
icon: 'graduation-cap',
foreground: 'light',
tint: c.lavender,
- gradient: c.seafoamToGrass,
},
{
type: 'url',
@@ -180,7 +163,6 @@ export const allViews: Array = [
title: 'Oleville',
icon: 'browser',
foreground: 'dark',
- tint: c.periwinkle,
- gradient: c.yellowToGoldMid,
+ tint: c.yellowToGoldMid[0],
},
]