[plugin, statistics] simplify ReaderProgress for better translations (#9113)

reviewable/pr9131/r1
zwim 2 years ago committed by GitHub
parent e336983fd2
commit 081bc6784f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -13,6 +13,7 @@ local LineWidget = require("ui/widget/linewidget")
local ProgressWidget = require("ui/widget/progresswidget") local ProgressWidget = require("ui/widget/progresswidget")
local Size = require("ui/size") local Size = require("ui/size")
local TextWidget = require("ui/widget/textwidget") local TextWidget = require("ui/widget/textwidget")
local TextBoxWidget = require("ui/widget/textboxwidget")
local TitleBar = require("ui/widget/titlebar") local TitleBar = require("ui/widget/titlebar")
local UIManager = require("ui/uimanager") local UIManager = require("ui/uimanager")
local VerticalGroup = require("ui/widget/verticalgroup") local VerticalGroup = require("ui/widget/verticalgroup")
@ -391,63 +392,38 @@ function ReaderProgress:genSummaryWeek(width)
align = "center", align = "center",
CenterContainer:new{ CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height }, dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{ TextBoxWidget:new{
padding = Size.padding.default, alignment = "center",
text = _("Total"), text = _("Total\npages"),
face = self.small_font_face, face = self.small_font_face,
width = tile_width * 0.95,
}, },
}, },
CenterContainer:new{ CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height }, dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{ TextBoxWidget:new{
text = _("Total"), alignment = "center",
text = _("Total\ntime"),
face = self.small_font_face, face = self.small_font_face,
width = tile_width * 0.95,
}, },
}, },
CenterContainer:new{ CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height }, dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{ TextBoxWidget:new{
text = _("Average"), alignment = "center",
text = _("Average\npages"),
face = self.small_font_face, face = self.small_font_face,
width = tile_width * 0.95,
} }
}, },
CenterContainer:new{ CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height }, dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{ TextBoxWidget:new{
text = _("Average"), alignment = "center",
face = self.small_font_face, text = _("Average\ntime"),
}
}
}
local titles_group = HorizontalGroup:new{
align = "center",
CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{
text = _("Pages"),
face = self.small_font_face,
},
},
CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{
text = _("Time"),
face = self.small_font_face,
},
},
CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{
text = _("Pages"),
face = self.small_font_face,
}
},
CenterContainer:new{
dimen = Geom:new{ w = tile_width, h = tile_height },
TextWidget:new{
text = _("Time"),
face = self.small_font_face, face = self.small_font_face,
width = tile_width * 0.95,
} }
} }
} }
@ -493,7 +469,6 @@ function ReaderProgress:genSummaryWeek(width)
} }
} }
table.insert(statistics_group, total_group) table.insert(statistics_group, total_group)
table.insert(statistics_group, titles_group)
table.insert(statistics_group, span_group) table.insert(statistics_group, span_group)
table.insert(statistics_group, data_group) table.insert(statistics_group, data_group)
table.insert(statistics_container, statistics_group) table.insert(statistics_container, statistics_group)

Loading…
Cancel
Save