Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
abook_check
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !173

Merged
Opened Jun 03, 2021 by Lee Munkyeong@lee-mk 1 of 1 task completed1/1 task
  • Report abuse
Report abuse

文書協業「Loading」表示からメッセージに修正。

  • @kim-p
Edited Jun 03, 2021 by Kim Peace
  • Discussion 3
  • Commits 3
  • Changes 7
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Jun 03, 2021
    Last updated by Lee Munkyeong Jun 03, 2021
    ABVJE_Res_Default_Android/res/values/strings.xml
    1487 1487 <string name="msg_confirm_send_host_change">Do you want to receive host permissions?</string>
    1488 1488 <string name="msg_confirm_share_image">Do you want to share captured image?</string>
    1489 1489 <string name="msg_invite_collaboration">You are invited to collaboration.</string>
    1490 <string name="msg_wait_for_host">Wait for host select</string>
    • Kim Peace @kim-p commented Jun 03, 2021
      Master

      Please wait for selecting document by host

      Edited Jun 03, 2021 by Kim Peace
      `Please wait for selecting document by host`
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Jun 03, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/173/diffs?diff_id=6373&start_sha=9bda7c2b1fbd66eade434e536e5f21c1951d19ad#67b7d0318509be57703c0f00be5955dff5502d0e_1490_1490)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on the diff Jun 03, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
    501 507 }
    502 508 }
    503 509 }
    504 mAllSaveButton.setVisibility(visible);
    510 if (isCollaboration) {
    511 if (isCollaborationOwner) {
    512 mAllSaveButton.setVisibility(visible);
    513 } else {
    514 mAllSaveButton.setVisibility(View.GONE);
    515 }
    516 } else {
    • Kim Peace @kim-p commented Jun 03, 2021
      Master

      [want]

      // not preferred
      if (isCollaborationOwner) {
          mAllSaveButton.setVisibility(visible);
      } else {
          mAllSaveButton.setVisibility(View.GONE);
      }
      // preferred
      mAllSaveButton.setVisibility(isCollaborationOwner ? visible : View.GONE);
      [want] ```java // not preferred if (isCollaborationOwner) { mAllSaveButton.setVisibility(visible); } else { mAllSaveButton.setVisibility(View.GONE); } // preferred mAllSaveButton.setVisibility(isCollaborationOwner ? visible : View.GONE); ```
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Jun 03, 2021
    Last updated by Lee Munkyeong Jun 03, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
    543 560 public void onClickSetting(View v) {
    544 561 showSetting();
    545 562 }
    563
    564 public void showWaitOwnerSelect() {
    565 if (mWaitOwnerTextView == null) {
    • Kim Peace @kim-p commented Jun 03, 2021
      Master

      [want]

      if (mWaitOwnerTextView != null) {
          mWaitOwnerTextView.setVisibility(View.VISIBLE);
          return;
      }
      ...
      [want] ```java if (mWaitOwnerTextView != null) { mWaitOwnerTextView.setVisibility(View.VISIBLE); return; } ... ```
    • Lee Munkyeong @lee-mk

      changed this line in version 3 of the diff

      Jun 03, 2021

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/173/diffs?diff_id=6374&start_sha=4d0f3efb759037bec259726fd8cf7f53d36d5dcd#71a492cdda762129c8f8f99a0e2319a3a391813e_561_561)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Jun 03, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @lee-mk

    Jun 03, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 3 commits

    • 9bda7c2b...ff5f9273 - 2 commits from branch communication/develop
    • 4d0f3efb - Merge branch 'communication/develop' of…

    Compare with previous version

    Jun 03, 2021

    added 3 commits

    • 9bda7c2b...ff5f9273 - 2 commits from branch communication/develop
    • 4d0f3efb - Merge branch 'communication/develop' of…

    Compare with previous version

    added 3 commits * 9bda7c2b...ff5f9273 - 2 commits from branch `communication/develop` * 4d0f3efb - Merge branch &#x27;communication&#x2F;develop&#x27; of… [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/173/diffs?diff_id=6373&start_sha=9bda7c2b1fbd66eade434e536e5f21c1951d19ad)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • b445f65f - コードレビュー対応

    Compare with previous version

    Jun 03, 2021

    added 1 commit

    • b445f65f - コードレビュー対応

    Compare with previous version

    added 1 commit * b445f65f - コードレビュー対応 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/173/diffs?diff_id=6374&start_sha=4d0f3efb759037bec259726fd8cf7f53d36d5dcd)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    Jun 03, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit 37617ade

    Jun 03, 2021

    mentioned in commit 37617ade

    mentioned in commit 37617ade1d39d7ed01fa91d63b92edb7ded7ebe8
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Lee Munkyeong
Assignee
Lee Munkyeong @lee-mk
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!173
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.