Merge branch 'features/1.3.0' into 'features/1.3.0_test'

Features/1.3.0 See merge request !53

Merge branch 'features/1.3.0' into 'features/1.3.0_test'
Features/1.3.0 See merge request !53
1bcc1ecf · Takuya Ogawa · c567a7df · d5b5b4a3 · 1bcc1ecf · 1bcc1ecf
Commit 1bcc1ecf authored Dec 25, 2019 by Takuya Ogawa
10 changed files
--- a/ABVJE_Launcher_Android/assets/chat/public/css/chat.css
+++ b/ABVJE_Launcher_Android/assets/chat/public/css/chat.css
@@ -570,4 +570,16 @@ a.article:hover {
  display: inline-block;
  text-align: left;
  width: 100%;
 }
\ No newline at end of file
+.modal-dialog {
+  z-index: 10001;
+}
+.modal {
+  z-index: 10101;
+}
+.modal-backdrop {
+  z-index:10050;
+}
--- a/ABVJE_Launcher_Android/assets/chat/public/js/chat.js
+++ b/ABVJE_Launcher_Android/assets/chat/public/js/chat.js
--- a/ABVJE_Launcher_Android/assets/chat/public/js/language_en.js
+++ b/ABVJE_Launcher_Android/assets/chat/public/js/language_en.js
 $.lang.en = {
    "chat_placeholder":"Type message",
-    "participants":"Paricipants",
+    "participants":"Member List",
    "exitRoom":"Exit ",
    "roomListTitle":"Room List",
    "deleteRoomTitle":"Delete Room",
@@ -8,7 +8,7 @@ $.lang.en = {
    "inviteUsersTitle":"Invite Member",
    "createRoomSubtitle":"Create Room",
    "inviteUsersSubtitle":"Invite User",
-    "roomListEmptyString":"No chat available.",
+    "roomListEmptyString":"There is no room available.",
    "left":"%@ has left",
    "join":"%@ has joined",
    "added":"%@  has been added",
@@ -31,5 +31,18 @@ $.lang.en = {
    "everyoneIsHere":"Everyone is in the chat.",
    "people":"people",
    "searchResult":"Results",
-    "searchRoomListEmptyString":"No search results."
+    "searchRoomListEmptyString":"No search results.",
+    "inputRoomName":"Please enter a room name.",
+    "exitRoomTitle":"Do you want to leave this room?",
+    "roomDeleteTitle":"Do you want to delete this room?",
+    "roomDelete":"Delete",
+    "cancelTitle":"No",
+    "yesTitle":"Yes",
+    "invalidCharacter":"The character ;/?:@&amp;=+$,-_.!~*\'()#\\\"` cannot be included in the roomname.",
+    "nameTooLong":"Please enter room name less than 20 characters.",
+    "errorDisconnected":"Disconnected from the server.",
+    "errorConnect":"There was a problem with the network.\n Please check the connection status of the network.",
+    "errorRoomNotFound":"This chat room has already been deleted.",
+    "serverErrorOccured":"App will not be able to communicate with the server. \n After a few moments, please try again.",
+    "memberDeleteTitle":"Do you want to remove selected members from the list?"
 }
--- a/ABVJE_Launcher_Android/assets/chat/public/js/language_ja.js
+++ b/ABVJE_Launcher_Android/assets/chat/public/js/language_ja.js
@@ -11,7 +11,7 @@ $.lang.ja = {
    "roomListEmptyString":"入場できるルームがありません。",
    "left":"%@ 様が退場しました。",
    "join":"%@ 様が入場しました。",
-    "added":"%@ 様が参加しました。",
+    "added":"%@ 様がルームに招待されました。",
    "welcome":"%@ に入場しました。",
    "userListDivideString":" 様, ",
    "orderByTime":"新着順",
@@ -31,5 +31,18 @@ $.lang.ja = {
    "everyoneIsHere":"招待可能なメンバーがいません。",
    "people":"人",
    "searchResult":"件のトーク",
-    "searchRoomListEmptyString":"検索結果がありません。"
+    "searchRoomListEmptyString":"検索結果がありません。",
+    "inputRoomName":"ルーム名を入力してください。",
+    "exitRoomTitle":"このチャットルームを出ますか？",
+    "roomDeleteTitle":"このチャットルームを削除しますか？",
+    "roomDelete":"削除",
+    "cancelTitle":"いいえ",
+    "yesTitle":"はい",
+    "invalidCharacter":"特殊文字 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` はルーム名に含めることができません。",
+    "nameTooLong":"ルーム名は文字列20字以内に入力してください。",
+    "errorDisconnected":"接続が切れました。",
+    "errorConnect":"ネットワークに問題がありました。\nネットワークの接続状態を確認してください。",
+    "errorRoomNotFound":"既に削除されたチャットルームです。",
+    "serverErrorOccured":"サーバと通信できません。\nしばらく時間をおいて再度操作してください。",
+    "memberDeleteTitle":"選択したメンバーをリストから削除しますか？"
 }
--- a/ABVJE_Launcher_Android/assets/chat/public/js/language_ko.js
+++ b/ABVJE_Launcher_Android/assets/chat/public/js/language_ko.js
 $.lang.ko = {
    "chat_placeholder":"메시지를 입력하세요.",
-    "participants":"대화상대",
+    "participants":"멤버 리스트",
    "exitRoom":"나가기 ",
    "roomListTitle":"채팅 리스트",
    "deleteRoomTitle":"채팅방 삭제",
@@ -17,9 +17,9 @@ $.lang.ko = {
    "orderByTime":"최신순",
    "orderByUnread":"안 읽은 순",
    "roomKeywordPlaceHolder":"검색",
-    "okayLabel":"알겠습니다!",
+    "okayLabel":"알겠습니다.",
    "completeLabel":"작업이 끝났습니다.",
-    "thankLabel":"감사합니다.:-)",
+    "thankLabel":"감사합니다.",
    "startToWorkLabel":"작업을 시작합니다.",
    "groupListKeyword":"검색",
    "groupPageSubtitle":"그룹",
@@ -31,5 +31,18 @@ $.lang.ko = {
    "everyoneIsHere":"초대가능한 유저가 없습니다.",
    "people":"명",
    "searchResult":"건의 결과",
-    "searchRoomListEmptyString":"검색 결과가 없습니다."
+    "searchRoomListEmptyString":"검색 결과가 없습니다.",
+    "inputRoomName":"방 제목을 입력해 주십시오.",
+    "exitRoomTitle":"이 채팅방을 나가시겠습니까?",
+    "roomDeleteTitle":"이 방을 삭제 하시겠습니까?",
+    "roomDelete":"삭제",
+    "cancelTitle":"아니오",
+    "yesTitle":"예",
+    "invalidCharacter":"특수문자 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` 는 방 제목에 포함될 수 없습니다.",
+    "nameTooLong":"방 제목은 20자 이내로 입력해 주세요.",
+    "errorDisconnected":"서버와 접속이 끊어졌습니다.",
+    "errorConnect":"네트워크에 문제가 발생했습니다.\n네트워크 연결상태를 확인하여 주십시요.",
+    "errorRoomNotFound":"이미 삭제된 채팅룸입니다.",
+    "serverErrorOccured":"서버와 통신할 수 없습니다.\n잠시 후 다시 시도해보시기 바랍니다.",
+    "memberDeleteTitle":"목록에서 선택된 멤버를 삭제하시겠습니까?"
 }
--- a/ABVJE_Launcher_Android/assets/chat/public/newstart.html
+++ b/ABVJE_Launcher_Android/assets/chat/public/newstart.html
@@ -25,6 +25,21 @@
        <button class="btn btn-primary roomListIcon" type="button" id="roomDeleteButton">
          <i class="fa fa-trash"></i>
        </button>
+        <!-- Confirm Dialog -->
+        <div id="roomDeleteConfirm" class="modal fade">
+          <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-content">
+              <div class="modal-body" id="roomDeleteTitle">
+                Are you sure?
+              </div>
+              <div class="modal-footer">
+                <button type="button" data-dismiss="modal" class="btn btn-primary" id="roomDelete">Delete</button>
+                <button type="button" data-dismiss="modal" class="btn" id="cancelTitle">Cancel</button>
+              </div>
+            </div>
+          </div>
+        </div>
      </li>
      <li class="nav-item dropdown roomListIcon">
        <a class="nav-link dropdown-toggle" href="#" id="arrangeRooms" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -76,6 +91,20 @@
          <span id="userSelectionLength" class="badge badge-light"></span>
          <i class="fas fa-check"></i>
        </button>
+        <!-- Alert Dialog -->
+        <div id="confirm" class="modal fade">
+          <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-content">
+              <div class="modal-body" id="userSelectionTitle">
+                Are you sure?
+              </div>
+              <div class="modal-footer">
+                <button type="button" data-dismiss="modal" class="btn" id="yesTitle">OK</button>
+              </div>
+            </div>
+          </div>
+        </div>
      </li>
    </ul>
  </nav>
@@ -93,6 +122,21 @@
      <a class="btn text-light" role="button" id="exitRoom">
        Exit <i class="fas fa-door-open"></i>
      </a>
+      <!-- Confirm Dialog -->
+      <div id="exitRoomConfirm" class="modal fade">
+        <div class="modal-dialog modal-dialog-centered">
+          <div class="modal-content">
+            <div class="modal-body" id="exitRoomTitle">
+              Are you sure?
+            </div>
+            <div class="modal-footer">
+              <button type="button" data-dismiss="modal" class="btn btn-primary" id="exitRoomOk">Ok</button>
+              <button type="button" data-dismiss="modal" class="btn" id="noExit">Cancel</button>
+            </div>
+          </div>
+        </div>
+      </div>
    </footer>
  </nav>
  <!-- Dark Overlay element -->
@@ -103,6 +147,36 @@
      <span class="sr-only">Loading...</span>
    </div>
  </div>
+  <!-- Error Alert Dialog -->
+  <div id="customAlert" class="modal fade">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-body" id="customAlertTitle">
+          Are you sure?
+        </div>
+        <div class="modal-footer">
+          <button type="button" data-dismiss="modal" class="btn btn-primary" id="customAlertOk">Ok</button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- Confirm Dialog -->
+  <div id="customConfirm" class="modal fade">
+    <div class="modal-dialog modal-dialog-centered">
+      <div class="modal-content">
+        <div class="modal-body" id="customConfirmTitle">
+          Are you sure?
+        </div>
+        <div class="modal-footer">
+          <button type="button" data-dismiss="modal" class="btn btn-primary" id="customConfirmOk">Ok</button>
+          <button type="button" data-dismiss="modal" class="btn" id="customAlertCancel">Cancel</button>
+        </div>
+      </div>
+    </div>
+  </div>
  <div class="tab-content" id="pills-tabContent">
    <div class="tab-pane fade show active" id="pills-chatlist" role="tabpanel" aria-labelledby="pills-chatlist-tab">
      <div class="inbox_people">

--- a/ABVJE_Res_Default_Android/res/values-ja/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ja/strings.xml
@@ -1433,4 +1433,5 @@
    <string name="msg_chat_confirm_member">選択したメンバーをリストから削除しますか？</string>
    <string name="msg_chat_confirm_delete">このチャットルームを削除しますか？</string>
    <string name="msg_error_chat_room_name_too_long">ルーム名は文字列20字以内に入力してください。</string>
+    <string name="msg_error_chat_name_has_invalid_character">特殊文字 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` はルーム名に含めることができません。</string>
 </resources>
--- a/ABVJE_Res_Default_Android/res/values-ko/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values-ko/strings.xml
@@ -1441,4 +1441,5 @@
    <string name="msg_chat_confirm_member">목록에서 선택된 멤버를 삭제하시겠습니까?</string>
    <string name="msg_chat_confirm_delete">이 방을 삭제 하시겠습니까?</string>
    <string name="msg_error_chat_room_name_too_long">방 제목은 20자 이내로 입력해 주세요.</string>
+    <string name="msg_error_chat_name_has_invalid_character">특수문자 ;/?:@&amp;=+$,-_.!~*\'()#\\\"` 는 방 제목에 포함될 수 없습니다.</string>
 </resources>
\ No newline at end of file
--- a/ABVJE_Res_Default_Android/res/values/strings.xml
+++ b/ABVJE_Res_Default_Android/res/values/strings.xml
@@ -1439,4 +1439,5 @@
    <string name="msg_chat_confirm_member">Do you want to remove selected members from the list?</string>
    <string name="msg_chat_confirm_delete">Do you want to delete this room?</string>
    <string name="msg_error_chat_room_name_too_long">Please enter room name less than 20 characters.</string>
+    <string name="msg_error_chat_name_has_invalid_character">The character ;/?:@&amp;=+$,-_.!~*\'()#\\\"` cannot be included in the roomname.</string>
 </resources>
\ No newline at end of file
--- a/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+++ b/ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.media.Image;
 import android.net.Uri;
@@ -90,6 +91,11 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        if (isNormalSize()) {
+            setPortraitIfNormal();
+        }
        setContentView(R.layout.chat_webview);
        Intent intent = getIntent();
        chatWebviewUrl = intent.getStringExtra("chatWebviewUrl");
@@ -143,6 +149,7 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
            @Override
            public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback, FileChooserParams fileChooserParams) {
                boolean result;
+//                result = startCameraIntent(ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE_VIDEO, true);
                result = startCameraIntent(ABOOK_CHECK_TASK_IMAGE, "Camera", ABookKeys.IMAGE, true);
                if (result) {
                    if (mUploadMessage != null) {
@@ -182,6 +189,8 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                    // #36142
                } else if (message.equals("Please enter room name less than 20 characters")) {
                    message = getString(R.string.msg_error_chat_room_name_too_long);
+                } else if (message.equals("InvalidSpecialCharacterRoomName")) {
+                    message = getString(R.string.msg_error_chat_name_has_invalid_character);
                } else {
                    message = message;
                }
@@ -231,27 +240,22 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
                } else {
                    message = "Confirm ?";
                }
-                new AlertDialog.Builder(ChatWebviewActivity.this)
+                ABookAlertDialog confirmAlert = AlertDialogUtil.createAlertDialog(ChatWebviewActivity.this, R.string.app_name);
-                        .setTitle(getString(R.string.app_name))
+                confirmAlert.setMessage(message);
-                        .setMessage(message)
+                confirmAlert.setButton(DialogInterface.BUTTON_POSITIVE, getResources().getString(R.string.confirm), new DialogInterface.OnClickListener() {
-                        .setPositiveButton(android.R.string.ok,
+                    @Override
-                                new DialogInterface.OnClickListener()
+                    public void onClick(DialogInterface dialog, int which) {
-                                {
+                        result.confirm();
-                                    public void onClick(DialogInterface dialog, int which)
+                    }
-                                    {
+                });
-                                        result.confirm();
+                confirmAlert.setButton(DialogInterface.BUTTON_NEGATIVE, getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
-                                    }
+                    @Override
-                                })
+                    public void onClick(DialogInterface dialog, int which) {
-                        .setNegativeButton(android.R.string.cancel,
+                        result.cancel();
-                                new DialogInterface.OnClickListener()
+                    }
-                                {
+                });
-                                    public void onClick(DialogInterface dialog, int which)
+                confirmAlert.setCancelable(false);
-                                    {
+                showAlertDialog(confirmAlert);
-                                        result.cancel();
-                                    }
-                                })
-                        .create()
-                        .show();
                return true;
            }
@@ -346,6 +350,14 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
    }
    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (isNormalSize()) {
+            setPortraitIfNormal();
+        }
+    }
+    @Override
    public void onDestroy(){
        super.onDestroy();