diff --git a/.gitignore b/.gitignore index 4851e9d46e1b60ea5253558f17002cc9602957c3..20ff14c5a315ebbe4e347d8f4d4e55559eec1779 100755 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,8 @@ build/ .idea/modules.xml .idea/assetWizardSettings.xml .idea/markdown-navigator* +.idea/compiler.xml +.idea/jarRepositories.xml projectFilesBackup/ gradle.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index c82ee7068f93651f72acfc3a1eefcb7a6eceb22b..0b7502afca8ec6499bf01eeb2eb5094205045fd0 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,17 +1,26 @@ - - + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index f5c6d9eb6a991d73b50e99d55a1a22a208ef247d..58918f50335428f2efb3af4d621f9f405ed659d4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/java/foundation/e/blisslauncher/core/DeviceProfile.java b/app/src/main/java/foundation/e/blisslauncher/core/DeviceProfile.java index 306a9e480a23494e04b52f50bfc98826cd70bbfd..efa4d261fc80d3515e353ef039cc9fc10f06c363 100755 --- a/app/src/main/java/foundation/e/blisslauncher/core/DeviceProfile.java +++ b/app/src/main/java/foundation/e/blisslauncher/core/DeviceProfile.java @@ -10,7 +10,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.graphics.RectF; import android.util.DisplayMetrics; -import android.util.Log; import android.view.Display; import android.view.WindowManager; @@ -158,8 +157,8 @@ public class DeviceProfile { display.getRealSize(realSize); widthPx = realSize.x; - double x = widthPx / dm.xdpi; - ratio = dm.densityDpi / dm.xdpi; + double x = widthPx / dm.densityDpi; + ratio = (float) dm.densityDpi / dm.xdpi; widthCm = (float) (x * 2.540001f); heightPx = realSize.y; @@ -237,13 +236,7 @@ public class DeviceProfile { float a = 1.578f; float b = 1.23f; - Log.i(TAG, "updateIconSize: " + (int) a + " " + (int) b); - - iconSizePx = (int) (widthPx / widthCm); - if (ratio >= 1) { - iconSizePx = iconSizePx * (int) ratio; - } - + iconSizePx = (int) (0.75 * widthPx / widthCm); iconTextSizePx = (int) (Utilities.pxFromSp(12, dm) * scale); iconDrawablePaddingPx = (availableWidthPx - iconSizePx * 4) / 5;