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
8cf69a6a
Commit
8cf69a6a
authored
Dec 15, 2020
by
Kang Donghun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove button and shortcut menu
parent
82126852
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
64 deletions
+66
-64
ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
+46
-47
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
+8
-8
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
+12
-9
No files found.
ABVJE_UI_Android/res/layout/communication_menu_dialog.xml
View file @
8cf69a6a
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
30
0dp"
android:layout_height=
"
25
0dp"
android:minHeight=
"200dp"
android:minHeight=
"200dp"
android:background=
"@color/operation_bg"
android:background=
"@color/operation_bg"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
...
@@ -47,62 +47,61 @@
...
@@ -47,62 +47,61 @@
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginBottom=
"15dp"
android:layout_marginLeft=
"15dp"
android:layout_marginLeft=
"15dp"
android:layout_marginRight=
"15dp"
android:layout_marginRight=
"15dp"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:focusable=
"false"
android:focusable=
"false"
android:clickable=
"false"
>
android:clickable=
"false"
>
<LinearLayout
<!-- <LinearLayout-->
android:id=
"@+id/ll_item_meeting"
<!-- android:id="@+id/ll_item_meeting"-->
android:layout_width=
"match_parent"
<!-- android:layout_width="match_parent"-->
android:layout_height=
"wrap_content"
<!-- android:layout_height="wrap_content"-->
android:layout_marginBottom=
"5dp"
<!-- android:layout_marginBottom="5dp"-->
android:layout_marginTop=
"5dp"
<!-- android:layout_marginTop="5dp"-->
android:layout_weight=
"3"
<!-- android:layout_weight="3"-->
android:gravity=
"center"
<!-- android:gravity="center"-->
android:orientation=
"horizontal"
<!-- android:orientation="horizontal"-->
android:background=
"@drawable/list_selector_holo_light"
<!-- android:background="@drawable/list_selector_holo_light"-->
android:focusable=
"true"
<!-- android:focusable="true"-->
android:clickable=
"true"
<!-- android:clickable="true"-->
android:visibility=
"visible"
>
<!-- android:visibility="visible">--
>
<ImageView
<!-- <ImageView-->
android:id=
"@+id/btn_operation_meeting"
<!-- android:id="@+id/btn_operation_meeting"-->
android:layout_width=
"wrap_content"
<!-- android:layout_width="wrap_content"-->
android:layout_height=
"wrap_content"
<!-- android:layout_height="wrap_content"-->
android:layout_weight=
"0"
<!-- android:layout_weight="0"-->
android:layout_alignParentLeft=
"true"
<!-- android:layout_alignParentLeft="true"-->
android:layout_centerVertical=
"true"
<!-- android:layout_centerVertical="true"-->
android:layout_marginRight=
"15dp"
<!-- android:layout_marginRight="15dp"-->
android:src=
"@drawable/ic_communication_meeting"
<!-- android:src="@drawable/ic_communication_meeting"-->
android:visibility=
"visible"
/
>
<!-- android:visibility="visible" />--
>
<TextView
<!-- <TextView-->
android:id=
"@+id/item3_text"
<!-- android:id="@+id/item3_text"-->
android:layout_width=
"wrap_content"
<!-- android:layout_width="wrap_content"-->
android:layout_height=
"wrap_content"
<!-- android:layout_height="wrap_content"-->
android:layout_weight=
"0.8"
<!-- android:layout_weight="0.8"-->
android:paddingLeft=
"6dip"
<!-- android:paddingLeft="6dip"-->
android:text=
"@string/remote_support"
<!-- android:text="@string/remote_support"-->
android:textAppearance=
"?android:attr/textAppearanceMedium"
<!-- android:textAppearance="?android:attr/textAppearanceMedium"-->
android:textColor=
"@color/text_select"
/
>
<!-- android:textColor="@color/text_select" />--
>
<ImageView
<!-- <ImageView-->
android:id=
"@+id/item3_nextLevel"
<!-- android:id="@+id/item3_nextLevel"-->
android:layout_width=
"wrap_content"
<!-- android:layout_width="wrap_content"-->
android:layout_height=
"wrap_content"
<!-- android:layout_height="wrap_content"-->
android:layout_weight=
"0"
<!-- android:layout_weight="0"-->
android:layout_alignParentRight=
"true"
<!-- android:layout_alignParentRight="true"-->
android:src=
"@drawable/ic_navigation_next_item"
<!-- android:src="@drawable/ic_navigation_next_item"-->
android:visibility=
"visible"
/
>
<!-- android:visibility="visible" />--
>
</LinearLayout
>
<!-- </LinearLayout>--
>
<View
<!-- <View-->
android:layout_width=
"fill_parent"
<!-- android:layout_width="fill_parent"-->
android:layout_height=
"1dp"
<!-- android:layout_height="1dp"-->
android:background=
"@android:color/darker_gray"
/
>
<!-- android:background="@android:color/darker_gray"/>--
>
<LinearLayout
<LinearLayout
android:id=
"@+id/ll_item_push_message"
android:id=
"@+id/ll_item_push_message"
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVAuthenticatedActivity.java
View file @
8cf69a6a
...
@@ -831,14 +831,14 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
...
@@ -831,14 +831,14 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
ivIcon
.
setBackgroundResource
(
R
.
drawable
.
ic_communication_push_message_list
);
ivIcon
.
setBackgroundResource
(
R
.
drawable
.
ic_communication_push_message_list
);
}
}
LinearLayout
ll_menuItem_meeting
=
(
LinearLayout
)
mCommunicationMenuDialog
.
findViewById
(
R
.
id
.
ll_item_meeting
);
//
LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
ll_menuItem_meeting
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
//
ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
@Override
//
@Override
public
void
onClick
(
View
view
)
{
//
public void onClick(View view) {
ActivityHandlingHelper
.
getInstance
().
startMeetingActivity
();
//
ActivityHandlingHelper.getInstance().startMeetingActivity();
mCommunicationMenuDialog
.
dismiss
();
//
mCommunicationMenuDialog.dismiss();
}
//
}
});
//
});
LinearLayout
ll_menuItem_push_message
=
(
LinearLayout
)
mCommunicationMenuDialog
.
findViewById
(
R
.
id
.
ll_item_push_message
);
LinearLayout
ll_menuItem_push_message
=
(
LinearLayout
)
mCommunicationMenuDialog
.
findViewById
(
R
.
id
.
ll_item_push_message
);
ll_menuItem_push_message
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
ll_menuItem_push_message
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
View file @
8cf69a6a
...
@@ -62,7 +62,10 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -62,7 +62,10 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
private
ValueCallback
<
Uri
[]>
mUploadMessage
;
private
ValueCallback
<
Uri
[]>
mUploadMessage
;
private
String
sid
,
roomName
,
loginId
,
shopName
;
private
String
sid
;
private
String
roomName
;
private
String
loginId
;
private
String
shopName
;
private
Long
roomId
;
private
Long
roomId
;
public
AlertDialog
myAlertDialog
;
public
AlertDialog
myAlertDialog
;
...
@@ -417,14 +420,14 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
...
@@ -417,14 +420,14 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
ivIcon
.
setBackgroundResource
(
R
.
drawable
.
ic_communication_push_message_list
);
ivIcon
.
setBackgroundResource
(
R
.
drawable
.
ic_communication_push_message_list
);
}
}
LinearLayout
ll_menuItem_meeting
=
(
LinearLayout
)
mCommunicationMenuDialog
.
findViewById
(
R
.
id
.
ll_item_meeting
);
//
LinearLayout ll_menuItem_meeting = (LinearLayout)mCommunicationMenuDialog.findViewById(R.id.ll_item_meeting);
ll_menuItem_meeting
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
//
ll_menuItem_meeting.setOnClickListener(new View.OnClickListener() {
@Override
//
@Override
public
void
onClick
(
View
view
)
{
//
public void onClick(View view) {
ActivityHandlingHelper
.
getInstance
().
startMeetingActivity
();
//
ActivityHandlingHelper.getInstance().startMeetingActivity();
mCommunicationMenuDialog
.
dismiss
();
//
mCommunicationMenuDialog.dismiss();
}
//
}
});
//
});
LinearLayout
ll_menuItem_push_message
=
(
LinearLayout
)
mCommunicationMenuDialog
.
findViewById
(
R
.
id
.
ll_item_push_message
);
LinearLayout
ll_menuItem_push_message
=
(
LinearLayout
)
mCommunicationMenuDialog
.
findViewById
(
R
.
id
.
ll_item_push_message
);
ll_menuItem_push_message
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
ll_menuItem_push_message
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
...
...
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