diff --git a/plugins/configuration/src/main/assets/Default Watchface.zip b/plugins/configuration/src/main/assets/Default Watchface.zip deleted file mode 100644 index a75db9f747..0000000000 Binary files a/plugins/configuration/src/main/assets/Default Watchface.zip and /dev/null differ diff --git a/plugins/configuration/src/main/assets/SteamPunk mgdl.zip b/plugins/configuration/src/main/assets/SteamPunk mgdl.zip new file mode 100644 index 0000000000..49caf76855 Binary files /dev/null and b/plugins/configuration/src/main/assets/SteamPunk mgdl.zip differ diff --git a/plugins/configuration/src/main/assets/SteamPunk mmol.zip b/plugins/configuration/src/main/assets/SteamPunk mmol.zip new file mode 100644 index 0000000000..d6001c9e37 Binary files /dev/null and b/plugins/configuration/src/main/assets/SteamPunk mmol.zip differ diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml index 837f323a78..63dbcc5daa 100644 --- a/wear/src/main/AndroidManifest.xml +++ b/wear/src/main/AndroidManifest.xml @@ -145,31 +145,6 @@ - - - - - - - - - - - - - - - diff --git a/wear/src/main/kotlin/app/aaps/wear/di/WearServicesModule.kt b/wear/src/main/kotlin/app/aaps/wear/di/WearServicesModule.kt index ea11f0b81c..72fdae64a8 100644 --- a/wear/src/main/kotlin/app/aaps/wear/di/WearServicesModule.kt +++ b/wear/src/main/kotlin/app/aaps/wear/di/WearServicesModule.kt @@ -28,7 +28,6 @@ import app.aaps.wear.watchfaces.CockpitWatchface import app.aaps.wear.watchfaces.CustomWatchface import app.aaps.wear.watchfaces.DigitalStyleWatchface import app.aaps.wear.watchfaces.NoChartWatchface -import app.aaps.wear.watchfaces.SteampunkWatchface import app.aaps.wear.watchfaces.utils.BaseWatchFace import dagger.Module import dagger.android.ContributesAndroidInjector @@ -57,7 +56,6 @@ abstract class WearServicesModule { @ContributesAndroidInjector abstract fun contributesAapsWatchface(): AapsWatchface @ContributesAndroidInjector abstract fun contributesAapsV2Watchface(): AapsV2Watchface @ContributesAndroidInjector abstract fun contributesAapsLargeWatchface(): AapsLargeWatchface - @ContributesAndroidInjector abstract fun contributesSteampunk(): SteampunkWatchface @ContributesAndroidInjector abstract fun contributesDigitalStyleWatchface(): DigitalStyleWatchface @ContributesAndroidInjector abstract fun contributesCockpitWatchface(): CockpitWatchface @ContributesAndroidInjector abstract fun contributesBIGChart(): BigChartWatchface diff --git a/wear/src/main/kotlin/app/aaps/wear/watchfaces/SteampunkWatchface.kt b/wear/src/main/kotlin/app/aaps/wear/watchfaces/SteampunkWatchface.kt deleted file mode 100644 index 8ff5365b2b..0000000000 --- a/wear/src/main/kotlin/app/aaps/wear/watchfaces/SteampunkWatchface.kt +++ /dev/null @@ -1,169 +0,0 @@ -@file:Suppress("DEPRECATION") - -package app.aaps.wear.watchfaces - -import android.view.LayoutInflater -import android.view.animation.Animation -import android.view.animation.LinearInterpolator -import android.view.animation.RotateAnimation -import androidx.core.content.ContextCompat -import androidx.viewbinding.ViewBinding -import app.aaps.wear.R -import app.aaps.wear.databinding.ActivitySteampunkBinding -import app.aaps.wear.watchfaces.utils.BaseWatchFace -import org.joda.time.TimeOfDay - -/** - * Created by andrew-warrington on 01/12/2017. - * Refactored by MilosKozak on 23/04/2022 - */ -class SteampunkWatchface : BaseWatchFace() { - - private var lastEndDegrees = 0f - private var deltaRotationAngle = 0f - private lateinit var binding: ActivitySteampunkBinding - - override fun inflateLayout(inflater: LayoutInflater): ViewBinding { - binding = ActivitySteampunkBinding.inflate(inflater) - return binding - } - - override fun onCreate() { - forceSquareCanvas = true - super.onCreate() - } - - override fun setColorDark() { - if (ageLevel() <= 0 && singleBg.timeStamp != 0L) { - binding.tertiaryLayout.setBackgroundResource(R.drawable.redline) - binding.timestamp.setTextColor(ContextCompat.getColor(this, R.color.red_600)) - } else { - binding.tertiaryLayout.setBackgroundResource(0) - binding.timestamp.setTextColor(ContextCompat.getColor(this, android.support.wearable.R.color.black_86p)) - } - binding.loop.setTextColor(ContextCompat.getColor(this, if (loopLevel == 0) R.color.red_600 else android.support.wearable.R.color.black_86p)) - if (singleBg.sgvString != "---") { - var rotationAngle = 0f // by default, show ? on the dial (? is at 0 degrees on the dial) - if (singleBg.glucoseUnits != "-") { - - // ensure the glucose dial is the correct units - binding.glucoseDial.setImageResource(if (singleBg.glucoseUnits == "mmol") R.drawable.steampunk_dial_mmol else R.drawable.steampunk_dial_mgdl) - - // convert the Sgv to degrees of rotation - rotationAngle = singleBg.sgv.toFloat() - } - if (rotationAngle > 330) rotationAngle = 330f // if the glucose value is higher than 330 then show "HIGH" on the dial. ("HIGH" is at 330 degrees on the dial) - if (rotationAngle != 0f && rotationAngle < 30) rotationAngle = 30f // if the glucose value is lower than 30 show "LOW" on the dial. ("LOW" is at 30 degrees on the dial) - if (lastEndDegrees == 0f) lastEndDegrees = rotationAngle - - // rotate glucose dial - val rotate = RotateAnimation(lastEndDegrees, rotationAngle - lastEndDegrees, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f).apply { - fillAfter = true - interpolator = LinearInterpolator() - duration = 1 - } - binding.glucoseDial.startAnimation(rotate) - lastEndDegrees = rotationAngle //store the final angle as a starting point for the next rotation. - } - - singleBg.avgDeltaMgdl?.let {// if a legitimate delta value is - val absAvgDelta = it.toFloat() - var autoGranularity = "0" //auto-granularity off - // ensure the delta gauge is the right units and granularity - if (sp.getString("delta_granularity", "2") == "4") { //Auto granularity - autoGranularity = - when { - absAvgDelta < 5 -> "3" // high if below 5 mg/dl - absAvgDelta < 10 -> "2" // medium if below 10 mg/dl - else -> "1" // low (init) - } - } - if (sp.getString("delta_granularity", "2") == "1" || autoGranularity == "1") { //low - if (singleBg.glucoseUnits == "mmol") - binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_10) - else - binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_20) - deltaRotationAngle = absAvgDelta * 1.5f - } - if (sp.getString("delta_granularity", "2") == "2" || autoGranularity == "2") { //medium - if (singleBg.glucoseUnits == "mmol") - binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_05) - else - binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_10) - deltaRotationAngle = absAvgDelta * 3f - } - if (sp.getString("delta_granularity", "2") == "3" || autoGranularity == "3") { //high - if (singleBg.glucoseUnits == "mmol") - binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mmol_03) - else - binding.secondaryLayout.setBackgroundResource(R.drawable.steampunk_gauge_mgdl_5) - deltaRotationAngle = absAvgDelta * 6f - } - if (deltaRotationAngle > 40) deltaRotationAngle = 40f - binding.deltaPointer.rotation = deltaRotationAngle - } - - // rotate the minute hand. - binding.minuteHand.rotation = TimeOfDay().minuteOfHour * 6f - - // rotate the hour hand. - binding.hourHand.rotation = TimeOfDay().hourOfDay * 30f + TimeOfDay().minuteOfHour * 0.5f - setTextSizes() - binding.loop.setBackgroundResource(0) - - highColor = ContextCompat.getColor(this, R.color.black) - lowColor = ContextCompat.getColor(this, R.color.black) - midColor = ContextCompat.getColor(this, R.color.black) - gridColor = ContextCompat.getColor(this, R.color.grey_steampunk) - basalBackgroundColor = ContextCompat.getColor(this, R.color.basal_dark) - basalCenterColor = ContextCompat.getColor(this, R.color.basal_dark) - pointSize = if (sp.getInt(R.string.key_chart_time_frame, 3) < 3) 2 else 1 - setupCharts() - - invalidate() - } - - override fun setColorLowRes() { - setColorDark() - } - - override fun setColorBright() { - setColorDark() - } - - private fun setTextSizes() { - var fontSmall = 10f - var fontMedium = 11f - var fontLarge = 12f - if (bIsRound) { - fontSmall = 11f - fontMedium = 12f - fontLarge = 13f - } - - // top row. large font unless text too big (i.e. detailedIOB) - binding.cob2.textSize = fontLarge - binding.basalRate.textSize = fontLarge - val fontIob = if (status.iobDetail.length < 7) fontLarge else fontSmall - binding.iob2.textSize = fontIob - - // bottom row. font medium unless text too long (i.e. longer than 9' timestamp) - // always resize these fields together, for symmetry. - val font = if (binding.timestamp.text.length < 3 || binding.loop.text.length < 3) fontMedium else fontSmall - binding.loop.textSize = font - binding.timestamp.textSize = font - - // if both batteries are shown, make them smaller. - val fontBat = if (sp.getBoolean(R.string.key_show_uploader_battery, true) && sp.getBoolean(R.string.key_show_rig_battery, false)) fontSmall else fontMedium - binding.uploaderBattery.textSize = fontBat - binding.rigBattery.textSize = fontBat - - } - - override fun changeChartTimeframe() { - var timeframe = sp.getInt(R.string.key_chart_time_frame, 3) - timeframe = timeframe % 5 + 1 - pointSize = if (timeframe < 3) 2 else 1 - sp.putString(R.string.key_chart_time_frame, timeframe.toString()) - } -} diff --git a/wear/src/main/kotlin/app/aaps/wear/watchfaces/utils/WatchfaceViewAdapter.kt b/wear/src/main/kotlin/app/aaps/wear/watchfaces/utils/WatchfaceViewAdapter.kt index 88e365096b..692eec4977 100644 --- a/wear/src/main/kotlin/app/aaps/wear/watchfaces/utils/WatchfaceViewAdapter.kt +++ b/wear/src/main/kotlin/app/aaps/wear/watchfaces/utils/WatchfaceViewAdapter.kt @@ -9,7 +9,6 @@ import app.aaps.wear.databinding.ActivityHome2Binding import app.aaps.wear.databinding.ActivityHomeBinding import app.aaps.wear.databinding.ActivityHomeLargeBinding import app.aaps.wear.databinding.ActivityNochartBinding -import app.aaps.wear.databinding.ActivitySteampunkBinding /** * WatchfaceViewAdapter binds all WatchFace variants shared attributes to one common view adapter. @@ -23,12 +22,11 @@ class WatchfaceViewAdapter( cp: ActivityCockpitBinding? = null, ds: ActivityDigitalstyleBinding? = null, nC: ActivityNochartBinding? = null, - sP: ActivitySteampunkBinding? = null, cU: ActivityCustomBinding? = null ) { init { - if (aL == null && a2 == null && aa == null && bC == null && cp == null && ds == null && nC == null && sP == null && cU == null) { + if (aL == null && a2 == null && aa == null && bC == null && cp == null && ds == null && nC == null && cU == null) { throw IllegalArgumentException("Require at least on Binding parameter") } } @@ -37,28 +35,28 @@ class WatchfaceViewAdapter( // Required attributes val mainLayout = - aL?.mainLayout ?: a2?.mainLayout ?: aa?.mainLayout ?: bC?.mainLayout ?: bC?.mainLayout ?: cp?.mainLayout ?: ds?.mainLayout ?: nC?.mainLayout ?: sP?.mainLayout ?: cU?.mainLayout + aL?.mainLayout ?: a2?.mainLayout ?: aa?.mainLayout ?: bC?.mainLayout ?: bC?.mainLayout ?: cp?.mainLayout ?: ds?.mainLayout ?: nC?.mainLayout ?: cU?.mainLayout ?: throw IllegalArgumentException(errorMessage) val timestamp = - aL?.timestamp ?: a2?.timestamp ?: aa?.timestamp ?: bC?.timestamp ?: bC?.timestamp ?: cp?.timestamp ?: ds?.timestamp ?: nC?.timestamp ?: sP?.timestamp ?: cU?.timestamp + aL?.timestamp ?: a2?.timestamp ?: aa?.timestamp ?: bC?.timestamp ?: bC?.timestamp ?: cp?.timestamp ?: ds?.timestamp ?: nC?.timestamp ?: cU?.timestamp ?: throw IllegalArgumentException(errorMessage) val root = - aL?.root ?: a2?.root ?: aa?.root ?: bC?.root ?: bC?.root ?: cp?.root ?: ds?.root ?: nC?.root ?: sP?.root ?: cU?.root + aL?.root ?: a2?.root ?: aa?.root ?: bC?.root ?: bC?.root ?: cp?.root ?: ds?.root ?: nC?.root ?: cU?.root ?: throw IllegalArgumentException(errorMessage) // Optional attributes val sgv = aL?.sgv ?: a2?.sgv ?: aa?.sgv ?: bC?.sgv ?: bC?.sgv ?: cp?.sgv ?: ds?.sgv ?: nC?.sgv ?: cU?.sgv val direction = aL?.direction ?: a2?.direction ?: aa?.direction ?: cp?.direction ?: ds?.direction - val loop = a2?.loop ?: cp?.loop ?: sP?.loop ?: cU?.loop + val loop = a2?.loop ?: cp?.loop ?: cU?.loop val delta = aL?.delta ?: a2?.delta ?: aa?.delta ?: bC?.delta ?: bC?.delta ?: cp?.delta ?: ds?.delta ?: nC?.delta ?: cU?.delta val avgDelta = a2?.avgDelta ?: bC?.avgDelta ?: bC?.avgDelta ?: cp?.avgDelta ?: ds?.avgDelta ?: nC?.avgDelta ?: cU?.avgDelta - val uploaderBattery = aL?.uploaderBattery ?: a2?.uploaderBattery ?: aa?.uploaderBattery ?: cp?.uploaderBattery ?: ds?.uploaderBattery ?: sP?.uploaderBattery ?: cU?.uploaderBattery - val rigBattery = a2?.rigBattery ?: cp?.rigBattery ?: ds?.rigBattery ?: sP?.rigBattery ?: cU?.rigBattery - val basalRate = a2?.basalRate ?: cp?.basalRate ?: ds?.basalRate ?: sP?.basalRate ?: cU?.basalRate + val uploaderBattery = aL?.uploaderBattery ?: a2?.uploaderBattery ?: aa?.uploaderBattery ?: cp?.uploaderBattery ?: ds?.uploaderBattery ?: cU?.uploaderBattery + val rigBattery = a2?.rigBattery ?: cp?.rigBattery ?: ds?.rigBattery ?: cU?.rigBattery + val basalRate = a2?.basalRate ?: cp?.basalRate ?: ds?.basalRate ?: cU?.basalRate val bgi = a2?.bgi ?: ds?.bgi ?: cU?.bgi - val AAPSv2 = a2?.AAPSv2 ?: cp?.AAPSv2 ?: ds?.AAPSv2 ?: sP?.AAPSv2 ?: cU?.AAPSv2 + val AAPSv2 = a2?.AAPSv2 ?: cp?.AAPSv2 ?: ds?.AAPSv2 ?: cU?.AAPSv2 val cob1 = a2?.cob1 ?: ds?.cob1 ?: cU?.cob1 - val cob2 = a2?.cob2 ?: cp?.cob2 ?: ds?.cob2 ?: sP?.cob2 ?: cU?.cob2 + val cob2 = a2?.cob2 ?: cp?.cob2 ?: ds?.cob2 ?: cU?.cob2 val time = aL?.time ?: a2?.time ?: aa?.time ?: bC?.time ?: bC?.time ?: cp?.time ?: nC?.time ?: cU?.time val second = cU?.second val minute = ds?.minute ?: cU?.minute @@ -66,23 +64,21 @@ class WatchfaceViewAdapter( val day = a2?.day ?: ds?.day ?: cU?.day val month = a2?.month ?: ds?.month ?: cU?.month val iob1 = a2?.iob1 ?: ds?.iob1 ?: cU?.iob1 - val iob2 = a2?.iob2 ?: cp?.iob2 ?: ds?.iob2 ?: sP?.iob2 ?: cU?.iob2 - val chart = a2?.chart ?: aa?.chart ?: bC?.chart ?: bC?.chart ?: ds?.chart ?: sP?.chart ?: cU?.chart + val iob2 = a2?.iob2 ?: cp?.iob2 ?: ds?.iob2 ?: cU?.iob2 + val chart = a2?.chart ?: aa?.chart ?: bC?.chart ?: bC?.chart ?: ds?.chart ?: cU?.chart val status = aL?.status ?: aa?.status ?: bC?.status ?: bC?.status ?: nC?.status val timePeriod = ds?.timePeriod ?: aL?.timePeriod ?: nC?.timePeriod ?: bC?.timePeriod ?: cU?.timePeriod val dayName = ds?.dayName ?: cU?.dayName - val mainMenuTap = ds?.mainMenuTap ?: sP?.mainMenuTap - val chartZoomTap = ds?.chartZoomTap ?: sP?.chartZoomTap + val mainMenuTap = ds?.mainMenuTap + val chartZoomTap = ds?.chartZoomTap val dateTime = ds?.dateTime ?: a2?.dateTime val weekNumber = ds?.weekNumber ?: cU?.weekNumber - // val minuteHand = sP?.minuteHand - // val secondaryLayout = aL?.secondaryLayout ?: a2?.secondaryLayout ?: aa?.secondaryLayout ?: ds?.secondaryLayout ?: sP?.secondaryLayout - // val tertiaryLayout = a2?.tertiaryLayout ?: sP?.tertiaryLayout + // val minuteHand = cU?.minuteHand + // val secondaryLayout = aL?.secondaryLayout ?: a2?.secondaryLayout ?: aa?.secondaryLayout ?: ds?.secondaryLayout + // val tertiaryLayout = a2?.tertiaryLayout // val highLight = cp?.highLight // val lowLight = cp?.lowLight - // val deltaGauge = sP?.deltaPointer - // val hourHand = sP?.hourHand - // val glucoseDial = sP?.glucoseDial + // val hourHand = cU?.hourHand companion object { @@ -95,8 +91,7 @@ class WatchfaceViewAdapter( is ActivityCockpitBinding -> WatchfaceViewAdapter(null, null, null, null, bindLayout) is ActivityDigitalstyleBinding -> WatchfaceViewAdapter(null, null, null, null, null, bindLayout) is ActivityNochartBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, bindLayout) - is ActivitySteampunkBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout) - is ActivityCustomBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, null, bindLayout) + is ActivityCustomBinding -> WatchfaceViewAdapter(null, null, null, null, null, null, null, bindLayout) else -> throw IllegalArgumentException("ViewBinding is not implement in WatchfaceViewAdapter") } } diff --git a/wear/src/main/res/drawable/steampunk_cover_plate.png b/wear/src/main/res/drawable/steampunk_cover_plate.png deleted file mode 100644 index f6d6c0c961..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_cover_plate.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_dial_mgdl.png b/wear/src/main/res/drawable/steampunk_dial_mgdl.png deleted file mode 100644 index e6315b1746..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_dial_mgdl.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_dial_mmol.png b/wear/src/main/res/drawable/steampunk_dial_mmol.png deleted file mode 100644 index 17325212c3..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_dial_mmol.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mgdl_10.png b/wear/src/main/res/drawable/steampunk_gauge_mgdl_10.png deleted file mode 100644 index 6d268bebd7..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_gauge_mgdl_10.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mgdl_20.png b/wear/src/main/res/drawable/steampunk_gauge_mgdl_20.png deleted file mode 100644 index a509d7b308..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_gauge_mgdl_20.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mgdl_5.png b/wear/src/main/res/drawable/steampunk_gauge_mgdl_5.png deleted file mode 100644 index 9288c4e5ab..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_gauge_mgdl_5.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mmol_03.png b/wear/src/main/res/drawable/steampunk_gauge_mmol_03.png deleted file mode 100644 index 18b8d0bf4e..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_gauge_mmol_03.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mmol_05.png b/wear/src/main/res/drawable/steampunk_gauge_mmol_05.png deleted file mode 100644 index 07a48e8aac..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_gauge_mmol_05.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_gauge_mmol_10.png b/wear/src/main/res/drawable/steampunk_gauge_mmol_10.png deleted file mode 100644 index 55f5e59b5b..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_gauge_mmol_10.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_hour_hand.png b/wear/src/main/res/drawable/steampunk_hour_hand.png deleted file mode 100644 index f0031095d8..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_hour_hand.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_minute_hand.png b/wear/src/main/res/drawable/steampunk_minute_hand.png deleted file mode 100644 index 8b703d1b21..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_minute_hand.png and /dev/null differ diff --git a/wear/src/main/res/drawable/steampunk_pointer.png b/wear/src/main/res/drawable/steampunk_pointer.png deleted file mode 100644 index 60792cd48a..0000000000 Binary files a/wear/src/main/res/drawable/steampunk_pointer.png and /dev/null differ diff --git a/wear/src/main/res/drawable/watchface_steampunk.png b/wear/src/main/res/drawable/watchface_steampunk.png deleted file mode 100644 index 0db24e5faa..0000000000 Binary files a/wear/src/main/res/drawable/watchface_steampunk.png and /dev/null differ diff --git a/wear/src/main/res/layout/activity_steampunk.xml b/wear/src/main/res/layout/activity_steampunk.xml deleted file mode 100644 index df28e95d6f..0000000000 --- a/wear/src/main/res/layout/activity_steampunk.xml +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wear/src/main/res/xml/watch_face_configuration_steampunk.xml b/wear/src/main/res/xml/watch_face_configuration_steampunk.xml deleted file mode 100644 index 08758b3f81..0000000000 --- a/wear/src/main/res/xml/watch_face_configuration_steampunk.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - -