Commit 7b51949c by Kim Jinsung

以下の画面で各セルの区分線が表示されない

①プッシュメッセージ送信(作業選択)画面
②プッシュメッセージ送信(定型文)画面
③プッシュメッセージ一覧画面
parent 3fb77e65
...@@ -127,5 +127,7 @@ ...@@ -127,5 +127,7 @@
<ListView <ListView
android:id="@+id/lv_push_message" android:id="@+id/lv_push_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:divider="@color/line"
android:dividerHeight="1px"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
<ListView <ListView
android:id="@+id/lv_operation_select" android:id="@+id/lv_operation_select"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:divider="@color/line"
android:dividerHeight="1px"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -126,5 +126,7 @@ ...@@ -126,5 +126,7 @@
<ListView <ListView
android:id="@+id/lv_push_message" android:id="@+id/lv_push_message"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:divider="@color/line"
android:dividerHeight="1px"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -234,7 +234,9 @@ ...@@ -234,7 +234,9 @@
android:id="@+id/listView" android:id="@+id/listView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" /> android:visibility="gone"
android:divider="@color/line"
android:dividerHeight="1px"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -1029,8 +1029,12 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co ...@@ -1029,8 +1029,12 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
mPushMessageSendDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() { mPushMessageSendDialog.findViewById(R.id.back_btn).setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
showOperationSelectDialog(); if (mFixPushMessageListView.getVisibility() == View.VISIBLE) { //定型文表示状態
mPushMessageSendDialog.dismiss(); showSendPushMessgeView(true);
} else { //送信画面表示状態
showOperationSelectDialog();
mPushMessageSendDialog.dismiss();
}
} }
}); });
...@@ -1086,8 +1090,6 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co ...@@ -1086,8 +1090,6 @@ public abstract class ABVAuthenticatedActivity extends ABVActivity implements Co
private void showSendPushMessgeView(boolean sendPushMessageViewFlg) { private void showSendPushMessgeView(boolean sendPushMessageViewFlg) {
if (sendPushMessageViewFlg) { if (sendPushMessageViewFlg) {
mFixPushMessageListView.setVisibility(View.GONE); mFixPushMessageListView.setVisibility(View.GONE);
mPushMessageSendDialog.findViewById(R.id.back_btn).setVisibility(View.GONE);
mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.VISIBLE); mPushMessageSendDialog.findViewById(R.id.push_send_layout).setVisibility(View.VISIBLE);
mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE); mPushMessageSendDialog.findViewById(R.id.close_btn).setVisibility(View.VISIBLE);
EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message); EditText messageEditText = (EditText) mPushMessageSendDialog.findViewById(R.id.message);
......
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