plusonelabs#301 Fix Time column width

andstatus · Sep 3, 2019 · f871437 · f871437
1 parent 247c1aa
commit f871437
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/src/main/java/org/andstatus/todoagenda/util/RemoteViewsUtil.java b/app/src/main/java/org/andstatus/todoagenda/util/RemoteViewsUtil.java
@@ -32,10 +32,10 @@ private RemoteViewsUtil() {
     public static void setPadding(InstanceSettings settings, RemoteViews rv, int viewId,
           @DimenRes int leftDimenId, @DimenRes int topDimenId, @DimenRes int rightDimenId, @DimenRes int bottomDimenId) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            int leftPadding = Math.round(getScaledValueInPixel(settings, leftDimenId));
-            int topPadding = Math.round(getScaledValueInPixel(settings, topDimenId));
-            int rightPadding = Math.round(getScaledValueInPixel(settings, rightDimenId));
-            int bottomPadding = Math.round(getScaledValueInPixel(settings, bottomDimenId));
+            int leftPadding = getScaledValueInPixels(settings, leftDimenId);
+            int topPadding = getScaledValueInPixels(settings, topDimenId);
+            int rightPadding = getScaledValueInPixels(settings, rightDimenId);
+            int bottomPadding = getScaledValueInPixels(settings, bottomDimenId);
             rv.setViewPadding(viewId, leftPadding, topPadding, rightPadding, bottomPadding);
         }
     }
@@ -49,11 +49,11 @@ public static void setColorFilter(RemoteViews rv, int viewId, int color) {
     }
 
     public static void setViewWidth(InstanceSettings settings, RemoteViews rv, int viewId, int dimenId) {
-        rv.setInt(viewId, METHOD_SET_WIDTH, getScaledValue(settings, dimenId).intValue());
+        rv.setInt(viewId, METHOD_SET_WIDTH, getScaledValueInPixels(settings, dimenId));
     }
 
     public static void setTextSize(InstanceSettings settings, RemoteViews rv, int viewId, int dimenId) {
-        rv.setFloat(viewId, METHOD_SET_TEXT_SIZE, getScaledValue(settings, dimenId));
+        rv.setFloat(viewId, METHOD_SET_TEXT_SIZE, getScaledValueInScaledPixels(settings, dimenId));
     }
 
     public static void setTextColorFromAttr(Context context, RemoteViews rv, int viewId, int colorAttrId) {
@@ -69,13 +69,13 @@ public static void setBackgroundColor(RemoteViews rv, int viewId, int color) {
         rv.setInt(viewId, METHOD_SET_BACKGROUND_COLOR, color);
     }
 
-    private static float getScaledValueInPixel(InstanceSettings settings, int dimenId) {
+    private static int getScaledValueInPixels(InstanceSettings settings, int dimenId) {
         float resValue = getDimension(settings.getContext(), dimenId);
         float prefTextScale = parseFloat(settings.getTextSizeScale());
-        return resValue * prefTextScale;
+        return  Math.round(resValue * prefTextScale);
     }
 
-    private static Float getScaledValue(InstanceSettings settings, int dimenId) {
+    private static float getScaledValueInScaledPixels(InstanceSettings settings, int dimenId) {
         float resValue = getDimension(settings.getContext(), dimenId);
         float density = settings.getContext().getResources().getDisplayMetrics().density;
         float prefTextScale = parseFloat(settings.getTextSizeScale());

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -7,9 +7,9 @@
     <dimen name="day_header_title">14dp</dimen>
     <dimen name="event_entry_title">18dp</dimen>
     <dimen name="event_entry_details">14dp</dimen>
-    <dimen name="days_to_event_right_width">80dp</dimen>
-    <dimen name="days_to_event_width">88dp</dimen>
-    <dimen name="event_time_width">80dp</dimen>
+    <dimen name="days_to_event_right_width">50dp</dimen>
+    <dimen name="days_to_event_width">53dp</dimen>
+    <dimen name="event_time_width">46dp</dimen>
     <dimen name="entry_bottom_padding">2dp</dimen>
     <dimen name="day_header_padding_left">12dp</dimen>
     <dimen name="day_header_padding_top">2dp</dimen>