Androidスマホ調整

TrainLCD · Oct 13, 2024 · a60a8af · a60a8af
1 parent 0bf3288
commit a60a8af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/components/LineBoardToei.tsx b/src/components/LineBoardToei.tsx
@@ -1,6 +1,6 @@
 import { LinearGradient } from 'expo-linear-gradient'
 import React, { useCallback, useMemo, useState } from 'react'
-import { Dimensions, Platform, StyleSheet, View } from 'react-native'
+import { Dimensions, StyleSheet, View } from 'react-native'
 import { RFValue } from 'react-native-responsive-fontsize'
 import { useRecoilValue } from 'recoil'
 import { Line, Station } from '../../gen/proto/stationapi_pb'
@@ -112,17 +112,14 @@ const styles = StyleSheet.create({
     fontSize: RFValue(16),
     fontWeight: 'bold',
     marginLeft: isTablet ? 5 : 2.5,
-    marginBottom: Platform.select({
-      ios: 0,
-      android: isTablet ? 0 : -4,
-    }),
+    marginBottom: 0,
   },
   stationNameExtra: {
     width: RFValue(10),
     textAlign: 'center',
     fontSize: RFValue(10),
     fontWeight: 'bold',
-    marginBottom: Platform.select({ ios: 0, android: isTablet ? 0 : -4 }),
+    marginBottom: 0,
   },
   stationNameEn: {
     fontSize: RFValue(16),
@@ -132,10 +129,7 @@ const styles = StyleSheet.create({
   },
   stationNameHorizontalContainer: {
     position: 'relative',
-    bottom: Platform.select({
-      ios: 0,
-      android: isTablet ? -4 : 0,
-    }),
+    bottom: 0,
     justifyContent: 'flex-start',
   },
   stationNameHorizontalWrapper: {

diff --git a/src/components/TrainTypeBox.tsx b/src/components/TrainTypeBox.tsx
@@ -232,7 +232,6 @@ const TrainTypeBox: React.FC<Props> = ({ trainType, isTY }: Props) => {
                 ...styles.text,
                 letterSpacing,
                 marginLeft,
-                width: '100%',
               },
             ]}
             adjustsFontSizeToFit
@@ -261,6 +260,7 @@ const TrainTypeBox: React.FC<Props> = ({ trainType, isTY }: Props) => {
       {showNextTrainType && nextTrainType?.nameRoman ? (
         <Typography
           style={[
+            styles.text,
             styles.nextTrainType,
             {
               color: theme === APP_THEME.TY ? '#fff' : '#444',

diff --git a/src/components/Typography.tsx b/src/components/Typography.tsx
@@ -3,6 +3,7 @@ import { StyleProp, Text, TextProps, TextStyle } from 'react-native'
 import { FONTS } from '../constants'
 import { useThemeStore } from '../hooks/useThemeStore'
 import { APP_THEME } from '../models/Theme'
+import isTablet from '../utils/isTablet'
 
 const Typography = forwardRef((props: TextProps, ref: LegacyRef<Text>) => {
   const isLEDTheme = useThemeStore((state) => state === APP_THEME.LED)
@@ -19,7 +20,7 @@ const Typography = forwardRef((props: TextProps, ref: LegacyRef<Text>) => {
       {
         fontFamily,
         color: isLEDTheme ? '#fff' : '#333',
-        includeFontPadding: false,
+        includeFontPadding: !isTablet,
       },
       overrideStyle,
     ],