Skip to content

A
abook_check
Commit 42f9b507 by Lee Jaebin
Options

ピンのサイズ調整

parent 4c6164ae
Showing with 8 additions and 14 deletions
ABVJE_Res_Default_Android/res/values-large/dimens.xml
...@@ -15,4 +15,6 @@ ...@@ -15,4 +15,6 @@
<dimen name="text_size_large">22sp</dimen> <dimen name="text_size_large">22sp</dimen>
<dimen name="operation_scale_zoom_margin_dp">25dp</dimen> <dimen name="operation_scale_zoom_margin_dp">25dp</dimen>
<dimen name="operation_pin_icon_width">35dp</dimen>
<dimen name="operation_pin_icon_height">60dp</dimen>
</resources> </resources>
ABVJE_Res_Default_Android/res/values-normal/dimens.xml
...@@ -15,4 +15,6 @@ ...@@ -15,4 +15,6 @@
<dimen name="weather_text_large_size">13sp</dimen> <dimen name="weather_text_large_size">13sp</dimen>
<dimen name="operation_scale_zoom_margin_dp">10dp</dimen> <dimen name="operation_scale_zoom_margin_dp">10dp</dimen>
<dimen name="operation_pin_icon_width">18dp</dimen>
<dimen name="operation_pin_icon_height">23dp</dimen>
</resources> </resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/OperationTaskLayout.java
...@@ -50,13 +50,6 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -50,13 +50,6 @@ public class OperationTaskLayout extends RelativeLayout {
private static final int ICON_WIDTH = 32; private static final int ICON_WIDTH = 32;
private static final int ICON_HEIGHT = 32; private static final int ICON_HEIGHT = 32;
// 仮）ピンのイメージアイコンのサイズ
private static final int PIN_ICON_WIDTH = 20;
private static final int PIN_ICON_HEIGHT = 40;
// 仮）終了のピンのイメージアイコンのサイズ
private static final int PIN_FINISHED_ICON_WIDTH = 20;
private static final int PIN_FINISHED_ICON_HEIGHT = 40;
private static final int CODE_WIDTH = 46; private static final int CODE_WIDTH = 46;
private static final int CODE_HEIGHT = 26; private static final int CODE_HEIGHT = 26;
...@@ -194,13 +187,10 @@ public class OperationTaskLayout extends RelativeLayout { ...@@ -194,13 +187,10 @@ public class OperationTaskLayout extends RelativeLayout {
// ピンで表示 // ピンで表示
final ActionOperationTaskPin taskPin = new ActionOperationTaskPin(mContext, dto); final ActionOperationTaskPin taskPin = new ActionOperationTaskPin(mContext, dto);
taskPin.taskKey = dto.taskKey; taskPin.taskKey = dto.taskKey;
if (dto.isFinished) {
width = (int) (PIN_FINISHED_ICON_WIDTH * density); // ピンのイメージアイコンのサイズセット
height = (int) (PIN_FINISHED_ICON_HEIGHT * density); width = (int) mContext.getResources().getDimensionPixelSize(R.dimen.operation_pin_icon_width);
} else { height = (int) mContext.getResources().getDimensionPixelSize(R.dimen.operation_pin_icon_height);
width = (int) (PIN_ICON_WIDTH * density);
height = (int) (PIN_ICON_HEIGHT * density);
}
params = new RelativeLayout.LayoutParams(width, height); params = new RelativeLayout.LayoutParams(width, height);
taskPin.setVisibility(View.INVISIBLE); taskPin.setVisibility(View.INVISIBLE);
......
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