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

New UI, Animations, Error Handling, Search History, ... #99

Merged
merged 2 commits into from
Aug 9, 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
1 change: 0 additions & 1 deletion .env

This file was deleted.

6 changes: 4 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"tsconfigRootDir": "./",
"noUnusedLocals": true
},
"plugins": ["react", "react-native"],
"plugins": ["react", "react-native", "i18next", "react-hooks"],
"settings": {
"react": {
"version": "detect"
Expand All @@ -28,7 +28,9 @@
"react-native/no-inline-styles": 2,
"react-native/no-color-literals": 2,
"react-native/no-raw-text": 2,
"react-native/no-single-element-style-arrays": 2
"react-native/no-single-element-style-arrays": 2,
"i18next/no-literal-string": 2,
"react-hooks/rules-of-hooks": "error"
},
"ignorePatterns": ["metro.config.js"]
}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
.DS_Store

# vs code
.vscode/
.VSCodeCounter/

# bun
Expand Down
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"lokalise.i18n-ally",
"esbenp.prettier-vscode",
"eslint.vscode-eslint"
]
}
16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "expo",
"request": "attach",
"name": "Debug Expo app",
"projectRoot": "${workspaceFolder}",
"bundlerPort": "8082",
"bundlerHost": "127.0.0.1"
}
]
}
17 changes: 17 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"i18n-ally.localesPaths": ["src/localization"],
"i18n-ally.autoDetection": false,
"i18n-ally.keystyle": "nested",
"i18n-ally.namespace": true
}
6 changes: 2 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ def enableProguardInReleaseBuilds = (findProperty('android.enableProguardInRelea
*/
def jscFlavor = 'org.webkit:android-jsc:+'

apply from: new File(["node", "--print", "require('path').dirname(require.resolve('@sentry/react-native/package.json'))"].execute().text.trim(), "sentry.gradle")

android {
ndkVersion rootProject.ext.ndkVersion

Expand All @@ -90,8 +88,8 @@ android {
applicationId 'app.neuland'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 101
versionName "0.8.2"
versionCode 138
versionName "0.8.3"
}
signingConfigs {
debug {
Expand Down
1 change: 0 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission android:name="android.permission.USE_FINGERPRINT"/>
Expand Down
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,7 +1,7 @@
<resources>
<string name="app_name">Neuland Next</string>
<string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">true</string>
<string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>
<string name="ExpoLocalization_supportsRTL" translatable="false">undefined</string>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="android:statusBarColor">#ffffff</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="ResetEditText" parent="@android:style/Widget.EditText">
<item name="android:padding">0dp</item>
Expand Down
4 changes: 0 additions & 4 deletions android/sentry.properties

This file was deleted.

91 changes: 91 additions & 0 deletions app.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"expo": {
"name": "Neuland Next",
"slug": "neuland-app-native",
"scheme": "neuland",
"owner": "neuland-ingolstadt",
"version": "0.9.0",
"githubUrl": "https://github.com/neuland-ingolstadt/neuland.app-native/",
"orientation": "portrait",
"userInterfaceStyle": "automatic",
"ios": {
"bundleIdentifier": "de.neuland-ingolstadt.neuland-app",
"buildNumber": "71",
"supportsTablet": true,
"userInterfaceStyle": "automatic",
"associatedDomains": [
"webcredentials:neuland.app",
"activitycontinuation:neuland.app"
],
"config": {
"usesNonExemptEncryption": false
},
"infoPlist": {
"RCTAsyncStorageExcludeFromBackup": false,
"CFBundleAllowMixedLocalizations": true,
"CFBundleLocalizations": ["en", "de"],
"CFBundleDevelopmentRegion": "en",
"UIViewControllerBasedStatusBarAppearance": true,
"NSLocationWhenInUseUsageDescription": "Allow Neuland Next to access your location to show your location on the map."
},
"splash": {
"image": "./src/assets/splash/splashLight.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff",
"dark": {
"image": "./src/assets/splash/splashDark.png",
"backgroundColor": "#000000"
}
},
"icon": "./src/assets/appIcons/default.png"
},
"locales": {
"en-US": "./src/localization/en/ios.json",
"de-DE": "./src/localization/de/ios.json"
},
"androidStatusBar": {
"translucent": true
},
"android": {
"package": "app.neuland",
"userInterfaceStyle": "automatic",
"versionCode": 138,
"splash": {
"image": "./src/assets/splash/splashLight.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff",
"dark": {
"backgroundColor": "#000000",
"image": "./src/assets/splash/splashDark.png"
}
}
},
"sdkVersion": "51.0.0",
"experiments": {
"tsconfigPaths": true
},
"plugins": [
[
"expo-router",
{
"headOrigin": "https://neuland.app"
}
],
["expo-secure-store"],
["expo-localization"],
[
"expo-local-authentication",
{
"faceIDPermission": "Allow $(PRODUCT_NAME) to use Face ID."
}
],
["@maplibre/maplibre-react-native"],
"expo-build-properties"
],
"extra": {
"eas": {
"projectId": "b0ef9e3f-3115-44b0-abc7-99dd75821353"
}
}
}
}
99 changes: 0 additions & 99 deletions app.config.ts

This file was deleted.

Binary file modified bun.lockb
Binary file not shown.
Loading