feat(widget):1965: MR review, improve naming. (fe20f3a9) · Commits · e / os / Advanced Privacy

app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt

+8 −5

Original line number	Diff line number	Diff line
		@@ -81,9 +81,7 @@ fun render(context: Context, state: State, appWidgetManager: AppWidgetManager, w

		val leaksLabel = context.getString(R.string.widget_data_blocked_trackers_secondary)
		val countStr = numberFormatter.format(state.blockedCallsCount).toString()
		if (countStr.length > DATA_BLOCKED_TWO_LINES_DIGIT_THRESHOLD &&
		(countStr.length + leaksLabel.length) > DATA_BLOCKED_TWO_LINES_GLOBAL_THRESHOLD
		) {
		if (shouldSplitLeaksCountInTwoLines(countStr, leaksLabel)) {
		setTextViewText(R.id.data_blocked_trackers_number, countStr)
		setTextViewText(R.id.data_blocked_trackers_secondary, leaksLabel)
		setViewVisibility(R.id.data_blocked_trackers_number, VISIBLE)
		@@ -163,8 +161,8 @@ private const val REQUEST_CODE_TOGGLE_IPSCRAMBLING = 6

		private const val NARROW_MAXWIDTH_DP_BREAKPOINT = 240

		private const val DATA_BLOCKED_TWO_LINES_DIGIT_THRESHOLD = 3
		private const val DATA_BLOCKED_TWO_LINES_GLOBAL_THRESHOLD = 14
		private const val DATA_BLOCKED_TWO_LINES_THRESHOLD_DIGITS = 3
		private const val DATA_BLOCKED_TWO_LINES_THRESHOLD_LABEL = 14

		private fun buildLayout(context: Context, appWidgetManager: AppWidgetManager, widgetId: Int): RemoteViews {
		val width = appWidgetManager.getAppWidgetOptions(widgetId)
		@@ -226,6 +224,11 @@ private fun applyDarkText(context: Context, isDarkText: Boolean, views: RemoteVi
		}
		}

		private fun shouldSplitLeaksCountInTwoLines(countStr: String, leaksLabel: String): Boolean {
		return countStr.length > DATA_BLOCKED_TWO_LINES_THRESHOLD_DIGITS &&
		(countStr.length + leaksLabel.length) > DATA_BLOCKED_TWO_LINES_THRESHOLD_LABEL
		}

		private fun buildDataSecondarySpan(context: Context, isDarkText: Boolean, countStr: String, @StringRes secondaryRes: Int): CharSequence {
		val primaryColor = context.getColor(
		if (isDarkText) {