Skip to content

A
abook_check
Commit 75aefbdd by NGUYEN HOANG SON
Options

improve footer of related content screen

parent 0c48fb25
Showing with 89 additions and 4 deletions
ABVJE_Res_Default_Android/res/drawable/btn_dashboard_home.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_enabled="false"
android:drawable="@drawable/dashboard_icon_off"/>
<item
android:drawable="@drawable/dashboard_icon_off"/>
</selector>
ABVJE_Res_Default_Android/res/drawable/btn_operation_list_home.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:state_enabled="false"
android:drawable="@drawable/operation_icon_off"/>
<item
android:drawable="@drawable/operation_icon_off"/>
</selector>
ABVJE_Res_Default_Android/res/values-ja/strings.xml
......@@ -1505,6 +1505,8 @@
<string name="msg_fail_collaboration_join_error">協業に参加することができませんでした。</string>
<string name="msg_fail_collaboration_pip_change_host">PIP状態ではホスト変更できません。PIPを解除してください。</string>
<string name="btn_home">ホーム</string>
<string name="btn_dashboard">ダッシュボード</string>
<string name="btn_operations_list">作業一覧</string>
<string name="btn_content">関連資料</string>
<string name="btn_communication">コミュニケーション</string>
<string name="btn_setting">設定</string>
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
......@@ -1510,6 +1510,8 @@
<string name="msg_fail_collaboration_join_error">협업에 참여하실수 없습니다.</string>
<string name="msg_fail_collaboration_pip_change_host">PIP 상태에서는 호스트 변경이 불가능합니다. PIP 모드를 해제해 주세요.</string>
<string name="btn_home">홈</string>
<string name="btn_dashboard">대시보드</string>
<string name="btn_operations_list">작업일람</string>
<string name="btn_content">관련자료</string>
<string name="btn_communication">커뮤니케이션</string>
<string name="btn_setting">설정</string>
......
ABVJE_Res_Default_Android/res/values/strings.xml
......@@ -1506,6 +1506,8 @@
<string name="msg_fail_collaboration_join_error">Could not connect to the collaboration.</string>
<string name="msg_fail_collaboration_pip_change_host">Host change is not possible in PIP state. Please turn off picture-in-picture mode.</string>
<string name="btn_home">Home</string>
<string name="btn_dashboard">Dashboard</string>
<string name="btn_operations_list">Operations List</string>
<string name="btn_content">Related Content</string>
<string name="btn_communication">Communication</string>
<string name="btn_setting">Setting</string>
......
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
......@@ -108,18 +108,42 @@
android:gravity="center">
<ImageButton
android:id="@+id/btn_dashboard_home"
style="@style/ToolBarIcon"
android:layout_width="25dp"
android:layout_height="25dp"
android:scaleType="fitCenter"
android:src="@drawable/btn_dashboard_home" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_dashboard"
android:gravity="center"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_home"
style="@style/ToolBarIcon"
android:layout_width="25dp"
android:layout_height="25dp"
android:scaleType="fitCenter"
android:src="@drawable/btn_operation_home" />
android:src="@drawable/btn_operation_list_home" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_home"
android:text="@string/btn_operations_list"
android:gravity="center"/>
</LinearLayout>
......@@ -151,6 +175,7 @@
<LinearLayout
android:id="@+id/communication_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
......
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
......@@ -94,17 +94,42 @@
android:gravity="center">
<ImageButton
android:id="@+id/btn_dashboard_home"
android:layout_width="25dp"
android:layout_height="25dp"
android:background="@drawable/btn_dashboard_home"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_dashboard"
android:gravity="center"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center">
<ImageButton
android:id="@+id/btn_operation_home"
android:layout_width="25dp"
android:layout_height="25dp"
android:background="@drawable/btn_operation_home"
android:background="@drawable/btn_operation_list_home"
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="11sp"
android:text="@string/btn_home"
android:text="@string/btn_operations_list"
android:gravity="center"/>
......@@ -136,6 +161,7 @@
<LinearLayout
android:id="@+id/communication_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
......@@ -58,6 +58,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
private OperationRelatedContentSectionAdapter mOperationRelatedContentSectionAdapter;
private ImageButton mDashboardHomeButton;
private ImageButton mOperationHomeButton; // ホームボタン
private ImageButton mOperationRelatedContentButton; //
private ImageButton mQuickReportPrintButton; // 簡易帳票印刷ボタン
......@@ -80,6 +81,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
updateCollaborationInfo();
setContentView(R.layout.ac_operation_related_content);
mDashboardHomeButton = (ImageButton) findViewById(R.id.btn_dashboard_home);
// ホームボタン（作業一覧へ遷移ボタン）
mOperationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
// 共通資料ボタン
......@@ -107,6 +109,7 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
// 下辺のツールバー設定
private void settingBottomToolbar() {
mDashboardHomeButton.setEnabled(true);
// ホームボタン活性化
mOperationHomeButton.setEnabled(true);
// 共通資料ボタンの非活性化
......@@ -120,6 +123,9 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
showCommunicationMenuDialog();
}
});
if (findViewById(R.id.communication_layout) != null) {
findViewById(R.id.communication_layout).setVisibility(View.GONE);
}
if (findViewById(R.id.print_layout) != null) {
findViewById(R.id.print_layout).setVisibility(View.GONE);
}
......@@ -324,6 +330,12 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
* ボタンイベント設定
*/
private void setOnButtonEvent() {
mDashboardHomeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
backToHome();
}
});
// 作業のホーム画面へ
mOperationHomeButton.setOnClickListener(new View.OnClickListener() {
@Override
......
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 to comment