bug fix

pelixpng · Jan 20, 2024 · 3af72a8 · 3af72a8
1 parent 73cb864
commit 3af72a8
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 21 deletions.
diff --git a/code/android/app/build.gradle b/code/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         applicationId 'com.pelixpng.PastVuApp'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4
-        versionName "1.3.0"
+        versionCode 5
+        versionName "1.3.1"
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
     }

diff --git a/code/android/app/src/main/AndroidManifest.xml b/code/android/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
     </intent>
   </queries>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:requestLegacyExternalStorage="true">
-    <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyAs_GoYr2mN3hjs-VynJXeGpONtaA5GkXo"/>
+    <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyAboOEQGb_eM7kUS3qRDVE8lrfDuKKJDp0"/>
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
     <meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="@string/expo_runtime_version"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>

diff --git a/code/app.json b/code/app.json
@@ -2,7 +2,7 @@
 	"expo": {
 		"name": "PastVu",
 		"slug": "PastVuApp",
-		"version": "1.3.0",
+		"version": "1.3.1",
 		"orientation": "portrait",
 		"icon": "./assets/icon.png",
 		"userInterfaceStyle": "light",
@@ -28,7 +28,7 @@
 				"backgroundColor": "#ffffff"
 			},
 			"package": "com.pelixpng.PastVuApp",
-			"versionCode": 4
+			"versionCode": 5
 		},
 		"web": {
 			"favicon": "./assets/favicon.png"

diff --git a/code/assets/avatar.png b/code/assets/avatar.png
diff --git a/code/babel.config.js b/code/babel.config.js
@@ -1,6 +1,7 @@
-module.exports = function(api) {
-  api.cache(true);
-  return {
-    presets: ['babel-preset-expo'],
-  };
-};
+module.exports = function (api) {
+	api.cache(true)
+	return {
+		presets: ['babel-preset-expo'],
+		plugins: ['react-native-reanimated/plugin']
+	}
+}
diff --git a/code/ios/PastVu/Info.plist b/code/ios/PastVu/Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundlePackageType</key>
     <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.3.0</string>
+    <string>1.3.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>

diff --git a/code/package-lock.json b/code/package-lock.json
diff --git a/code/package.json b/code/package.json
@@ -38,7 +38,9 @@
     "react-native-safe-area-context": "4.6.3",
     "react-native-screens": "~3.22.0",
     "styled-components": "^6.0.3",
-    "expo-image": "~1.3.5"
+    "expo-image": "~1.3.5",
+    "react-native-reanimated": "~3.3.0",
+    "@shopify/flash-list": "1.4.3"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

diff --git a/code/src/components/post/Comment.tsx b/code/src/components/post/Comment.tsx
@@ -4,9 +4,10 @@ import { perfectSize } from '../../utils/ScreenSize'
 import { DefaultTheme, useTheme } from 'styled-components'
 import RenderHtml from 'react-native-render-html'
 import { Image } from 'expo-image'
+import StandardAvatar from '../../../assets/avatar.png'
 
 type CommentProps = {
-	uri: string | undefined
+	uri?: string
 	name: string
 	text: string
 	width: string
@@ -24,9 +25,7 @@ export const Comment: FC<CommentProps> = ({ name, text, uri, width }) => {
 	return (
 		<CommentContainer width={width}>
 			<Image
-				source={{
-					uri: `https://pastvu.com${uri ? uri : '/img/caps/avatar.png'}`
-				}}
+				source={uri ? { uri: `https://pastvu.com${uri}` } : StandardAvatar}
 				style={{
 					width: perfectSize(40),
 					height: perfectSize(40),

diff --git a/code/src/screens/map/PhotoView.tsx b/code/src/screens/map/PhotoView.tsx
@@ -35,14 +35,13 @@ export const PhotoPage: React.FC<PhotoPageProps> = observer(({ route }) => {
 	} = route.params
 	return (
 		<ViewContainer>
-			<Pinchable style={{ width: '100%', height: '40%' }}>
+			<Pinchable style={{ width: '100%', height: '45%' }}>
 				<Image
 					source={{
 						uri: `https://pastvu.com/_p/${photoQualitySettings}/${file}`
 					}}
 					style={{ width: '100%', height: '100%' }}
 					contentFit="contain"
-					allowDownscaling={false}
 					onError={() =>
 						AlertModalService.infoAlert(
 							'Ошибка',

diff --git a/code/src/screens/settings/AboutApp.tsx b/code/src/screens/settings/AboutApp.tsx
@@ -7,6 +7,7 @@ import {
 } from '../../components/ui/UniversalComponents'
 import { InsideMenuProps, LinkProps } from '../../types/components'
 import { InsideMenuComponent } from '../../components/ui/InsideMenuComponent'
+import AppIcon from '../../../assets/icon.png'
 
 const ResourcesUsed: LinkProps[] = [
 	{ title: 'PastVu Api', url: 'https://docs.pastvu.com/dev/api' },
@@ -44,9 +45,9 @@ export const AppInfo: FC = () => {
 	return (
 		<ScrollContainer>
 			<AppIconContainer>
-				<LogoContainer source={require('../../../assets/icon.png')} />
+				<LogoContainer source={AppIcon} />
 				<MenuDescriptionText>
-					Версия 1.3.0 от 13 января 2024 г.
+					Версия 1.3.1 от 18 января 2024 г.
 				</MenuDescriptionText>
 			</AppIconContainer>
 			<InsideMenuComponent