From b0ad45679bfefb5583820665442bacd0cd3cbc68 Mon Sep 17 00:00:00 2001
From: Yuji Konishi <yuji.k64613@gmail.com>
Date: Tue, 14 Aug 2012 16:47:02 +0900
Subject: [PATCH] T28518

---
 .../src/com/yuji/ef/EverFolderActivity.java        | 12 +++++++---
 .../src/com/yuji/ef/utility/ScaleUtil.java         | 28 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 source/workspace/EverFolder/src/com/yuji/ef/utility/ScaleUtil.java

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
index 73e4e40..b718e1f 100644
--- a/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/EverFolderActivity.java
@@ -16,6 +16,7 @@ import android.graphics.PixelFormat;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -41,6 +42,7 @@ import com.yuji.ef.dao.RootNode;
 import com.yuji.ef.utility.BaseActivity;
 import com.yuji.ef.utility.EvernoteIntentUtil;
 import com.yuji.ef.utility.FolderUtil;
+import com.yuji.ef.utility.ScaleUtil;
 
 public class EverFolderActivity extends BaseActivity {
 	private enum ScreenStatus {
@@ -63,7 +65,6 @@ public class EverFolderActivity extends BaseActivity {
 
 	private ScreenStatus status;
 	private NodeComparator nodeComparator = new NodeComparator();
-
 	private Node top = null;
 	private int indent = 0;
 	private int viewY;
@@ -168,6 +169,10 @@ public class EverFolderActivity extends BaseActivity {
 					msgCancelOnClick();
 				}
 			});
+			
+			ScaleUtil scaleUtil = ScaleUtil.getInstance();
+			scaleUtil.init(this);
+
 		} catch (Exception e) {
 			// TODO
 			e.printStackTrace();
@@ -430,7 +435,7 @@ public class EverFolderActivity extends BaseActivity {
 
 	private void updateList(Node node, int depth) {
 		int N = 100;
-		int M = 120;
+		int M = 80;
 		int x = N * (depth - indent) + 50;
 
 		if (depth - indent >= 0
@@ -452,7 +457,8 @@ public class EverFolderActivity extends BaseActivity {
 			// }
 			view.setNodeId(node.getId());
 		}
-		viewY += M;
+		ScaleUtil scaleUtil = ScaleUtil.getInstance();
+		viewY += M * scaleUtil.getScaledDensity();
 
 		if (node.getStatus() != Node.Status.OPEN) {
 			return;
diff --git a/source/workspace/EverFolder/src/com/yuji/ef/utility/ScaleUtil.java b/source/workspace/EverFolder/src/com/yuji/ef/utility/ScaleUtil.java
new file mode 100644
index 0000000..e445985
--- /dev/null
+++ b/source/workspace/EverFolder/src/com/yuji/ef/utility/ScaleUtil.java
@@ -0,0 +1,28 @@
+package com.yuji.ef.utility;
+
+import android.app.Activity;
+import android.util.DisplayMetrics;
+
+public class ScaleUtil {
+	private static ScaleUtil instance = null;
+	private DisplayMetrics metrics = new DisplayMetrics();  
+	
+	public static ScaleUtil getInstance() {
+		if (instance == null) {
+			instance = new ScaleUtil();
+		}
+		return instance;
+	}
+
+	public void init(Activity activity){
+		activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+	}
+
+	private ScaleUtil() {
+
+	}
+
+	public float getScaledDensity(){
+		return metrics.scaledDensity;
+	}
+}
-- 
2.11.0