Merge branch 'refactoring/boolValueFromString' into 'develop'

Refactoring/bool value from string

See merge request !199

public_new/archive.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css">
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/archive.css">

public_new/archive_detail.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css">
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/archive.css">

public_new/chat.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/chat_add_user.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/chat_add_user_confirm.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css">
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/chat_change_room_name.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/chat_make_room.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/chat_make_room_confirm.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/chat_room.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <!--<link rel="stylesheet" href="./css/notosansjp.css">-->
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/jquery-ui.min.css">
   <link rel="stylesheet" href="./css/common.css">

public_new/collaboration.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/contact.css">

public_new/collaboration_documents.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/contact.css">

public_new/collaboration_picture.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/collaboration.css">

public_new/collaboration_video.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/collaboration.css">

public_new/collaboration_voice.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/contact.css">

public_new/collaboration_whiteboard.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css" >
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/collaboration.css">

public_new/contact.html

@@ -8,7 +8,7 @@
     content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1, user-scalable=0">
   <title>LiveTaskyell</title>
   <link rel="stylesheet" href="./css/notosansjp.css">
-  <link href="./fontawesome/css/all.css" rel="stylesheet">
+  <link rel="stylesheet" href="./fontawesome/css/all.css">
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/common.css">
   <link rel="stylesheet" href="./css/chat.css">

public_new/js/common/native-bridge-datasource.js

@@ -15,6 +15,10 @@ function callNativeApp(iosKey, jsonData) {
   return result;
 }
 
+function parseBoolStringToBool(str) {
+  return str == "true" ? true : false;
+}
+
 var NativeBridgeDataSource = {};
 
 NativeBridgeDataSource.removeFavoriteGroup = function (groupID) {
@@ -22,7 +26,7 @@ NativeBridgeDataSource.removeFavoriteGroup = function (groupID) {
     const result = callNativeApp(NATIVE_KEY_IOS.removeFavoriteGroup, {
       groupId: groupID,
     });
-    return result == "true" ? true : false;
+    return parseBoolStringToBool(result);
   } else {
     return android.removeFavoriteGroup(groupID);
   }
@@ -35,11 +39,7 @@ NativeBridgeDataSource.addFavoriteGroup = function (groupID) {
     const result = callNativeApp(NATIVE_KEY_IOS.addFavoriteGroup, {
       groupId: groupID,
     });
-    if (result == "true") {
-      return true;
-    } else {
-      return false;
-    }
+    return parseBoolStringToBool(result);
   }
 };
 
@@ -352,14 +352,10 @@ NativeBridgeDataSource.getBeforeRoomType = function () {
 
 NativeBridgeDataSource.removeFavoriteUser = function (shopMemberId) {
   if (deviceInfo.isiOS()) {
-    var result = callNativeApp(NATIVE_KEY_IOS.removeFavoriteUser, {
+    const result = callNativeApp(NATIVE_KEY_IOS.removeFavoriteUser, {
       shopMemberId: shopMemberId,
     });
-    if (result == "true") {
-      return true;
-    } else {
-      return false;
-    }
+    return parseBoolStringToBool(result);
   } else {
     return android.removeFavoriteUser(shopMemberId);
   }
@@ -367,14 +363,10 @@ NativeBridgeDataSource.removeFavoriteUser = function (shopMemberId) {
 
 NativeBridgeDataSource.addFavoriteUser = function (shopMemberId) {
   if (deviceInfo.isiOS()) {
-    var result = callNativeApp(NATIVE_KEY_IOS.addFavoriteUser, {
+    const result = callNativeApp(NATIVE_KEY_IOS.addFavoriteUser, {
       shopMemberId: shopMemberId,
     });
-    if (result == "true") {
-      return true;
-    } else {
-      return false;
-    }
+    return parseBoolStringToBool(result);
   } else {
     return android.addFavoriteUser(shopMemberId);
   }
@@ -391,8 +383,6 @@ NativeBridgeDataSource.getJoinCollaborationType = function () {
   }
 };
 
-
-
 NativeBridgeDataSource.getUserInfoList = function (shopMemberId) {
   if (deviceInfo.isiOS()) {
     return callNativeApp(NATIVE_KEY_IOS.getUserInfoList, {

public_new/js/common/native-bridge-delegate.js

@@ -270,7 +270,7 @@ NativeBridgeDelegate.updateMessages = function (roomID) {
 
 NativeBridgeDelegate.saveVisitRoomInfo = function (roomID = "", roomName = "") {
   if (deviceInfo.isiOS()) {
-    webkit.messageHandlers.roomInfosaveMessageHandlerId.postMessage({
+    webkit.messageHandlers.roomInfoSaveMessageHandlerId.postMessage({
       roomId: roomID,
       roomName: roomName,
     });

public_new/modal_collabo_profile.html

@@ -22,7 +22,7 @@
           <button type="button" class="border-0 bg_navy"
             onclick="CollaborationUI.removeFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
             <div class="d-flex flex-column">
-              <span class="star active shopmember_890" onclick="CHAT_UI.favoriteUserChange(890,this)"></span>
+              <span class="star active shopmember_{{shopMemberId}}" onclick="CHAT_UI.favoriteUserChange('{{shopMemberId}}',this)"></span>
               <span>お気に入り解除</span>
             </div>
           </button>
@@ -31,7 +31,7 @@
           <button type="button" class="border-0 bg_navy"
             onclick="CollaborationUI.insertFavoriteUserInCollaboration({{shopMemberId}})" id="favoriteButton">
             <div class="d-flex flex-column">
-              <span class="star disable shopmember_3690" onclick="Namecard.favoriteUserChange(3690,this)"></span>
+              <span class="star disable shopmember_{{shopMemberId}}" onclick="Namecard.favoriteUserChange('{{shopMemberId}}',this)"></span>
               <span>お気に入り登録</span>
             </div>
           </button>