diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt index d3736c6869..8f64cb226b 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt @@ -1,7 +1,6 @@ package info.nightscout.androidaps.activities import android.annotation.SuppressLint -import android.app.DatePickerDialog import android.content.Context import android.os.Bundle import android.util.DisplayMetrics @@ -9,6 +8,7 @@ import android.view.ViewGroup import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView +import com.google.android.material.datepicker.MaterialDatePicker import com.jjoe64.graphview.GraphView import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R @@ -148,33 +148,18 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() { true } - // create an OnDateSetListener - val dateSetListener = DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth -> - Calendar.getInstance().also { calendar -> - calendar.timeInMillis = overviewData.fromTime - calendar[Calendar.YEAR] = year - calendar[Calendar.MONTH] = monthOfYear - calendar[Calendar.DAY_OF_MONTH] = dayOfMonth - calendar[Calendar.MILLISECOND] = 0 - calendar[Calendar.SECOND] = 0 - calendar[Calendar.MINUTE] = 0 - calendar[Calendar.HOUR_OF_DAY] = 0 - setTime(calendar.timeInMillis) - binding.date.text = dateUtil.dateAndTimeString(overviewData.fromTime) - } - loadAll("onClickDate") - } - binding.date.setOnClickListener { - val cal = Calendar.getInstance() - cal.timeInMillis = overviewData.fromTime - DatePickerDialog( - this, - dateSetListener, - cal.get(Calendar.YEAR), - cal.get(Calendar.MONTH), - cal.get(Calendar.DAY_OF_MONTH) - ).show() + MaterialDatePicker.Builder.datePicker() + .setSelection(dateUtil.timeStampToUtcDateMilis(overviewData.fromTime)) + .build() + .apply { + addOnPositiveButtonClickListener { selection -> + setTime(dateUtil.mergeUtcDateToTimestamp(overviewData.fromTime, selection)) + binding.date.text = dateUtil.dateAndTimeString(overviewData.fromTime) + loadAll("onClickDate") + } + } + .show(supportFragmentManager, "history_date_picker") } val dm = DisplayMetrics() @@ -184,9 +169,8 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() { else windowManager.defaultDisplay.getMetrics(dm) - axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80 - binding.bgGraph.gridLabelRenderer?.gridColor = rh.gac(this, R.attr.graphgrid) + binding.bgGraph.gridLabelRenderer?.gridColor = rh.gac(this, R.attr.graphGrid) binding.bgGraph.gridLabelRenderer?.reloadStyles() binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth @@ -259,12 +243,12 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() { val graph = GraphView(this) graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(100)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = rh.gac(R.attr.graphgrid) + graph.gridLabelRenderer?.gridColor = rh.gac(R.attr.graphGrid) graph.gridLabelRenderer?.reloadStyles() graph.gridLabelRenderer?.isHorizontalLabelsVisible = false graph.gridLabelRenderer?.labelVerticalWidth = axisWidth graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = rh.gac(this, R.attr.viewPortbackgroundColor) + graph.viewport.backgroundColor = rh.gac(this, R.attr.viewPortBackgroundColor) relativeLayout.addView(graph) val label = TextView(this) @@ -421,4 +405,4 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() { binding.progressBar.progress = percent binding.progressBar.visibility = (percent != 100).toVisibilityKeepSpace() } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt index 36a548d0f2..81563f0944 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt @@ -316,7 +316,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() { } private fun setBackgroundColorOnSelected(tab: Int) { - binding.menu1.setBackgroundColor(rh.gac(this, if (tab == 1) R.attr.defaultbackground else R.attr.helperProfileColor)) - binding.menu2.setBackgroundColor(rh.gac(this, if (tab == 0) R.attr.defaultbackground else R.attr.examinedProfileColor)) + binding.menu1.setBackgroundColor(rh.gac(this, if (tab == 1) R.attr.defaultBackground else R.attr.helperProfileColor)) + binding.menu2.setBackgroundColor(rh.gac(this, if (tab == 0) R.attr.defaultBackground else R.attr.examinedProfileColor)) } } diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt index e70e7a9cbe..a4fa56a699 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -269,8 +269,6 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() { } holder.binding.calculation.tag = ml - val nextTimestamp = if (mealLinks.size != position + 1) timestamp(mealLinks[position + 1]) else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(timestamp(ml), nextTimestamp).toVisibility() } override fun getItemCount() = mealLinks.size diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt index 37713a7e30..820b5d3b93 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt @@ -173,8 +173,6 @@ class TreatmentsCareportalFragment : DaggerFragment() { actionHelper.updateSelection(position, therapyEvent, holder.binding.cbRemove.isChecked) } holder.binding.cbRemove.isChecked = actionHelper.isSelected(position) - val nextTimestamp = if (therapyList.size != position + 1) therapyList[position + 1].timestamp else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(therapyEvent.timestamp, nextTimestamp).toVisibility() } override fun getItemCount() = therapyList.size diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt index b7ffd407c8..e21bd897ae 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt @@ -163,8 +163,6 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment() { } holder.binding.cbRemove.isChecked = actionHelper.isSelected(position) } - val nextTimestamp = if (extendedBolusList.size != position + 1) extendedBolusList[position + 1].timestamp else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(extendedBolus.timestamp, nextTimestamp).toVisibility() } override fun getItemCount() = extendedBolusList.size diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt index 92f9d5f38b..49e8c4ca52 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt @@ -214,8 +214,6 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() { } holder.binding.clone.visibility = (profileSwitch is ProfileSealed.PS).toVisibility() holder.binding.spacer.visibility = (profileSwitch is ProfileSealed.PS).toVisibility() - val nextTimestamp = if (profileSwitchList.size != position + 1) profileSwitchList[position + 1].timestamp else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(profileSwitch.timestamp, nextTimestamp).toVisibility() } override fun getItemCount() = profileSwitchList.size diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt index 028ae4f99a..137d6cf94c 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt @@ -192,8 +192,6 @@ class TreatmentsTempTargetFragment : DaggerFragment() { else -> holder.binding.reasonColon.currentTextColor } ) - val nextTimestamp = if (tempTargetList.size != position + 1) tempTargetList[position + 1].timestamp else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(tempTarget.timestamp, nextTimestamp).toVisibility() } override fun getItemCount() = tempTargetList.size diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt index da76998092..1f585ecd0a 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt @@ -204,8 +204,6 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment() { } holder.binding.cbRemove.isChecked = actionHelper.isSelected(position) } - val nextTimestamp = if (tempBasalList.size != position + 1) tempBasalList[position + 1].timestamp else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(tempBasal.timestamp, nextTimestamp).toVisibility() } override fun getItemCount() = tempBasalList.size diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt index 0303f5bf7c..bd442ce723 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt @@ -134,8 +134,6 @@ class TreatmentsUserEntryFragment : DaggerFragment() { holder.binding.iconSource.setImageResource(userEntryPresentationHelper.iconId(current.source)) holder.binding.values.text = userEntryPresentationHelper.listToPresentationString(current.values) holder.binding.values.visibility = (holder.binding.values.text != "").toVisibility() - val nextTimestamp = if (entries.size != position + 1) entries[position + 1].timestamp else 0L - holder.binding.delimiter.visibility = dateUtil.isSameDayGroup(current.timestamp, nextTimestamp).toVisibility() } inner class UserEntryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt index 63e03478dc..89b1da7047 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt @@ -130,7 +130,6 @@ class ProfileFunctionImplementation @Inject constructor( } } - return null } @@ -205,4 +204,4 @@ class ProfileFunctionImplementation @Inject constructor( } else returnValue = false return returnValue } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt index 5b412076b5..84cd7eebba 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt @@ -1,6 +1,6 @@ package info.nightscout.androidaps.plugins.constraints.objectives -import android.graphics.Color +import android.annotation.SuppressLint import android.os.Bundle import android.os.Handler import android.os.HandlerThread @@ -153,6 +153,7 @@ class ObjectivesFragment : DaggerFragment() { return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.objectives_item, parent, false)) } + @SuppressLint("SetTextI18n") override fun onBindViewHolder(holder: ViewHolder, position: Int) { val objective = objectivesPlugin.objectives[position] holder.binding.title.text = rh.gs(R.string.nth_objective, position + 1) @@ -167,7 +168,7 @@ class ObjectivesFragment : DaggerFragment() { } else holder.binding.gate.visibility = View.GONE if (!objective.isStarted) { - holder.binding.gate.setTextColor(-0x1) + holder.binding.gate.setTextColor(rh.gac(context, R.attr.defaultTextColor)) holder.binding.verify.visibility = View.GONE holder.binding.progress.visibility = View.GONE holder.binding.accomplished.visibility = View.GONE @@ -178,7 +179,7 @@ class ObjectivesFragment : DaggerFragment() { else holder.binding.start.visibility = View.GONE } else if (objective.isAccomplished) { - holder.binding.gate.setTextColor(-0xb350b0) + holder.binding.gate.setTextColor(rh.gac(context, R.attr.isAccomplishedColor)) holder.binding.verify.visibility = View.GONE holder.binding.progress.visibility = View.GONE holder.binding.start.visibility = View.GONE @@ -186,7 +187,7 @@ class ObjectivesFragment : DaggerFragment() { holder.binding.unfinish.visibility = View.VISIBLE holder.binding.unstart.visibility = View.GONE } else if (objective.isStarted) { - holder.binding.gate.setTextColor(-0x1) + holder.binding.gate.setTextColor(rh.gac(context,R.attr.defaultTextColor)) holder.binding.verify.visibility = View.VISIBLE holder.binding.verify.isEnabled = objective.isCompleted || binding.fake.isChecked holder.binding.start.visibility = View.GONE @@ -200,7 +201,7 @@ class ObjectivesFragment : DaggerFragment() { // name val name = TextView(holder.binding.progress.context) name.text = "${rh.gs(task.task)}:" - name.setTextColor(-0x1) + name.setTextColor(rh.gac(context,R.attr.defaultTextColor) ) holder.binding.progress.addView(name, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) // hint task.hints.forEach { h -> @@ -209,9 +210,9 @@ class ObjectivesFragment : DaggerFragment() { } // state val state = TextView(holder.binding.progress.context) - state.setTextColor(-0x1) + state.setTextColor(rh.gac(context,R.attr.defaultTextColor)) val basicHTML = "%2\$s" - val formattedHTML = String.format(basicHTML, if (task.isCompleted()) "#4CAF50" else "#FF9800", task.progress) + val formattedHTML = String.format(basicHTML, if (task.isCompleted()) rh.gac(context, R.attr.isCompletedColor) else rh.gac(context, R.attr.isNotCompletedColor), task.progress) state.text = HtmlHelper.fromHtml(formattedHTML) state.gravity = Gravity.END holder.binding.progress.addView(state, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) @@ -228,7 +229,7 @@ class ObjectivesFragment : DaggerFragment() { } // horizontal line val separator = View(holder.binding.progress.context) - separator.setBackgroundColor(Color.DKGRAY) + separator.setBackgroundColor(rh.gac(context, R.attr.separatorColor)) holder.binding.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2) } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt index 0da7daa37c..9faa974d1f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective.kt @@ -176,7 +176,7 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe textView.setText(hint) textView.autoLinkMask = Linkify.WEB_URLS textView.linksClickable = true - textView.setLinkTextColor(Color.YELLOW) + textView.setLinkTextColor(rh.gac(context, R.attr.colorSecondary)) Linkify.addLinks(textView, Linkify.WEB_URLS) return textView } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt index a45ae8dd50..8347a45715 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/versionChecker/VersionCheckerPlugin.kt @@ -80,7 +80,6 @@ class VersionCheckerPlugin @Inject constructor( return } - if (isOldVersion(gracePeriod.warning.daysToMillis()) && shouldWarnAgain()) { // store last notification time sp.putLong(R.string.key_last_versionchecker_plugin_warning, now) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt index b7435e3916..c0a7e3a9b5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt @@ -157,7 +157,7 @@ class NSDeviceStatus @Inject constructor( //String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"}; val string = StringBuilder() - .append("") + .append("") .append(rh.gs(R.string.pump)) .append(": ") @@ -248,7 +248,7 @@ class NSDeviceStatus @Inject constructor( val openApsStatus: Spanned get() { val string = StringBuilder() - .append("") + .append("") .append(rh.gs(R.string.openaps_short)) .append(": ") @@ -321,7 +321,7 @@ class NSDeviceStatus @Inject constructor( val uploaderStatusSpanned: Spanned get() { val string = StringBuilder() - string.append("") + string.append("") string.append(rh.gs(R.string.uploader_short)) string.append(": ") val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator() diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 7244b943f5..1d35a47c86 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -170,7 +170,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.notifications.setHasFixedSize(false) binding.notifications.layoutManager = LinearLayoutManager(view.context) axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80 - binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphgrid) + binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphGrid) binding.graphsLayout.bgGraph.gridLabelRenderer?.reloadStyles() binding.graphsLayout.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth binding.graphsLayout.bgGraph.layoutParams?.height = rh.dpToPx(skinProvider.activeSkin().mainGraphHeight) @@ -179,7 +179,6 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList carbAnimation?.setEnterFadeDuration(1200) carbAnimation?.setExitFadeDuration(1200) - binding.graphsLayout.bgGraph.setOnLongClickListener { overviewData.rangeToDisplay += 6 overviewData.rangeToDisplay = if (overviewData.rangeToDisplay > 24) 6 else overviewData.rangeToDisplay @@ -549,16 +548,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null) for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) { drawable?.mutate() - drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmdexColor), PorterDuff.Mode.SRC_IN) + drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmDexColor), PorterDuff.Mode.SRC_IN) } - binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmdexColor)) + binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmDexColor)) } else if (xDripIsBgSource) { binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_xdrip), null, null) for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) { drawable?.mutate() - drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmxdripColor), PorterDuff.Mode.SRC_IN) + drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN) } - binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmxdripColor)) + binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmXdripColor)) } binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility() @@ -714,12 +713,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val graph = GraphView(context) graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphgrid) + graph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphGrid) graph.gridLabelRenderer?.reloadStyles() graph.gridLabelRenderer?.isHorizontalLabelsVisible = false graph.gridLabelRenderer?.labelVerticalWidth = axisWidth graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = rh.gac(context, R.attr.viewPortbackgroundColor) + graph.viewport.backgroundColor = rh.gac(context, R.attr.viewPortBackgroundColor) relativeLayout.addView(graph) val label = TextView(context) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt index 78990dce99..b055d92501 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt @@ -8,7 +8,6 @@ import android.view.Menu import android.view.View import android.widget.ImageButton import androidx.annotation.AttrRes -import androidx.annotation.ColorRes import androidx.annotation.StringRes import androidx.appcompat.widget.PopupMenu import com.google.gson.Gson @@ -45,7 +44,7 @@ class OverviewMenus @Inject constructor( BGI(R.string.overview_show_bgi, R.attr.bgiColor, R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.bgi_shortname), SEN(R.string.overview_show_sensitivity, R.attr.ratioColor, R.attr.menuTextColorInverse, primary = false, secondary = true,shortnameId = R.string.sensitivity_shortname), ACT(R.string.overview_show_activity, R.attr.activityColor, R.attr.menuTextColor, primary = true, secondary = false,shortnameId = R.string.activity_shortname), - DEVSLOPE(R.string.overview_show_deviationslope, R.attr.devslopeposColor, R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.devslope_shortname) + DEVSLOPE(R.string.overview_show_deviationslope, R.attr.devSlopePosColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.devslope_shortname) } companion object { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt index 128f6c6613..5c1ffc8c27 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt @@ -76,6 +76,10 @@ class QuickWizardListActivity : DaggerAppCompatActivityWithResult(), OnStartDrag else -> R.drawable.ic_smartphone } ) + holder.binding.device.contentDescription = when (quickWizard[position].device()) { + QuickWizardEntry.DEVICE_WATCH -> rh.gs(R.string.a11y_only_on_watch) + else -> rh.gs(R.string.a11y_only_on_phone) + } } holder.binding.root.setOnClickListener { if (actionHelper.isNoAction) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt index 41f210e7eb..9341f74dc7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/dialogs/EditQuickWizardDialog.kt @@ -1,6 +1,5 @@ package info.nightscout.androidaps.plugins.general.overview.dialogs -import android.app.TimePickerDialog import android.os.Bundle import android.text.format.DateFormat import android.view.LayoutInflater @@ -8,6 +7,8 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager +import com.google.android.material.timepicker.MaterialTimePicker +import com.google.android.material.timepicker.TimeFormat import dagger.android.support.DaggerDialogFragment import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.OverviewEditquickwizardDialogBinding @@ -24,6 +25,7 @@ import info.nightscout.androidaps.utils.wizard.QuickWizard import info.nightscout.androidaps.utils.wizard.QuickWizardEntry import info.nightscout.shared.sharedPreferences.SP import org.json.JSONException +import java.util.* import javax.inject.Inject class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener { @@ -40,8 +42,7 @@ class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener { private var _binding: OverviewEditquickwizardDialogBinding? = null - // This property is only valid between onCreateView and - // onDestroyView. + // This property is only valid between onCreateView and onDestroyView. private val binding get() = _binding!! override fun onCreateView( @@ -96,41 +97,35 @@ class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener { } binding.okcancel.cancel.setOnClickListener { dismiss() } - // create an OnTimeSetListener - val fromTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute -> - fromSeconds = (T.hours(hour.toLong()).secs() + T.mins(minute.toLong()).secs()).toInt() - binding.from.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(fromSeconds)) + binding.from.setOnClickListener { + val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H + val timePicker = MaterialTimePicker.Builder() + .setTimeFormat(clockFormat) + .setHour(T.secs(fromSeconds.toLong()).hours().toInt()) + .setMinute(T.secs((fromSeconds % 3600).toLong()).mins().toInt()) + .build() + timePicker.addOnPositiveButtonClickListener { + fromSeconds = (T.hours(timePicker.hour.toLong()).secs() + T.mins(timePicker.minute.toLong()).secs()).toInt() + binding.from.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(fromSeconds)) + } + timePicker.show(parentFragmentManager, "event_time_time_picker") } - binding.from.setOnClickListener { - context?.let { - TimePickerDialog( - it, - fromTimeSetListener, - T.secs(fromSeconds.toLong()).hours().toInt(), - T.secs((fromSeconds % 3600).toLong()).mins().toInt(), - DateFormat.is24HourFormat(context) - ).show() - } - } fromSeconds = entry.validFrom() binding.from.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(fromSeconds)) - val toTimeSetListener = TimePickerDialog.OnTimeSetListener { _, hour, minute -> - toSeconds = (T.hours(hour.toLong()).secs() + T.mins(minute.toLong()).secs()).toInt() - binding.to.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(toSeconds)) - } - binding.to.setOnClickListener { - context?.let { - TimePickerDialog( - it, - toTimeSetListener, - T.secs(toSeconds.toLong()).hours().toInt(), - T.secs((toSeconds % 3600).toLong()).mins().toInt(), - DateFormat.is24HourFormat(context) - ).show() + val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H + val timePicker = MaterialTimePicker.Builder() + .setTimeFormat(clockFormat) + .setHour(T.secs(toSeconds.toLong()).hours().toInt()) + .setMinute(T.secs((toSeconds % 3600).toLong()).mins().toInt()) + .build() + timePicker.addOnPositiveButtonClickListener { + toSeconds = (T.hours(timePicker.hour.toLong()).secs() + T.mins(timePicker.minute.toLong()).secs()).toInt() + binding.to.text = dateUtil.timeString(dateUtil.secondsOfTheDayToMilliseconds(toSeconds)) } + timePicker.show(parentFragmentManager, "event_time_time_picker") } fun usePercentage(custom: Boolean) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt index b63425970b..9b21d70219 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt @@ -1,6 +1,5 @@ package info.nightscout.androidaps.plugins.general.overview.graphData -import android.graphics.Color import android.graphics.DashPathEffect import android.graphics.Paint import com.jjoe64.graphview.GraphView @@ -66,7 +65,7 @@ class GraphData( addSeries(AreaGraphSeries(inRangeAreaDataPoints).also { it.color = 0 it.isDrawBackground = true - it.backgroundColor = rh.gac(graph.context,R.attr.inrangeBackground) + it.backgroundColor = rh.gac(graph.context,R.attr.inRangeBackground) }) } @@ -201,7 +200,7 @@ class GraphData( paint.style = Paint.Style.STROKE paint.strokeWidth = 2f paint.pathEffect = DashPathEffect(floatArrayOf(10f, 20f), 0f) - paint.color = Color.WHITE + paint.color = rh.gac(graph.context, R.attr.dotLineColor) }) }) } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt index b9bbb79809..c354ad9fbb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphExtensions/BolusDataPoint.kt @@ -34,8 +34,7 @@ class BolusDataPoint @Inject constructor( else if (data.isValid) rh.gac(context, R.attr.bolusDataPointColor) else rh.gac(context, R.attr.alarmColor) - override fun setY(y: Double) { yValue = y } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/Session.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/Session.kt index 7067ddd073..5fb6b34605 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/Session.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/comm/Session.kt @@ -16,7 +16,6 @@ class Session(val authHeader: String?, @Volatile internal var iterations: Int = 0 - fun populateHeaders(headers: Headers) { if (this.token == null) { this.token = headers.get(sessionTokenHeader) @@ -39,4 +38,4 @@ class Session(val authHeader: String?, datasetReply = obj } } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt index c4f47e5aa3..12c7b55fd7 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/elements/ProfileElement.kt @@ -95,5 +95,3 @@ class ProfileElement(ps: EffectiveProfileSwitch, serialNumber: String, dateUtil: internal var amount: Double ) } - - diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/DatasetReplyMessage.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/DatasetReplyMessage.kt index f19070624b..9db4595c16 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/DatasetReplyMessage.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/messages/DatasetReplyMessage.kt @@ -1,6 +1,5 @@ package info.nightscout.androidaps.plugins.general.tidepool.messages - class DatasetReplyMessage { internal var data: Data? = null diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt index ea85e983b5..d36c5225ea 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt @@ -47,10 +47,8 @@ class VirtualPumpFragment : DaggerFragment() { // onDestroyView. private val binding get() = _binding!! - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - _binding = VirtualpumpFragmentBinding.inflate(inflater, container, false) - return binding.root - } + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = + VirtualpumpFragmentBinding.inflate(inflater, container, false).also { _binding = it }.root @Synchronized override fun onResume() { diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt index a65c77a569..6bde38ee9a 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt +++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt @@ -28,7 +28,6 @@ open class DataReceiver : DaggerBroadcastReceiver() { val bundle = intent.extras ?: return aapsLogger.debug(LTag.DATABASE, "onReceive ${intent.action} ${BundleLogger.log(bundle)}") - when (intent.action) { Intents.ACTION_NEW_BG_ESTIMATE -> OneTimeWorkRequest.Builder(XdripPlugin.XdripWorker::class.java) @@ -74,4 +73,4 @@ open class DataReceiver : DaggerBroadcastReceiver() { }?.let { request -> dataWorker.enqueue(request) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt index 46756397d5..60edb6b6ad 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt @@ -16,6 +16,7 @@ import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.annotation.StyleRes import androidx.appcompat.view.ContextThemeWrapper +import com.google.android.material.dialog.MaterialAlertDialogBuilder import info.nightscout.androidaps.R import info.nightscout.androidaps.extensions.runOnUiThread import info.nightscout.androidaps.plugins.general.maintenance.formats.Prefs @@ -49,7 +50,6 @@ object PrefImportSummaryDialog { var idx = 0 val details = LinkedList() - for ((metaKey, metaEntry) in prefs.metadata) { val rowLayout = LayoutInflater.from(themedCtx).inflate(R.layout.import_summary_item, null) val label = (rowLayout.findViewById(R.id.summary_text) as TextView) @@ -92,7 +92,7 @@ object PrefImportSummaryDialog { webView.setBackgroundColor(Color.TRANSPARENT) webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null) - AlertDialogHelper.Builder(context, R.style.DialogTheme) + MaterialAlertDialogBuilder(context, R.style.DialogTheme) .setCustomTitle( AlertDialogHelper.buildCustomTitle( context, @@ -109,11 +109,10 @@ object PrefImportSummaryDialog { } } - val builder = AlertDialogHelper.Builder(context, theme) + val builder = MaterialAlertDialogBuilder(context, theme) .setMessage(context.getString(messageRes)) .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.nav_import), headerIcon, theme)) .setView(innerLayout) - .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() SystemClock.sleep(100) @@ -137,4 +136,4 @@ object PrefImportSummaryDialog { dialog.setCanceledOnTouchOutside(false) } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt index 0bfd1f72f9..d4f2787538 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt @@ -8,6 +8,7 @@ import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.annotation.DrawableRes +import com.google.android.material.dialog.MaterialAlertDialogBuilder import info.nightscout.androidaps.R import info.nightscout.androidaps.extensions.runOnUiThread @@ -19,7 +20,7 @@ object TwoMessagesAlertDialog { val secondMessageLayout = LayoutInflater.from(context).inflate(R.layout.dialog_alert_two_messages, null) (secondMessageLayout.findViewById(R.id.password_prompt_title) as TextView).text = secondMessage - AlertDialogHelper.Builder(context, R.style.DialogTheme) + MaterialAlertDialogBuilder(context, R.style.DialogTheme) .setMessage(message) .setCustomTitle( AlertDialogHelper.buildCustomTitle( @@ -32,7 +33,6 @@ object TwoMessagesAlertDialog { dialog.dismiss() SystemClock.sleep(100) if (ok != null) runOnUiThread { ok() } - } .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() @@ -43,4 +43,4 @@ object TwoMessagesAlertDialog { .setCanceledOnTouchOutside(false) } -} \ No newline at end of file +} diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt index d69bde9668..3310638636 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt @@ -3,7 +3,6 @@ package info.nightscout.androidaps.workflow import android.content.Context import android.graphics.DashPathEffect import android.graphics.Paint -import androidx.core.content.ContextCompat import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf @@ -118,7 +117,7 @@ class PrepareBasalDataWorker( // create series data.overviewData.baseBasalGraphSeries = LineGraphSeries(Array(baseBasalArray.size) { i -> baseBasalArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = rh.gac(ctx, R.attr.basebasalColor ) + it.backgroundColor = rh.gac(ctx, R.attr.baseBasalColor ) it.thickness = 0 } data.overviewData.tempBasalGraphSeries = LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also { diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt index cc81bf3593..35046e295b 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt @@ -30,7 +30,6 @@ import info.nightscout.androidaps.receivers.DataWorker import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.resources.ResourceHelper -import info.nightscout.androidaps.utils.resources.getThemeColor import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import java.util.ArrayList @@ -159,15 +158,15 @@ class PrepareIobAutosensGraphDataWorker( // DEVIATIONS if (autosensData != null) { - var color = rh.gac( ctx, R.attr.deviationblackColor) // "=" + var color = rh.gac( ctx, R.attr.deviationBlackColor) // "=" if (autosensData.type == "" || autosensData.type == "non-meal") { - if (autosensData.pastSensitivity == "C") color = rh.gac( ctx, R.attr.deviationgreyColor) - if (autosensData.pastSensitivity == "+") color = rh.gac( ctx, R.attr.deviationgreenColor) - if (autosensData.pastSensitivity == "-") color = rh.gac( ctx, R.attr.deviationredColor) + if (autosensData.pastSensitivity == "C") color = rh.gac( ctx, R.attr.deviationGreyColor) + if (autosensData.pastSensitivity == "+") color = rh.gac( ctx, R.attr.deviationGreenColor) + if (autosensData.pastSensitivity == "-") color = rh.gac( ctx, R.attr.deviationRedColor) } else if (autosensData.type == "uam") { color = rh.gac( ctx, R.attr.uamColor) } else if (autosensData.type == "csf") { - color = rh.gac( ctx, R.attr.deviationgreyColor) + color = rh.gac( ctx, R.attr.deviationGreyColor) } devArray.add(OverviewPlugin.DeviationDataPoint(time.toDouble(), autosensData.deviation, color, data.overviewData.devScale)) data.overviewData.maxDevValueFound = maxOf(data.overviewData.maxDevValueFound, abs(autosensData.deviation), abs(bgi)) @@ -272,11 +271,11 @@ class PrepareIobAutosensGraphDataWorker( // DEV SLOPE data.overviewData.dsMaxSeries = LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also { - it.color = rh.gac( ctx, R.attr.devslopeposColor) + it.color = rh.gac( ctx, R.attr.devSlopePosColor) it.thickness = 3 } data.overviewData.dsMinSeries = LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also { - it.color = rh.gac( ctx, R.attr.devslopenegColor) + it.color = rh.gac( ctx, R.attr.devSlopeNegColor) it.thickness = 3 } rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, 100, null)) diff --git a/app/src/main/res/drawable/ic_byoda.xml b/app/src/main/res/drawable/ic_byoda.xml index da63bef0df..8a3de6c453 100644 --- a/app/src/main/res/drawable/ic_byoda.xml +++ b/app/src/main/res/drawable/ic_byoda.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/byodaGray"/> diff --git a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml index 840a639f9c..e9385125b6 100644 --- a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml +++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/basalNoTbrColor"/> diff --git a/app/src/main/res/drawable/ic_cp_basal_start.xml b/app/src/main/res/drawable/ic_cp_basal_start.xml index 1b7781daed..22ba9382ec 100644 --- a/app/src/main/res/drawable/ic_cp_basal_start.xml +++ b/app/src/main/res/drawable/ic_cp_basal_start.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/basalStartColor"/> diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml index 1b7781daed..dba9f794d9 100644 --- a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml +++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/basalHighColor"/> diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml index 9f3d94563f..bcac9407aa 100644 --- a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml +++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/basalLowColor"/> diff --git a/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml b/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml index f78eaede2c..e5dc16a43e 100644 --- a/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml +++ b/app/src/main/res/drawable/ic_swap_vert_black_48dp_green.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/ic_target_manual.xml b/app/src/main/res/drawable/ic_target_manual.xml index fc41c52757..086076077e 100644 --- a/app/src/main/res/drawable/ic_target_manual.xml +++ b/app/src/main/res/drawable/ic_target_manual.xml @@ -8,7 +8,7 @@ android:fillColor="@color/tempTargetConfirmation"/> + android:fillColor="@color/inRange"/> diff --git a/app/src/main/res/drawable/ic_temptarget_flat.xml b/app/src/main/res/drawable/ic_temptarget_flat.xml index bf1a2492a1..dff5ff88e4 100644 --- a/app/src/main/res/drawable/ic_temptarget_flat.xml +++ b/app/src/main/res/drawable/ic_temptarget_flat.xml @@ -5,7 +5,7 @@ android:viewportHeight="24"> + android:fillColor="@color/inRange"/> diff --git a/app/src/main/res/drawable/ic_temptarget_low.xml b/app/src/main/res/drawable/ic_temptarget_low.xml index a161fd12f4..b91b1dac51 100644 --- a/app/src/main/res/drawable/ic_temptarget_low.xml +++ b/app/src/main/res/drawable/ic_temptarget_low.xml @@ -5,7 +5,7 @@ android:viewportHeight="24"> + android:fillColor="@color/inRange"/> diff --git a/app/src/main/res/drawable/ic_trash_outline.xml b/app/src/main/res/drawable/ic_trash_outline.xml index a411c394e0..296cdd090a 100644 --- a/app/src/main/res/drawable/ic_trash_outline.xml +++ b/app/src/main/res/drawable/ic_trash_outline.xml @@ -3,5 +3,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_x_swap_vert.xml b/app/src/main/res/drawable/ic_x_swap_vert.xml index f5182fe7b4..3d6735ae12 100644 --- a/app/src/main/res/drawable/ic_x_swap_vert.xml +++ b/app/src/main/res/drawable/ic_x_swap_vert.xml @@ -4,7 +4,8 @@ android:viewportHeight="24" android:viewportWidth="24" xmlns:android="http://schemas.android.com/apk/res/android"> - - - + + + diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index e8362b0524..aff0d78e1b 100644 --- a/app/src/main/res/layout/actions_fragment.xml +++ b/app/src/main/res/layout/actions_fragment.xml @@ -1,4 +1,5 @@ - - + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:layout_marginTop="4dp" + app:cardCornerRadius="4dp" + app:contentPadding="2dp" + app:cardElevation="4dp" + app:cardUseCompatPadding="false" + android:layout_gravity="center"> - + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:layout_marginTop="4dp" + app:cardCornerRadius="4dp" + app:contentPadding="2dp" + app:cardElevation="4dp" + app:cardUseCompatPadding="false" + android:layout_gravity="center"> - + android:layout_marginTop="10dp" /> - + - - - - - - - - - - - + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:layout_marginTop="4dp" + app:cardCornerRadius="4dp" + app:contentPadding="2dp" + app:cardElevation="4dp" + app:cardUseCompatPadding="false" + android:layout_gravity="center"> - + - + + + + + + + + + + + + + + + + + + + + + + + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + app:cardCornerRadius="4dp" + app:contentPadding="2dp" + app:cardElevation="4dp" + app:cardUseCompatPadding="false" + android:layout_gravity="center"> - - - + android:paddingStart="15dp" + android:paddingEnd="15dp" + android:text="@string/tools" /> - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="10dp" + android:padding="10dip" + app:columnCount="2"> - + - + + + + + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_historybrowse.xml b/app/src/main/res/layout/activity_historybrowse.xml index f3792b7e91..f904a06eb4 100644 --- a/app/src/main/res/layout/activity_historybrowse.xml +++ b/app/src/main/res/layout/activity_historybrowse.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_weight="1" - android:text="24" /> + tools:text="24" /> @@ -111,5 +111,4 @@ - diff --git a/app/src/main/res/layout/activity_logsetting.xml b/app/src/main/res/layout/activity_logsetting.xml index cb1573ecf8..4236005fd8 100644 --- a/app/src/main/res/layout/activity_logsetting.xml +++ b/app/src/main/res/layout/activity_logsetting.xml @@ -31,8 +31,8 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:layout_gravity="center" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" android:text="@string/nav_logsettings" android:textAlignment="center" android:textAppearance="?android:attr/textAppearanceLarge" /> diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml index 73353f3d1c..b9e2aaf3b5 100644 --- a/app/src/main/res/layout/activity_profilehelper.xml +++ b/app/src/main/res/layout/activity_profilehelper.xml @@ -15,7 +15,7 @@ @@ -25,10 +25,9 @@ android:layout_height="30dp" android:layout_weight="1" android:gravity="center" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:text="1" - tools:ignore="HardcodedText" /> + android:paddingStart="5dp" + android:paddingEnd="5dp" + android:text="Profile 1" /> + android:paddingStart="5dp" + android:paddingEnd="5dp" + android:text="Profile 2" /> @@ -178,7 +176,7 @@ @@ -64,8 +65,8 @@ android:layout_gravity="bottom|center_horizontal" android:background="@color/black_alpha_40" android:orientation="horizontal" - android:paddingLeft="16dp" - android:paddingRight="16dp"> + android:paddingStart="16dp" + android:paddingEnd="16dp">