Commit 2ed7df67 by NGUYEN HOANG SON

improve footer of related content screen

parent 70ba2b88
Subproject commit 768a84338df268328565c77d94d7da065d82e746 Subproject commit d7882719a1c56bd0a2767dd6f0edef6b2064c8b0
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
android:layout_marginRight="30dp"> android:layout_marginRight="30dp">
<LinearLayout <LinearLayout
android:id="@+id/dashboard_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -125,6 +126,7 @@ ...@@ -125,6 +126,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/operation_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
......
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
android:visibility="visible"> android:visibility="visible">
<LinearLayout <LinearLayout
android:id="@+id/dashboard_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/operation_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
......
...@@ -58,7 +58,9 @@ public class OperationRelatedContentActivity extends ABVUIActivity { ...@@ -58,7 +58,9 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
private OperationRelatedContentSectionAdapter mOperationRelatedContentSectionAdapter; private OperationRelatedContentSectionAdapter mOperationRelatedContentSectionAdapter;
private LinearLayout dashboardLayout;
private ImageButton mDashboardHomeButton; private ImageButton mDashboardHomeButton;
private LinearLayout operationLayout;
private ImageButton mOperationHomeButton; // ホームボタン private ImageButton mOperationHomeButton; // ホームボタン
private ImageButton mOperationRelatedContentButton; // private ImageButton mOperationRelatedContentButton; //
private ImageButton mQuickReportPrintButton; // 簡易帳票印刷ボタン private ImageButton mQuickReportPrintButton; // 簡易帳票印刷ボタン
...@@ -81,8 +83,10 @@ public class OperationRelatedContentActivity extends ABVUIActivity { ...@@ -81,8 +83,10 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
updateCollaborationInfo(); updateCollaborationInfo();
setContentView(R.layout.ac_operation_related_content); setContentView(R.layout.ac_operation_related_content);
dashboardLayout = findViewById(R.id.dashboard_layout);
mDashboardHomeButton = (ImageButton) findViewById(R.id.btn_dashboard_home); mDashboardHomeButton = (ImageButton) findViewById(R.id.btn_dashboard_home);
// ホームボタン(作業一覧へ遷移ボタン) // ホームボタン(作業一覧へ遷移ボタン)
operationLayout = findViewById(R.id.operation_layout);
mOperationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home); mOperationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
// 共通資料ボタン // 共通資料ボタン
mOperationRelatedContentButton = (ImageButton) findViewById(R.id.btn_common_content); mOperationRelatedContentButton = (ImageButton) findViewById(R.id.btn_common_content);
...@@ -330,14 +334,16 @@ public class OperationRelatedContentActivity extends ABVUIActivity { ...@@ -330,14 +334,16 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
* ボタンイベント設定 * ボタンイベント設定
*/ */
private void setOnButtonEvent() { private void setOnButtonEvent() {
mDashboardHomeButton.setOnClickListener(new View.OnClickListener() { mDashboardHomeButton.setClickable(false);
dashboardLayout.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
backToHome("dashboard"); backToHome("dashboard");
} }
}); });
// 作業のホーム画面へ // 作業のホーム画面へ
mOperationHomeButton.setOnClickListener(new View.OnClickListener() { mOperationHomeButton.setClickable(false);
operationLayout.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
backToHome("operationList"); backToHome("operationList");
......
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