Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
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
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
9bda7c2b
Commit
9bda7c2b
authored
Jun 03, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
文書協業「Loading」表示からメッセージに修正。
parent
a50b86be
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
3 deletions
+53
-3
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
+1
-0
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
+47
-3
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
9bda7c2b
...
...
@@ -1482,6 +1482,7 @@
<string
name=
"msg_confirm_send_host_change"
>
ホスト権限変更の依頼があります。変更しますか?
</string>
<string
name=
"msg_confirm_share_image"
>
キャプチャーした写真を共有しますか?
</string>
<string
name=
"msg_invite_collaboration"
>
協業に招待されました。
</string>
<string
name=
"msg_wait_for_host"
>
ホストが文書を選択中です
</string>
<!-- 連続作業 -->
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
<string
name=
"msg_ozd_file_could_not_opened"
>
帳票ファイルを開くことができませんでした。
</string>
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
9bda7c2b
...
...
@@ -1490,4 +1490,5 @@
<string
name=
"msg_confirm_send_host_change"
>
방장 권한을 전달 받으시겠습니까?
</string>
<string
name=
"msg_confirm_share_image"
>
캡쳐한 사진을 공유 하시겠습니까?
</string>
<string
name=
"msg_invite_collaboration"
>
협업에 초대되셨습니다.
</string>
<string
name=
"msg_wait_for_host"
>
호스트가 문서를 선택중입니다.
</string>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
9bda7c2b
...
...
@@ -1487,4 +1487,5 @@
<string
name=
"msg_confirm_send_host_change"
>
Do you want to receive host permissions?
</string>
<string
name=
"msg_confirm_share_image"
>
Do you want to share captured image?
</string>
<string
name=
"msg_invite_collaboration"
>
You are invited to collaboration.
</string>
<string
name=
"msg_wait_for_host"
>
Wait for host select
</string>
</resources>
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
View file @
9bda7c2b
...
...
@@ -16,6 +16,7 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:id=
"@+id/related_content_third_linear"
android:orientation=
"vertical"
>
<FrameLayout
...
...
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
View file @
9bda7c2b
...
...
@@ -17,6 +17,7 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:id=
"@+id/related_content_third_linear"
android:orientation=
"vertical"
>
<FrameLayout
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
View file @
9bda7c2b
...
...
@@ -2,10 +2,15 @@ package jp.agentec.abook.abv.ui.home.activity;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.graphics.Color
;
import
android.os.AsyncTask
;
import
android.os.Bundle
;
import
android.util.DisplayMetrics
;
import
android.view.Display
;
import
android.view.Gravity
;
import
android.view.KeyEvent
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.Button
;
import
android.widget.ImageButton
;
import
android.widget.LinearLayout
;
...
...
@@ -66,6 +71,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
private
List
<
CategoryContentDto
>
mOperationContentList
;
private
LinearLayout
mToolbar
;
private
OperationLogic
mOperationLogic
=
AbstractLogic
.
getLogic
(
OperationLogic
.
class
);
TextView
mWaitOwnerTextView
;
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
...
...
@@ -501,7 +507,15 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
}
}
}
if
(
isCollaboration
)
{
if
(
isCollaborationOwner
)
{
mAllSaveButton
.
setVisibility
(
visible
);
}
else
{
mAllSaveButton
.
setVisibility
(
View
.
GONE
);
}
}
else
{
mAllSaveButton
.
setVisibility
(
visible
);
}
}
});
}
...
...
@@ -511,16 +525,19 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
activityHandlingHelper
.
removeContentViewActivity
(
activityHandlingHelper
.
getContentViewActivity
());
hideBottomToolbar
();
if
(
isCollaborationOwner
)
{
closeProgressPopup
();
hideWaitOwnerSelect
();
showContentList
();
mAllSaveButton
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
show
ProgressPopup
();
show
WaitOwnerSelect
();
hideContentList
();
mAllSaveButton
.
setVisibility
(
View
.
GONE
);
}
}
else
{
closeProgressPopup
();
hideWaitOwnerSelect
();
showBottomToolbar
();
showContentList
();
mAllSaveButton
.
setVisibility
(
View
.
VISIBLE
);
}
}
...
...
@@ -543,4 +560,31 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
public
void
onClickSetting
(
View
v
)
{
showSetting
();
}
public
void
showWaitOwnerSelect
()
{
if
(
mWaitOwnerTextView
==
null
)
{
Display
display
=
getWindowManager
().
getDefaultDisplay
();
DisplayMetrics
outMetrics
=
new
DisplayMetrics
();
display
.
getMetrics
(
outMetrics
);
LinearLayout
container
=
(
LinearLayout
)
findViewById
(
R
.
id
.
related_content_third_linear
);
mWaitOwnerTextView
=
new
TextView
(
this
);
mWaitOwnerTextView
.
setText
(
getString
(
R
.
string
.
msg_wait_for_host
));
mWaitOwnerTextView
.
setGravity
(
Gravity
.
CENTER
);
mWaitOwnerTextView
.
setTextAlignment
(
View
.
TEXT_ALIGNMENT_CENTER
);
LinearLayout
mainLayout
=
(
LinearLayout
)
findViewById
(
R
.
id
.
related_content_main_linear
);
mWaitOwnerTextView
.
setHeight
((
int
)
(
outMetrics
.
heightPixels
/
2
));
mWaitOwnerTextView
.
setTextSize
(
20
);
mWaitOwnerTextView
.
setTextColor
(
Color
.
BLACK
);
container
.
addView
(
mWaitOwnerTextView
);
}
mWaitOwnerTextView
.
setVisibility
(
View
.
VISIBLE
);
}
public
void
hideWaitOwnerSelect
()
{
if
(
mWaitOwnerTextView
!=
null
)
{
mWaitOwnerTextView
.
setVisibility
(
View
.
GONE
);
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment