Leon před 2 roky
rodič
revize
fbe7a31a41

+ 1 - 1
ios/AppDelegate.mm

@@ -101,7 +101,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 //  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#if DEBUG
+#if DEBUGaa
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
ios/main.jsbundle


+ 4 - 0
src/app.scss

@@ -68,6 +68,10 @@ page {
     display: flex;
     align-items: center;
     justify-content: center;
+    flex-shrink: 0;
+    position: absolute;
+    right: -2px;
+    top: 1px;
 }
 
 .metric_tag_text{

+ 12 - 0
src/components/input/SlidngScale.tsx

@@ -194,6 +194,18 @@ export default function Component(props: {
                 data = Math.round(data);
             }
 
+            if (process.env.TARO_ENV == 'rn') {
+                const ReactNativeHapticFeedback = require("react-native-haptic-feedback")
+                // Optional configuration
+                const options = {
+                    enableVibrateFallback: true,
+                    ignoreAndroidSystemSettings: false,
+                };
+
+                // Trigger haptic feedback
+                ReactNativeHapticFeedback.trigger("impactLight", options);
+            }
+
 
 
             setCurrent(data);

+ 12 - 2
src/features/trackSomething/components/MetricHistory.tsx

@@ -58,7 +58,7 @@ export default function Component(props: { records: any[] }) {
             success: function (res) {
                 // console.log(res.tapIndex)
                 setSelReference(global.selMetricItem.references[res.tapIndex])
-                updateMetricStandard(global.selMetricItem.references[res.tapIndex].id).then(res=>{
+                updateMetricStandard(global.selMetricItem.references[res.tapIndex].id).then(res => {
                     global.refreshMetric()
                 })
             },
@@ -75,7 +75,17 @@ export default function Component(props: { records: any[] }) {
         if (global.selMetricItem && global.selMetricItem.references.length > 0) {
             return <View style={{ display: 'flex', flexDirection: 'column', position: 'relative' }}>
                 <Text className="cell_header">{selReference.standard}</Text>
-                <Text onClick={showMore} style={{ color: global.selMetricItem.theme_color, position: 'absolute', right: rpxToPx(86), top: -rpxToPx(10) }}>More</Text>
+                {
+                    global.selMetricItem.references.length > 1 &&
+                    <Text onClick={showMore}
+                        style={{
+                            color: global.selMetricItem.theme_color,
+                            position: 'absolute',
+                            right: rpxToPx(86),
+                            top: -rpxToPx(10)
+                        }}>More</Text>
+                }
+
                 {
                     selReference.categories.map((item, index) => {
                         var cellClassName = 'cell_full'

+ 1 - 1
src/features/trackSomething/components/MetricModalChoose.tsx

@@ -163,7 +163,7 @@ export default function Component(props: {
 
                                         <Text className='modal_item_text' style={{ color: color, marginLeft: 10,marginRight:10 }}>{obj.name}</Text>
                                         {
-                                            obj.type=='composite' && <View className="metric_tag_bg">
+                                            obj.type=='composite' && <View className="metric_tag_bg" style={{position:'relative'}}>
                                                 <Text className="metric_tag_text" style={{ color: color }}>{t('feature.track_something.metric.composite')}</Text>
                                             </View>
                                         }

+ 0 - 3
src/utils/common.scss

@@ -27,9 +27,6 @@ $historyItemMarginBottom:16px;
     color: transparent;
 }
 
-.fast_sleep_text2{
-    color:red;
-}
 
 /* #endif */
 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů