diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9240811..35649ab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,59 +1,59 @@
-name: Build
+name: Build
on:
push:
tags:
- "v*.*.*"
+ branches:
+ - "main"
jobs:
build:
-
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- - uses: actions/checkout@v4
-
- - name: Set up Node.js 20.10.0
- uses: actions/setup-node@v4
- with:
- node-version: 20.10.0
- cache: 'npm'
-
- - name: Install dependencies
- run: npm ci
-
- - name: Lint
- run: npm run lint
-
- - name: Prebuild
- run: npm exec expo -- prebuild --platform android
-
- - name: Set up JDK 17
- uses: actions/setup-java@v4
- with:
- java-version: '17'
- distribution: 'temurin'
- cache: 'gradle'
-
- - name: Set up Expo EAS
- uses: expo/expo-github-action@v8
- with:
- eas-version: latest
- token: ${{ secrets.EXPO_TOKEN }}
-
- - name: Build
- env:
- EXPO_PUBLIC_PARSE_APPLICATION_ID: ${{ secrets.EXPO_PUBLIC_PARSE_APPLICATION_ID }}
- EXPO_PUBLIC_PARSE_CLIENT_KEY: ${{ secrets.EXPO_PUBLIC_PARSE_CLIENT_KEY }}
- EXPO_PUBLIC_PARSE_SERVER_URL: ${{ secrets.EXPO_PUBLIC_PARSE_SERVER_URL }}
- run: npm run build:preview
-
- - name: Release
- uses: softprops/action-gh-release@v1
- if: startsWith(github.ref, 'refs/tags/')
- with:
- files: './*.apk'
-
+ - uses: actions/checkout@v4
+
+ - name: Set up Node.js 20.10.0
+ uses: actions/setup-node@v4
+ with:
+ node-version: 20.10.0
+ cache: "npm"
+
+ - name: Install dependencies
+ run: npm ci
+
+ - name: Lint
+ run: npm run lint
+
+ - name: Prebuild
+ run: npm exec expo -- prebuild --platform android
+
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ java-version: "17"
+ distribution: "temurin"
+ cache: "gradle"
+
+ - name: Set up Expo EAS
+ uses: expo/expo-github-action@v8
+ with:
+ eas-version: latest
+ token: ${{ secrets.EXPO_TOKEN }}
+
+ - name: Build
+ env:
+ EXPO_PUBLIC_PARSE_APPLICATION_ID: ${{ secrets.EXPO_PUBLIC_PARSE_APPLICATION_ID }}
+ EXPO_PUBLIC_PARSE_CLIENT_KEY: ${{ secrets.EXPO_PUBLIC_PARSE_CLIENT_KEY }}
+ EXPO_PUBLIC_PARSE_SERVER_URL: ${{ secrets.EXPO_PUBLIC_PARSE_SERVER_URL }}
+ run: npm run build:preview
+
+ - name: Release
+ uses: softprops/action-gh-release@v1
+ if: startsWith(github.ref, 'refs/tags/')
+ with:
+ files: "./*.apk"
diff --git a/app.json b/app.json
index 2d039f9..5aa6f4b 100644
--- a/app.json
+++ b/app.json
@@ -6,7 +6,7 @@
"name": "Betterfly App",
"slug": "betterfly-app",
"scheme": "betterfly",
- "version": "1.0.0",
+ "version": "1.1.2",
"orientation": "portrait",
"icon": "./assets/logo.png",
"userInterfaceStyle": "light",
@@ -25,7 +25,10 @@
"backgroundColor": "#222b45"
},
"package": "com.clentfort.betterflyapp",
- "permissions": ["android.permission.SCHEDULE_EXACT_ALARM"]
+ "permissions": [
+ "android.permission.SCHEDULE_EXACT_ALARM",
+ "android.permission.USE_EXACT_ALARM"
+ ]
},
"web": {
"favicon": "./assets/logo.png"
diff --git a/package-lock.json b/package-lock.json
index 522ecf9..a18a307 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "betterfly-app",
- "version": "1.0.0",
+ "version": "1.1.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "betterfly-app",
- "version": "1.0.0",
+ "version": "1.1.2",
"license": "MIT",
"dependencies": {
"@eva-design/eva": "^2.2.0",
@@ -14,7 +14,7 @@
"@tanstack/react-query": "^5.17.15",
"@ui-kitten/components": "^5.3.1",
"@ui-kitten/eva-icons": "^5.3.1",
- "expo": "~50.0.4",
+ "expo": "~50.0.5",
"expo-constants": "~15.4.5",
"expo-device": "~5.9.3",
"expo-keep-awake": "~12.8.2",
@@ -2228,9 +2228,9 @@
}
},
"node_modules/@expo/cli": {
- "version": "0.17.3",
- "resolved": "https://registry.npmjs.org/@expo/cli/-/cli-0.17.3.tgz",
- "integrity": "sha512-lIK8igsEQxTh4WuDlcEhE0wAJcDrAyjWDF00phdmwuSCpE5SaEXNlddOXvGxEVKPhUxHZUFo9NbfoQC+JVmkfA==",
+ "version": "0.17.4",
+ "resolved": "https://registry.npmjs.org/@expo/cli/-/cli-0.17.4.tgz",
+ "integrity": "sha512-6pswecVC9qCBp1qa004D2HjPeXKYDaw/PhyUOsqnF7AUCwunlKa1tJO0Ik8zxzF68kuywIOXUnTJl74Z2aHqiw==",
"dependencies": {
"@babel/runtime": "^7.20.0",
"@expo/code-signing-certificates": "0.0.5",
@@ -9617,12 +9617,12 @@
}
},
"node_modules/expo": {
- "version": "50.0.4",
- "resolved": "https://registry.npmjs.org/expo/-/expo-50.0.4.tgz",
- "integrity": "sha512-8QWBvYZyKFd7pHxbtri8/ZITBR19QbrW2IkezAhs3ZOHR2kluSgNfyo9ojAe7GnOnE8hCB6Xe83Dbm0R3Ealhw==",
+ "version": "50.0.5",
+ "resolved": "https://registry.npmjs.org/expo/-/expo-50.0.5.tgz",
+ "integrity": "sha512-gfZbJv8eqVG1xX8QqlQHF4Mn6HnLFuE14Kq5FRUVZQWE+IhlrP+mr+un7Zdp/3a63Bp/VkPzHi77G1bVP1pM7A==",
"dependencies": {
"@babel/runtime": "^7.20.0",
- "@expo/cli": "0.17.3",
+ "@expo/cli": "0.17.4",
"@expo/config": "8.5.4",
"@expo/config-plugins": "7.8.4",
"@expo/metro-config": "0.17.3",
diff --git a/package.json b/package.json
index 80fe680..14653ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "betterfly-app",
- "version": "1.0.0",
+ "version": "1.1.2",
"main": "expo-router/entry",
"license": "MIT",
"scripts": {
@@ -20,7 +20,7 @@
"@tanstack/react-query": "^5.17.15",
"@ui-kitten/components": "^5.3.1",
"@ui-kitten/eva-icons": "^5.3.1",
- "expo": "~50.0.4",
+ "expo": "~50.0.5",
"expo-constants": "~15.4.5",
"expo-device": "~5.9.3",
"expo-keep-awake": "~12.8.2",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 8fe08d8..894beff 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -11,7 +11,7 @@ import { Platform } from "react-native";
import { SafeAreaProvider } from "react-native-safe-area-context";
import { ParseClientProvider } from "@/api/parse-client-context";
-import { DataProvider } from "@/contexts/session-context";
+import { SessionProvider } from "@/contexts/session-context";
import Client from "@/parse-client";
export const parseClient = new Client(
@@ -101,9 +101,9 @@ export default () => {
-
+
-
+
diff --git a/src/app/login.tsx b/src/app/login.tsx
index e2bc915..a32de3f 100644
--- a/src/app/login.tsx
+++ b/src/app/login.tsx
@@ -1,6 +1,5 @@
import { Button, Input, Text } from "@ui-kitten/components";
import { router } from "expo-router";
-import React from "react";
import PageLayout from "@/components/page-layout";
import PasswordInput from "@/components/password-input";
@@ -25,16 +24,24 @@ export default function HomeScreen(): React.ReactElement {
}}
>
Betterfly Member App
-
+