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
  • !253

Merged
Opened Apr 13, 2022 by onuma@onuma 
  • Report abuse
Report abuse

×ボタンをタップした時に、ネイティブで確認ダイアログを表示するように修正した

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b features/1.4.203_41596 origin/features/1.4.203_41596

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout features/1.4.210
git merge --no-ff features/1.4.203_41596

Step 4. Push the result of the merge to GitLab

git push origin features/1.4.210

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 4
  • Commits 4
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Jinsung
    @kim_j started a discussion on commit 9add66a4 Apr 13, 2022
    gradle.properties
    38 38 # abvEnvironments.xml
    39 39
    40 40 #cms server
    41 acms_address=https://check130.agentec.jp/acms
    42 download_server_address=https://check130.agentec.jp/acms
    41 acms_address=https://chatdev2.agentec.jp/acms
    • Kim Jinsung @kim_j commented Apr 13, 2022
      Developer

      このファイルは項目追加&削除以外はコミットしないでください。

      このファイルは項目追加&削除以外はコミットしないでください。
    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit 95d883e7 Apr 13, 2022
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
    650 651 return true;
    651 652 }
    652 653
    654 // 左上の×ボタンを押したときの処理
    655 private void showCancelConfirmAlert(final int dialogTitle, int dialogMessage) {
    • Kim Jinsung @kim_j commented Apr 13, 2022
      Developer

      コメントを正常にしてください。 /**

      */

      コメントを正常にしてください。 /** */
    Please register or sign in to reply
  • Kim Jinsung
    @kim_j started a discussion on commit 95d883e7 Apr 13, 2022
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
    650 651 return true;
    651 652 }
    652 653
    654 // 左上の×ボタンを押したときの処理
    655 private void showCancelConfirmAlert(final int dialogTitle, int dialogMessage) {
    656 ABookAlertDialog logoutAkert = AlertDialogUtil.createAlertDialog(this, dialogTitle);
    • Kim Jinsung @kim_j commented Apr 13, 2022
      Developer

      できれば、AlertDialogUtilクラスの「showAlertDialog(Context context, int title, int message, boolean isCancleButtonHidden, DialogInterface.OnClickListener okOnClick)」を利用お願いします。

      できれば、AlertDialogUtilクラスの「showAlertDialog(Context context, int title, int message, boolean isCancleButtonHidden, DialogInterface.OnClickListener okOnClick)」を利用お願いします。
    Please register or sign in to reply
  • onuma @onuma

    added 1 commit

    • 3b82bc1c - ダイアログの表示にshowAlertDialogを使用するように変更。gradle.propertiesを元にもどした。

    Compare with previous version

    Apr 13, 2022

    added 1 commit

    • 3b82bc1c - ダイアログの表示にshowAlertDialogを使用するように変更。gradle.propertiesを元にもどした。

    Compare with previous version

    added 1 commit * 3b82bc1c - ダイアログの表示にshowAlertDialogを使用するように変更。gradle.propertiesを元にもどした。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/253/diffs?diff_id=8160&start_sha=95d883e75225d3679b45efb1dd82706b55ff3029)
    Toggle commit list
  • Kim Jinsung
    @kim_j started a discussion on commit 3b82bc1c Apr 13, 2022
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
    182 183 // リソースパターンの適用
    183 int messageResourceId = PatternStringUtil.patternToInt(getApplicationContext(),
    184 R.string.msg_oz_report_cancel,
    185 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
    186
    187 showCancelConfirmAlert(PatternStringUtil.patternToInt(getApplicationContext(),
    188 R.string.back,
    189 getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)),messageResourceId);
    184 // int messageResourceId = PatternStringUtil.patternToInt(getApplicationContext(),
    185 // R.string.msg_oz_report_cancel,
    186 // getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
    187
    188 // showCancelConfirmAlert(PatternStringUtil.patternToInt(getApplicationContext(),
    189 // R.string.back,
    190 // getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)),messageResourceId);
    191 showCancelConfirmAlert();
    • Kim Jinsung @kim_j commented Apr 13, 2022
      Developer

      不要なソースはコメントではなく削除お願いします。

      不要なソースはコメントではなく削除お願いします。
    Please register or sign in to reply
  • onuma @onuma

    added 1 commit

    • 6a7c7630 - 不要なコメントを削除

    Compare with previous version

    Apr 13, 2022

    added 1 commit

    • 6a7c7630 - 不要なコメントを削除

    Compare with previous version

    added 1 commit * 6a7c7630 - 不要なコメントを削除 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/253/diffs?diff_id=8161&start_sha=3b82bc1cdf547a2bfc44d1a07fd1c6d0839ab5dd)
    Toggle commit list
  • Kim Jinsung @kim_j

    assigned to @onuma

    Apr 13, 2022

    assigned to @onuma

    assigned to @onuma
    Toggle commit list
  • onuma @onuma

    merged

    Apr 13, 2022

    merged

    merged
    Toggle commit list
  • onuma @onuma

    mentioned in commit 0267b544

    Apr 13, 2022

    mentioned in commit 0267b544

    mentioned in commit 0267b54450f7aba0cebf74982a7d55c2b3c5beba
    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
onuma
Assignee
onuma @onuma
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!253
×

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.