Show weekday + date on weekly reset labels

Weekly reset now reads "Resets Friday, Jun 6 · 3:00 PM" in the app and
full widget; small widget uses a compact "Fri, Jun 6" via a new
formatResetShort(). (Amir's local UI polish, folded in on top of v1.14.)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.gitea/workflows/build.yml

@@ -0,0 +1,103 @@
+name: Build APK
+
+# Push to master / open a PR  → builds a DEBUG apk (smoke test, no secrets needed).
+# Push a tag like v1.14       → builds a SIGNED RELEASE apk and attaches it to the
+#                               Gitea release for that tag.
+on:
+  push:
+    branches: [master]
+    tags: ['v*']
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Install Android SDK
+        run: |
+          set -e
+          SDK="$GITHUB_WORKSPACE/android-sdk"
+          mkdir -p "$SDK/cmdline-tools"
+          curl -sSL -o /tmp/cmdtools.zip \
+            https://dl.google.com/android/repository/commandlinetools-linux-9862592_latest.zip
+          unzip -q /tmp/cmdtools.zip -d "$SDK/cmdline-tools"
+          mv "$SDK/cmdline-tools/cmdline-tools" "$SDK/cmdline-tools/latest"
+          # Feed "y" via process substitution, not a pipe: `yes |` triggers SIGPIPE (exit 141)
+          # once sdkmanager stops reading, and the step shell runs with `-eo pipefail`.
+          "$SDK/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$SDK" --licenses >/dev/null < <(yes)
+          "$SDK/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$SDK" \
+            "platform-tools" "platforms;android-34" "build-tools;34.0.0" >/dev/null
+
+      - name: Point Gradle at the SDK
+        run: echo "sdk.dir=$GITHUB_WORKSPACE/android-sdk" > local.properties
+
+      # ── Debug build: every push/PR that is NOT a tag ───────────────────────
+      - name: Build debug APK
+        if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+        run: ./gradlew :app:assembleDebug --no-daemon
+
+      # ── Release build: tags only (needs the KEYSTORE_BASE64 secret) ────────
+      - name: Decode signing keystore
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          if [ -z "${{ secrets.KEYSTORE_BASE64 }}" ]; then
+            echo "::error::KEYSTORE_BASE64 secret is not set — cannot build a signed release."
+            exit 1
+          fi
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > app/claude-widget-release.keystore
+
+      - name: Build release APK
+        if: startsWith(github.ref, 'refs/tags/')
+        run: ./gradlew :app:assembleRelease --no-daemon
+
+      # ── Stage whichever APK was produced ───────────────────────────────────
+      - name: Stage APK
+        run: |
+          mkdir -p out
+          if [ -f app/build/outputs/apk/release/app-release.apk ]; then
+            cp app/build/outputs/apk/release/app-release.apk out/claude-usage-widget.apk
+          else
+            cp app/build/outputs/apk/debug/app-debug.apk out/claude-usage-widget-debug.apk
+          fi
+          ls -la out/
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        continue-on-error: true
+        with:
+          name: apk
+          path: out/*.apk
+
+      # ── Attach the signed APK to the Gitea release on tag ──────────────────
+      - name: Publish APK to Gitea release
+        if: startsWith(github.ref, 'refs/tags/')
+        env:
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -e
+          TAG="${GITHUB_REF#refs/tags/}"
+          API="${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}"
+          # Create the release if it doesn't exist yet (ignore "already exists").
+          curl -s -X POST "$API/releases" \
+            -H "Authorization: token $TOKEN" -H "Content-Type: application/json" \
+            -d "{\"tag_name\":\"$TAG\",\"name\":\"$TAG\",\"body\":\"Automated build of $TAG\"}" >/dev/null || true
+          RID=$(curl -s "$API/releases/tags/$TAG" -H "Authorization: token $TOKEN" \
+            | python3 -c "import sys,json;print(json.load(sys.stdin)['id'])")
+          # Replace any existing asset of the same name, then upload.
+          curl -s "$API/releases/$RID/assets" -H "Authorization: token $TOKEN" \
+            | python3 -c "import sys,json;[print(a['id']) for a in json.load(sys.stdin) if a['name']=='claude-usage-widget.apk']" \
+            | while read AID; do curl -s -X DELETE "$API/releases/$RID/assets/$AID" -H "Authorization: token $TOKEN"; done
+          curl -s -X POST "$API/releases/$RID/assets?name=claude-usage-widget.apk" \
+            -H "Authorization: token $TOKEN" \
+            -F "attachment=@out/claude-usage-widget.apk" >/dev/null
+          echo "Attached claude-usage-widget.apk to release $TAG"

README.md

@@ -15,6 +15,10 @@ Android home screen widget that shows your Claude Pro usage at a glance.
   yellow → orange → red → purple (burning way too fast), with an "X% over/under pace" label.
 - **Peak-hours indicator** — a Claude burst icon that lights up 🔥 during Anthropic's peak window
   (5–11 AM Pacific, Mon–Fri), when tokens burn faster, with a countdown to the window close.
+- **Usage history chart** — the app plots your session and weekly utilization over the past 7 days,
+  so you can see your consumption trend, not just the current snapshot.
+- **Usage alerts** — opt-in notifications when session or weekly usage crosses a threshold you set
+  (sliders, 50–100%). Each alert fires at most once per limit window, so you're never spammed.
 - Tap the widget to open the app; tap ⟳ to force-refresh
 - Responsive: works as 4×1 (compact) or 4×2 (full)
 - Auto-refreshes every 5 minutes in the background

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "me.khodak.claudeusage"
         minSdk = 26
         targetSdk = 34
-        versionCode = 12
-        versionName = "1.11"
+        versionCode = 15
+        versionName = "1.14"
     }
 
     signingConfigs {

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="false"

app/src/main/java/me/khodak/claudeusage/BarRenderer.kt

@@ -19,7 +19,7 @@ object BarRenderer {
         usedPct: Int,
         markerPct: Int?,
         fillColor: Int,
-        tierColor: Int?,
+        markerColor: Int?,
         wPx: Int = 500,
         hPx: Int = 14,
         cornerPx: Float = 7f
@@ -42,14 +42,16 @@ object BarRenderer {
             canvas.drawRoundRect(fill, cornerPx, cornerPx, paint)
         }
 
-        // Pace tick — "where you should be right now"
-        if (markerPct != null && tierColor != null) {
+        // Pace marker — a single clean tick showing "where you should be right now".
+        // One color (no tiers); rounded ends to match the bar.
+        if (markerPct != null && markerColor != null) {
             val m = markerPct.coerceIn(0, 100)
-            val tickW = (wPx * 0.012f).coerceIn(3f, 7f)
+            val tickW = (wPx * 0.016f).coerceIn(6f, 10f)
             var x = wPx * m / 100f
             x = x.coerceIn(tickW / 2f, wPx - tickW / 2f)
-            paint.color = tierColor
-            canvas.drawRect(x - tickW / 2f, 0f, x + tickW / 2f, hPx.toFloat(), paint)
+            paint.color = markerColor
+            val tick = RectF(x - tickW / 2f, 0f, x + tickW / 2f, hPx.toFloat())
+            canvas.drawRoundRect(tick, tickW / 2f, tickW / 2f, paint)
         }
 
         return bmp

app/src/main/java/me/khodak/claudeusage/ClaudeUsageWidget.kt

@@ -42,6 +42,15 @@ class ClaudeUsageWidget : AppWidgetProvider() {
         @Volatile internal var isRefreshing = false
         @Volatile internal var currentRotation = 0f
 
+        /** Redraw every placed widget from the current cached data (call after a refresh). */
+        fun notifyDataChanged(context: Context) {
+            val manager = AppWidgetManager.getInstance(context)
+            val ids = manager.getAppWidgetIds(
+                android.content.ComponentName(context, ClaudeUsageWidget::class.java)
+            )
+            ids.forEach { updateWidget(context, manager, it) }
+        }
+
         fun updateWidget(context: Context, manager: AppWidgetManager, widgetId: Int) {
             val prefs = PreferencesManager(context)
             val apiData = prefs.getUsageData()
@@ -104,11 +113,9 @@ class ClaudeUsageWidget : AppWidgetProvider() {
             when {
                 hasUtilization -> {
                     val pct = apiData!!.fiveHourUtilization.toInt()
-                    val pace = PaceCalc.compute(apiData.fiveHourUtilization, apiData.utilizationResetAtEpoch, PaceCalc.SESSION_WINDOW_MS)
                     v.setTextViewText(R.id.tv_session_value, "$pct%")
-                    v.setImageViewBitmap(R.id.bar_session, BarRenderer.render(pct, pace?.markerPct, SESSION_FILL, pace?.tierColor))
-                    v.setTextViewText(R.id.tv_session_label,
-                        if (pace != null) PaceCalc.shortTag(apiData.fiveHourUtilization, pace) else formatReset(apiData.utilizationResetAtEpoch))
+                    v.setImageViewBitmap(R.id.bar_session, BarRenderer.render(pct, null, SESSION_FILL, null))
+                    v.setTextViewText(R.id.tv_session_label, formatReset(apiData.utilizationResetAtEpoch))
                 }
                 hasApiMessages -> {
                     val rem = apiData!!.effectiveRemaining
@@ -136,9 +143,8 @@ class ClaudeUsageWidget : AppWidgetProvider() {
                 val wPct = apiData!!.weeklyUtilization.toInt()
                 val pace = PaceCalc.compute(apiData.weeklyUtilization, apiData.weeklyResetAtEpoch, PaceCalc.WEEKLY_WINDOW_MS)
                 v.setTextViewText(R.id.tv_weekly_value, "$wPct%")
-                v.setImageViewBitmap(R.id.bar_weekly, BarRenderer.render(wPct, pace?.markerPct, WEEKLY_FILL, pace?.tierColor))
-                v.setTextViewText(R.id.tv_weekly_label,
-                    if (pace != null) PaceCalc.shortTag(apiData.weeklyUtilization, pace) else formatReset(apiData.weeklyResetAtEpoch))
+                v.setImageViewBitmap(R.id.bar_weekly, BarRenderer.render(wPct, pace?.markerPct, WEEKLY_FILL, if (pace != null) MARKER_COLOR else null))
+                v.setTextViewText(R.id.tv_weekly_label, formatResetShort(apiData.weeklyResetAtEpoch))
             } else {
                 val weeklyDays = Integer.bitCount(prefs.getWeeklyMask())
                 v.setTextViewText(R.id.tv_weekly_value, "${weeklyDays}d")
@@ -184,10 +190,9 @@ class ClaudeUsageWidget : AppWidgetProvider() {
             when {
                 hasUtilization -> {
                     val pct = apiData!!.fiveHourUtilization.toInt()
-                    val pace = PaceCalc.compute(apiData.fiveHourUtilization, apiData.utilizationResetAtEpoch, PaceCalc.SESSION_WINDOW_MS)
                     v.setTextViewText(R.id.tv_session_value, "$pct%")
-                    v.setImageViewBitmap(R.id.bar_session, BarRenderer.render(pct, pace?.markerPct, SESSION_FILL, pace?.tierColor))
-                    v.setTextViewText(R.id.tv_session_label, resetWithPace(apiData.utilizationResetAtEpoch, apiData.fiveHourUtilization, pace))
+                    v.setImageViewBitmap(R.id.bar_session, BarRenderer.render(pct, null, SESSION_FILL, null))
+                    v.setTextViewText(R.id.tv_session_label, formatReset(apiData.utilizationResetAtEpoch))
                 }
                 hasApiMessages -> {
                     val rem = apiData!!.effectiveRemaining
@@ -218,8 +223,8 @@ class ClaudeUsageWidget : AppWidgetProvider() {
                 val wPct = apiData!!.weeklyUtilization.toInt()
                 val pace = PaceCalc.compute(apiData.weeklyUtilization, apiData.weeklyResetAtEpoch, PaceCalc.WEEKLY_WINDOW_MS)
                 v.setTextViewText(R.id.tv_weekly_value, "$wPct%")
-                v.setImageViewBitmap(R.id.bar_weekly, BarRenderer.render(wPct, pace?.markerPct, WEEKLY_FILL, pace?.tierColor))
-                v.setTextViewText(R.id.tv_weekly_label, resetWithPace(apiData.weeklyResetAtEpoch, apiData.weeklyUtilization, pace))
+                v.setImageViewBitmap(R.id.bar_weekly, BarRenderer.render(wPct, pace?.markerPct, WEEKLY_FILL, if (pace != null) MARKER_COLOR else null))
+                v.setTextViewText(R.id.tv_weekly_label, formatResetDay(apiData.weeklyResetAtEpoch))
             } else {
                 val weeklyDays = Integer.bitCount(prefs.getWeeklyMask())
                 v.setTextViewText(R.id.tv_weekly_value, "$weeklyDays d")
@@ -249,6 +254,7 @@ class ClaudeUsageWidget : AppWidgetProvider() {
 
         private const val SESSION_FILL = 0xFFCC785C.toInt()
         private const val WEEKLY_FILL = 0xFF7B8FCC.toInt()
+        private const val MARKER_COLOR = 0xFFFFFFFF.toInt()   // single-color pace marker (weekly only)
 
         /** Tints the header burst icon and (optionally) the PEAK text by current peak state. */
         private fun applyPeak(v: RemoteViews, showText: Boolean) {
@@ -260,14 +266,6 @@ class ClaudeUsageWidget : AppWidgetProvider() {
             }
         }
 
-        /** "Resets at 3:00 PM · 8% under pace" — reset line with the pace tag appended. */
-        private fun resetWithPace(resetEpoch: Long, usedPct: Float, pace: PaceCalc.Pace?): CharSequence {
-            val reset = formatReset(resetEpoch)
-            if (pace == null) return reset
-            val tag = PaceCalc.shortTag(usedPct, pace)
-            return if (reset.isBlank()) tag else "$reset · $tag"
-        }
-
         private fun formatReset(epochMs: Long): String {
             if (epochMs <= 0) return ""
             val now = System.currentTimeMillis()
@@ -281,6 +279,23 @@ class ClaudeUsageWidget : AppWidgetProvider() {
             }
         }
 
+        /** Weekly reset with weekday + date ("Resets Friday, Jun 6 · 3:00 PM"), never "tomorrow". */
+        private fun formatResetDay(epochMs: Long): String {
+            if (epochMs <= 0) return ""
+            if (epochMs <= System.currentTimeMillis()) return "Resets soon"
+            val day = SimpleDateFormat("EEEE", Locale.US).format(Date(epochMs))
+            val date = SimpleDateFormat("MMM d", Locale.US).format(Date(epochMs))
+            val timeStr = SimpleDateFormat("h:mm a", Locale.US).format(Date(epochMs))
+            return "Resets $day, $date · $timeStr"
+        }
+
+        /** Compact weekly reset for the space-tight small widget: "Fri, Jun 6". */
+        private fun formatResetShort(epochMs: Long): String {
+            if (epochMs <= 0) return ""
+            if (epochMs <= System.currentTimeMillis()) return "soon"
+            return SimpleDateFormat("EEE, MMM d", Locale.US).format(Date(epochMs))
+        }
+
         private fun formatTime(ms: Long) =
             SimpleDateFormat("h:mm a", Locale.US).format(Date(ms))
     }

app/src/main/java/me/khodak/claudeusage/HistoryChartView.kt

@@ -0,0 +1,131 @@
+package me.khodak.claudeusage
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.util.AttributeSet
+import android.view.View
+import me.khodak.claudeusage.data.UsageSnapshot
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/**
+ * Lightweight line chart for usage history, hand-drawn on Canvas to stay dependency-free
+ * and consistent with [BarRenderer]. Plots session (orange) and weekly (blue) utilization
+ * 0-100% over time. Gaps longer than [GAP_MS] are not connected, so an offline stretch
+ * shows as a break rather than a misleading straight line.
+ */
+class HistoryChartView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0
+) : View(context, attrs, defStyle) {
+
+    private var points: List<UsageSnapshot> = emptyList()
+
+    private val gridPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = 0xFF2A2A2A.toInt(); strokeWidth = dp(1f); style = Paint.Style.STROKE
+    }
+    private val labelPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = 0xFF666666.toInt(); textSize = sp(10f)
+    }
+    private val sessionPaint = linePaint(0xFFCC785C.toInt())
+    private val weeklyPaint = linePaint(0xFF7B8FCC.toInt())
+    private val emptyPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = 0xFF666666.toInt(); textSize = sp(13f); textAlign = Paint.Align.CENTER
+    }
+
+    private val padL = dp(28f)
+    private val padR = dp(8f)
+    private val padT = dp(10f)
+    private val padB = dp(18f)
+
+    fun setData(data: List<UsageSnapshot>) {
+        points = data
+        invalidate()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        val left = padL
+        val top = padT
+        val right = width - padR
+        val bottom = height - padB
+        if (right <= left || bottom <= top) return
+
+        // Y gridlines + labels at 0 / 50 / 100%
+        for (pct in intArrayOf(0, 50, 100)) {
+            val y = bottom - (pct / 100f) * (bottom - top)
+            canvas.drawLine(left, y, right, y, gridPaint)
+            canvas.drawText("$pct", dp(4f), y + sp(3.5f), labelPaint)
+        }
+
+        val plottable = points.filter { it.sessionPct >= 0f || it.weeklyPct >= 0f }
+        if (plottable.size < 2) {
+            canvas.drawText(
+                "Collecting history… check back later",
+                (left + right) / 2f, (top + bottom) / 2f, emptyPaint
+            )
+            return
+        }
+
+        val tMin = plottable.first().epochMs
+        val tMax = plottable.last().epochMs
+        val tSpan = (tMax - tMin).coerceAtLeast(1L)
+
+        fun x(ms: Long) = left + (ms - tMin).toFloat() / tSpan * (right - left)
+        fun y(pct: Float) = bottom - (pct / 100f) * (bottom - top)
+
+        drawSeries(canvas, plottable, sessionPaint, ::x, ::y) { it.sessionPct }
+        drawSeries(canvas, plottable, weeklyPaint, ::x, ::y) { it.weeklyPct }
+
+        // X axis time labels (start … end)
+        val fmt = SimpleDateFormat("MMM d, h a", Locale.US)
+        labelPaint.textAlign = Paint.Align.LEFT
+        canvas.drawText(fmt.format(Date(tMin)), left, height - dp(4f), labelPaint)
+        labelPaint.textAlign = Paint.Align.RIGHT
+        canvas.drawText(fmt.format(Date(tMax)), right, height - dp(4f), labelPaint)
+        labelPaint.textAlign = Paint.Align.LEFT
+    }
+
+    private inline fun drawSeries(
+        canvas: Canvas,
+        data: List<UsageSnapshot>,
+        paint: Paint,
+        x: (Long) -> Float,
+        y: (Float) -> Float,
+        value: (UsageSnapshot) -> Float
+    ) {
+        val path = Path()
+        var penDown = false
+        var prevMs = 0L
+        for (p in data) {
+            val v = value(p)
+            if (v < 0f) { penDown = false; continue }
+            val px = x(p.epochMs); val py = y(v)
+            if (!penDown || p.epochMs - prevMs > GAP_MS) {
+                path.moveTo(px, py)
+            } else {
+                path.lineTo(px, py)
+            }
+            penDown = true
+            prevMs = p.epochMs
+        }
+        canvas.drawPath(path, paint)
+    }
+
+    private fun linePaint(c: Int) = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = c; strokeWidth = dp(2f); style = Paint.Style.STROKE
+        strokeJoin = Paint.Join.ROUND; strokeCap = Paint.Cap.ROUND
+    }
+
+    private fun dp(v: Float) = v * resources.displayMetrics.density
+    private fun sp(v: Float) = v * resources.displayMetrics.scaledDensity
+
+    companion object {
+        // Don't connect points separated by more than ~35 min (a missed refresh cycle or two).
+        private const val GAP_MS = 35 * 60 * 1000L
+    }
+}

app/src/main/java/me/khodak/claudeusage/MainActivity.kt

@@ -1,10 +1,18 @@
 package me.khodak.claudeusage
 
+import android.Manifest
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import me.khodak.claudeusage.data.PreferencesManager
 import me.khodak.claudeusage.data.UsageData
@@ -19,6 +27,12 @@ class MainActivity : AppCompatActivity() {
     private lateinit var prefs: PreferencesManager
     private lateinit var repo: UsageRepository
 
+    private val notifPermLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestPermission()) { /* result handled silently */ }
+
+    /** Live refresh loop that runs only while the app is in the foreground. */
+    private var autoRefreshJob: Job? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
@@ -51,6 +65,8 @@ class MainActivity : AppCompatActivity() {
             })
         }
 
+        setupNotificationSettings()
+
         binding.btnDebug.setOnClickListener {
             if (binding.tvDebugInfo.visibility == android.view.View.GONE) {
                 binding.tvDebugInfo.text = repo.lastDebugInfo.ifBlank { "No debug info yet — tap Refresh first" }
@@ -65,32 +81,101 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        val cached = prefs.getUsageData()
-        updateUI(cached)
-        if (prefs.isLoggedIn()) {
-            val staleMs = 5 * 60 * 1000L
-            if ((cached?.lastUpdated ?: 0L) < System.currentTimeMillis() - staleMs) {
-                refreshUsage()
+        updateUI(prefs.getUsageData())  // show cached instantly — never a blank screen
+        if (prefs.isLoggedIn()) startAutoRefresh()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        autoRefreshJob?.cancel()
+    }
+
+    /** Refresh immediately on open, then every [REFRESH_INTERVAL_MS] while foregrounded. */
+    private fun startAutoRefresh() {
+        autoRefreshJob?.cancel()
+        autoRefreshJob = lifecycleScope.launch {
+            while (isActive) {
+                doRefresh(silent = true)
+                delay(REFRESH_INTERVAL_MS)
             }
         }
     }
 
+    private fun setupNotificationSettings() {
+        binding.switchNotify.isChecked = prefs.isNotifyEnabled()
+        binding.sliderSession.value = prefs.getSessionThreshold().toFloat().coerceIn(50f, 100f)
+        binding.sliderWeekly.value = prefs.getWeeklyThreshold().toFloat().coerceIn(50f, 100f)
+        applyThresholdLabels()
+        applyNotifyControlsEnabled(prefs.isNotifyEnabled())
+
+        binding.switchNotify.setOnCheckedChangeListener { _, checked ->
+            prefs.setNotifyEnabled(checked)
+            applyNotifyControlsEnabled(checked)
+            if (checked) requestNotificationPermission()
+        }
+        binding.sliderSession.addOnChangeListener { _, value, _ ->
+            prefs.setSessionThreshold(value.toInt())
+            applyThresholdLabels()
+        }
+        binding.sliderWeekly.addOnChangeListener { _, value, _ ->
+            prefs.setWeeklyThreshold(value.toInt())
+            applyThresholdLabels()
+        }
+
+        // Alerts default on, so prompt for the runtime permission once on first launch
+        // (a user who never toggles the switch would otherwise never be asked).
+        if (prefs.isNotifyEnabled()) requestNotificationPermission()
+    }
+
+    private fun applyThresholdLabels() {
+        binding.tvSessionThreshLabel.text = "Session alert at ${prefs.getSessionThreshold()}%"
+        binding.tvWeeklyThreshLabel.text = "Weekly alert at ${prefs.getWeeklyThreshold()}%"
+    }
+
+    private fun applyNotifyControlsEnabled(enabled: Boolean) {
+        binding.sliderSession.isEnabled = enabled
+        binding.sliderWeekly.isEnabled = enabled
+        val alpha = if (enabled) 1f else 0.4f
+        binding.tvSessionThreshLabel.alpha = alpha
+        binding.tvWeeklyThreshLabel.alpha = alpha
+    }
+
+    private fun requestNotificationPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+            notifPermLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+        }
+    }
+
+    /** Manual "Refresh Now" button — shows the spinner. */
     private fun refreshUsage() {
+        lifecycleScope.launch { doRefresh(silent = false) }
+    }
+
+    private suspend fun doRefresh(silent: Boolean) {
+        if (!silent) {
             binding.btnRefresh.isEnabled = false
             binding.progressIndicator.visibility = View.VISIBLE
-        lifecycleScope.launch {
-            val data = try {
+        }
+        val fresh = try {
             repo.fetchUsage()
         } catch (e: Exception) {
             if (e is kotlinx.coroutines.CancellationException) throw e
-                prefs.getUsageData()?.copy(errorMessage = "Network error")
-                    ?: UsageData(errorMessage = "Network error")
+            UsageData(errorMessage = "Network error")
         }
-            prefs.saveUsageData(data)
-            updateUI(data)
+        // Preserve last-good data so a failed/partial fetch never blanks the UI or widget.
+        val merged = fresh.mergedWith(prefs.getUsageData())
+        prefs.saveUsageData(merged)
+        prefs.recordHistory(fresh)
+        Notifier.checkAndNotify(this, prefs, fresh)
+        updateUI(merged)
+        ClaudeUsageWidget.notifyDataChanged(this)  // opening the app refreshes the widget too
         if (binding.tvDebugInfo.visibility == View.VISIBLE) {
             binding.tvDebugInfo.text = repo.lastDebugInfo
         }
+        if (!silent) {
             binding.btnRefresh.isEnabled = true
             binding.progressIndicator.visibility = View.GONE
         }
@@ -113,31 +198,28 @@ class MainActivity : AppCompatActivity() {
         else
             "Off-peak · ${peak.windowLabel}"
 
-        // ── Session (5-hour) bar + pace ──────────────────────────────────────
-        val sessionPct = data.progressPercent
-        val sessionPace = if (data.fiveHourUtilization >= 0f)
-            PaceCalc.compute(data.fiveHourUtilization, data.utilizationResetAtEpoch, PaceCalc.SESSION_WINDOW_MS)
-        else null
+        // ── Session (5-hour) bar — no pace marker ────────────────────────────
         binding.barSession.setImageBitmap(
-            BarRenderer.render(sessionPct, sessionPace?.markerPct, SESSION_FILL, sessionPace?.tierColor)
+            BarRenderer.render(data.progressPercent, null, SESSION_FILL, null)
         )
-        binding.tvSessionPace.text = paceSentence(data.fiveHourUtilization, sessionPace)
 
-        // ── Weekly (7-day) bar + pace ────────────────────────────────────────
+        // ── Weekly (7-day) bar — single-color pace marker ────────────────────
         if (data.weeklyUtilization >= 0f) {
             val wPct = data.weeklyUtilization.toInt()
             val weeklyPace = PaceCalc.compute(data.weeklyUtilization, data.weeklyResetAtEpoch, PaceCalc.WEEKLY_WINDOW_MS)
             binding.barWeekly.setImageBitmap(
-                BarRenderer.render(wPct, weeklyPace?.markerPct, WEEKLY_FILL, weeklyPace?.tierColor)
+                BarRenderer.render(wPct, weeklyPace?.markerPct, WEEKLY_FILL, if (weeklyPace != null) MARKER_COLOR else null)
             )
             binding.tvWeeklyUsage.text = "$wPct% this week"
-            binding.tvWeeklyPace.text = paceSentence(data.weeklyUtilization, weeklyPace)
         } else {
             binding.barWeekly.setImageBitmap(BarRenderer.render(0, null, WEEKLY_FILL, null))
             binding.tvWeeklyUsage.text = "—"
-            binding.tvWeeklyPace.text = ""
         }
 
+        // Pace text removed per design — bars carry the signal.
+        binding.tvSessionPace.visibility = View.GONE
+        binding.tvWeeklyPace.visibility = View.GONE
+
         binding.tvUsage.text = when {
             data.fiveHourUtilization >= 0f -> {
                 val pct = data.fiveHourUtilization.toInt()
@@ -153,19 +235,15 @@ class MainActivity : AppCompatActivity() {
         }
 
         binding.tvReset.text = formatReset(data.effectiveResetEpoch)
-        binding.tvWeeklyReset.text = formatReset(data.weeklyResetAtEpoch)
+        binding.tvWeeklyReset.text = formatResetDay(data.weeklyResetAtEpoch)
         binding.tvUpdated.text = if (data.lastUpdated > 0)
             "Last updated: ${SimpleDateFormat("h:mm a, MMM d", Locale.US).format(Date(data.lastUpdated))}"
         else ""
 
         binding.tvError.text = data.errorMessage
         binding.tvError.visibility = if (data.errorMessage.isNotBlank()) View.VISIBLE else View.GONE
-    }
 
-    /** "20% over pace · will likely hit limit" — empty when no projection is available yet. */
-    private fun paceSentence(usedPct: Float, pace: PaceCalc.Pace?): String {
-        if (pace == null) return ""
-        return "${PaceCalc.shortTag(usedPct, pace)} · ${pace.label}"
+        binding.historyChart.setData(prefs.getHistory())
     }
 
     private fun formatReset(epochMs: Long): String {
@@ -181,9 +259,21 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    /** Weekly reset shown with the weekday name ("Resets Friday 3:00 PM"), never "tomorrow". */
+    private fun formatResetDay(epochMs: Long): String {
+        if (epochMs <= 0) return ""
+        if (epochMs <= System.currentTimeMillis()) return "Resets soon"
+        val day = SimpleDateFormat("EEEE", Locale.US).format(Date(epochMs))
+        val date = SimpleDateFormat("MMM d", Locale.US).format(Date(epochMs))
+        val timeStr = SimpleDateFormat("h:mm a", Locale.US).format(Date(epochMs))
+        return "Resets $day, $date · $timeStr"
+    }
+
     companion object {
+        private const val REFRESH_INTERVAL_MS = 30_000L   // live refresh cadence while app is open
         private const val SESSION_FILL = 0xFFCC785C.toInt()
         private const val WEEKLY_FILL = 0xFF7B8FCC.toInt()
+        private const val MARKER_COLOR = 0xFFFFFFFF.toInt()   // single-color weekly pace marker
         private const val PEAK_ON = 0xFFCC785C.toInt()
         private const val PEAK_OFF = 0xFF666666.toInt()
     }

app/src/main/java/me/khodak/claudeusage/Notifier.kt

@@ -0,0 +1,115 @@
+package me.khodak.claudeusage
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import me.khodak.claudeusage.data.PreferencesManager
+import me.khodak.claudeusage.data.UsageData
+
+/**
+ * Posts a notification when session or weekly utilization crosses the user's threshold.
+ * Each metric fires at most once per limit window: we remember the reset-epoch we alerted
+ * for, and only re-arm when that window rolls over (epoch changes) — so the user isn't
+ * pinged every 5 minutes while sitting above the line.
+ */
+object Notifier {
+
+    private const val CHANNEL_ID = "usage_alerts"
+    private const val SESSION_NOTIF_ID = 2001
+    private const val WEEKLY_NOTIF_ID = 2002
+
+    fun checkAndNotify(context: Context, prefs: PreferencesManager, data: UsageData) {
+        if (!prefs.isNotifyEnabled()) return
+        val mgr = NotificationManagerCompat.from(context)
+        if (!mgr.areNotificationsEnabled()) return  // OS-level or runtime permission off
+        ensureChannel(context)
+
+        val session = data.fiveHourUtilization
+        if (session >= 0f) {
+            maybeFire(
+                context, mgr, prefs,
+                key = "session",
+                util = session.toInt(),
+                threshold = prefs.getSessionThreshold(),
+                resetEpoch = data.effectiveResetEpoch,
+                notifId = SESSION_NOTIF_ID,
+                title = "Session usage at ${session.toInt()}%",
+                body = "Your current 5-hour window is nearly used up."
+            )
+        }
+
+        val weekly = data.weeklyUtilization
+        if (weekly >= 0f) {
+            maybeFire(
+                context, mgr, prefs,
+                key = "weekly",
+                util = weekly.toInt(),
+                threshold = prefs.getWeeklyThreshold(),
+                resetEpoch = data.weeklyResetAtEpoch,
+                notifId = WEEKLY_NOTIF_ID,
+                title = "Weekly usage at ${weekly.toInt()}%",
+                body = "You're approaching your weekly Claude limit."
+            )
+        }
+    }
+
+    private fun maybeFire(
+        context: Context,
+        mgr: NotificationManagerCompat,
+        prefs: PreferencesManager,
+        key: String,
+        util: Int,
+        threshold: Int,
+        resetEpoch: Long,
+        notifId: Int,
+        title: String,
+        body: String
+    ) {
+        if (util < threshold) return
+        // Already alerted for this exact window? Skip. (resetEpoch<=0 means "unknown window" —
+        // fall back to a coarse marker so we still alert once instead of never.)
+        val windowMarker = if (resetEpoch > 0) resetEpoch else 1L
+        if (prefs.getNotifiedResetEpoch(key) == windowMarker) return
+
+        val notif = NotificationCompat.Builder(context, CHANNEL_ID)
+            .setSmallIcon(R.drawable.ic_claude_burst)
+            .setContentTitle(title)
+            .setContentText(body)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setAutoCancel(true)
+            .setContentIntent(openAppIntent(context))
+            .build()
+
+        try {
+            mgr.notify(notifId, notif)
+            prefs.setNotifiedResetEpoch(key, windowMarker)
+        } catch (_: SecurityException) {
+            // Notifications revoked between the check and post — nothing to do.
+        }
+    }
+
+    private fun ensureChannel(context: Context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+        val mgr = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (mgr.getNotificationChannel(CHANNEL_ID) != null) return
+        mgr.createNotificationChannel(
+            NotificationChannel(
+                CHANNEL_ID, "Usage alerts", NotificationManager.IMPORTANCE_DEFAULT
+            ).apply { description = "Alerts when you approach your Claude usage limits" }
+        )
+    }
+
+    private fun openAppIntent(context: Context): PendingIntent {
+        val intent = Intent(context, MainActivity::class.java)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        return PendingIntent.getActivity(
+            context, 0, intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+    }
+}

app/src/main/java/me/khodak/claudeusage/PaceCalc.kt

@@ -62,14 +62,4 @@ object PaceCalc {
         }
         return Pace(markerPct, projected, color, label)
     }
-
-    /** Short tag for the widget reset line, e.g. "8% under pace" / "20% over pace" / "on pace". */
-    fun shortTag(usedPct: Float, pace: Pace): String {
-        val delta = usedPct.toInt() - pace.markerPct
-        return when {
-            delta >= 2 -> "$delta% over pace"
-            delta <= -2 -> "${-delta}% under pace"
-            else -> "on pace"
-        }
-    }
 }

app/src/main/java/me/khodak/claudeusage/UsageRepository.kt

@@ -55,6 +55,7 @@ class UsageRepository(private val prefs: PreferencesManager) {
         if (orgId == null) return@withContext base.copy(errorMessage = "Can't reach claude.ai")
 
         if (orgUsageData?.hasRateLimitData == true) {
+            prefs.resetAuthFailCount()
             return@withContext base.copy(
                 messagesUsed = orgUsageData.messagesUsed,
                 messagesLimit = orgUsageData.messagesLimit,
@@ -77,6 +78,7 @@ class UsageRepository(private val prefs: PreferencesManager) {
             if (BuildConfig.DEBUG) debugBuf.append("$usageUrl\n→ $code: ${body.take(400)}\n\n")
             val utilData = tryParseUtilizationBody(body)
             if (utilData != null) {
+                prefs.resetAuthFailCount()
                 return@withContext base.copy(
                     fiveHourUtilization = utilData.fiveHourUtilization,
                     weeklyUtilization = utilData.weeklyUtilization,
@@ -102,9 +104,14 @@ class UsageRepository(private val prefs: PreferencesManager) {
                 if (BuildConfig.DEBUG) Log.d(TAG, "GET $url → $code")
 
                 if (code == 401 || code == 403) {
+                    if (prefs.incAuthFailCount() >= AUTH_FAIL_LIMIT) {
                         prefs.clearSession()
+                        prefs.resetAuthFailCount()
                         return@withContext UsageData(errorMessage = "Session expired — please sign in again")
                     }
+                    // Transient auth failure — keep showing last-good data instead of logging out.
+                    return@withContext base
+                }
 
                 val rateLimitData = extractRateLimitHeaders(resp.headers)
                 val body = resp.body?.string() ?: ""
@@ -341,5 +348,8 @@ class UsageRepository(private val prefs: PreferencesManager) {
 
     companion object {
         private const val TAG = "UsageRepo"
+        // Clear the session only after this many consecutive 401/403s, so one transient
+        // auth failure (Cloudflare challenge, brief edge hiccup) doesn't sign the user out.
+        private const val AUTH_FAIL_LIMIT = 3
     }
 }

app/src/main/java/me/khodak/claudeusage/UsageUpdateWorker.kt

@@ -31,7 +31,10 @@ class UsageUpdateWorker(
             val animJob = launch { rotateRefreshIcon() }
             try {
                 val data = UsageRepository(prefs).fetchUsage()
-                prefs.saveUsageData(data)
+                // Preserve last-good data so a failed/partial fetch never blanks the widget.
+                prefs.saveUsageData(data.mergedWith(prefs.getUsageData()))
+                prefs.recordHistory(data)           // history records only fresh readings
+                Notifier.checkAndNotify(context, prefs, data)
             } catch (_: Exception) {}
             animJob.cancel()
             animJob.join()

app/src/main/java/me/khodak/claudeusage/data/PreferencesManager.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
 import java.util.Calendar
 
 class PreferencesManager(context: Context) {
@@ -73,6 +74,73 @@ class PreferencesManager(context: Context) {
 
     fun isLoggedIn(): Boolean = !getCookies().isNullOrBlank()
 
+    // Consecutive 401/403 counter — we only clear the session after several in a row, so a
+    // single transient auth failure (e.g. a Cloudflare challenge) doesn't log the user out.
+    fun getAuthFailCount(): Int = prefs.getInt(KEY_AUTH_FAILS, 0)
+    fun incAuthFailCount(): Int {
+        val n = getAuthFailCount() + 1
+        prefs.edit().putInt(KEY_AUTH_FAILS, n).apply()
+        return n
+    }
+    fun resetAuthFailCount() {
+        if (getAuthFailCount() != 0) prefs.edit().putInt(KEY_AUTH_FAILS, 0).apply()
+    }
+
+    // ── Usage history (for the in-app chart) ─────────────────────────────────
+
+    /**
+     * Append a history point if [data] carries a real utilization reading.
+     * De-duplicates rapid double-fires (manual refresh + background worker landing
+     * together) by skipping points within [MIN_HISTORY_GAP_MS] of the last one, and
+     * prunes anything older than [HISTORY_RETENTION_MS] / beyond [MAX_HISTORY_POINTS].
+     */
+    fun recordHistory(data: UsageData) {
+        if (data.fiveHourUtilization < 0f && data.weeklyUtilization < 0f) return
+        val now = System.currentTimeMillis()
+        val history = getHistory().toMutableList()
+        if (history.isNotEmpty() && now - history.last().epochMs < MIN_HISTORY_GAP_MS) {
+            history.removeAt(history.size - 1) // collapse near-simultaneous readings
+        }
+        history.add(
+            UsageSnapshot(
+                epochMs = now,
+                sessionPct = data.fiveHourUtilization,
+                weeklyPct = data.weeklyUtilization
+            )
+        )
+        val cutoff = now - HISTORY_RETENTION_MS
+        val pruned = history.filter { it.epochMs >= cutoff }
+            .takeLast(MAX_HISTORY_POINTS)
+        prefs.edit().putString(KEY_HISTORY, gson.toJson(pruned)).apply()
+    }
+
+    fun getHistory(): List<UsageSnapshot> {
+        val json = prefs.getString(KEY_HISTORY, null) ?: return emptyList()
+        return try {
+            val type = object : TypeToken<List<UsageSnapshot>>() {}.type
+            gson.fromJson<List<UsageSnapshot>>(json, type) ?: emptyList()
+        } catch (e: Exception) { emptyList() }
+    }
+
+    // ── Notification settings ────────────────────────────────────────────────
+
+    fun isNotifyEnabled(): Boolean = prefs.getBoolean(KEY_NOTIFY_ENABLED, true)
+    fun setNotifyEnabled(v: Boolean) = prefs.edit().putBoolean(KEY_NOTIFY_ENABLED, v).apply()
+
+    fun getSessionThreshold(): Int = prefs.getInt(KEY_NOTIFY_SESSION_PCT, 90)
+    fun setSessionThreshold(pct: Int) = prefs.edit().putInt(KEY_NOTIFY_SESSION_PCT, pct).apply()
+
+    fun getWeeklyThreshold(): Int = prefs.getInt(KEY_NOTIFY_WEEKLY_PCT, 85)
+    fun setWeeklyThreshold(pct: Int) = prefs.edit().putInt(KEY_NOTIFY_WEEKLY_PCT, pct).apply()
+
+    /**
+     * Tracks the reset-epoch a metric was last notified for, so we alert at most once
+     * per limit window. When the window rolls over (reset epoch changes), it re-arms.
+     */
+    fun getNotifiedResetEpoch(key: String): Long = prefs.getLong("notified_$key", 0L)
+    fun setNotifiedResetEpoch(key: String, epoch: Long) =
+        prefs.edit().putLong("notified_$key", epoch).apply()
+
     companion object {
         private const val KEY_COOKIES = "session_cookies"
         private const val KEY_ORG_ID = "org_id"
@@ -80,6 +148,15 @@ class PreferencesManager(context: Context) {
         private const val KEY_USAGE_DATA = "usage_data"
         private const val KEY_ACTIVE_WEEK = "active_week"
         private const val KEY_ACTIVE_MASK = "active_mask"
+        private const val KEY_HISTORY = "usage_history"
+        private const val KEY_NOTIFY_ENABLED = "notify_enabled"
+        private const val KEY_NOTIFY_SESSION_PCT = "notify_session_pct"
+        private const val KEY_NOTIFY_WEEKLY_PCT = "notify_weekly_pct"
+        private const val KEY_AUTH_FAILS = "auth_fail_count"
+
+        private const val MIN_HISTORY_GAP_MS = 2 * 60 * 1000L      // collapse readings <2 min apart
+        private const val HISTORY_RETENTION_MS = 7 * 24 * 60 * 60 * 1000L  // keep 7 days
+        private const val MAX_HISTORY_POINTS = 600
 
         fun createSecurePrefs(context: Context, onFallback: (() -> Unit)? = null): android.content.SharedPreferences {
             return try {

app/src/main/java/me/khodak/claudeusage/data/UsageData.kt

@@ -49,4 +49,36 @@ data class UsageData(
         resetAtEpoch > 0 -> resetAtEpoch
         else -> -1L
     }
+
+    /** True if this fetch produced any usable usage reading at all. */
+    val hasAnyReading: Boolean get() =
+        fiveHourUtilization >= 0f || weeklyUtilization >= 0f || hasRateLimitData
+
+    /**
+     * Merge a fresh fetch over the last cached reading so a failed or partial refresh never
+     * blanks the widget. If this fetch got nothing usable, the whole previous snapshot is kept
+     * (with its original timestamp, so the footer shows the data's true age). Otherwise each
+     * metric this fetch didn't return falls back to the previous value.
+     */
+    fun mergedWith(previous: UsageData?): UsageData {
+        if (previous == null || !previous.hasAnyReading) return this
+        if (!hasAnyReading) {
+            // Keep last-good data; only carry this attempt's login/session context forward.
+            return previous.copy(
+                isLoggedIn = isLoggedIn,
+                sessionStartEpoch = if (sessionStartEpoch > 0) sessionStartEpoch else previous.sessionStartEpoch,
+                weeklyActiveDaysMask = if (weeklyActiveDaysMask != 0) weeklyActiveDaysMask else previous.weeklyActiveDaysMask
+            )
+        }
+        return copy(
+            fiveHourUtilization = if (fiveHourUtilization >= 0f) fiveHourUtilization else previous.fiveHourUtilization,
+            utilizationResetAtEpoch = if (fiveHourUtilization >= 0f) utilizationResetAtEpoch else previous.utilizationResetAtEpoch,
+            weeklyUtilization = if (weeklyUtilization >= 0f) weeklyUtilization else previous.weeklyUtilization,
+            weeklyResetAtEpoch = if (weeklyUtilization >= 0f) weeklyResetAtEpoch else previous.weeklyResetAtEpoch,
+            messagesLimit = if (messagesLimit > 0) messagesLimit else previous.messagesLimit,
+            messagesUsed = if (messagesUsed >= 0) messagesUsed else previous.messagesUsed,
+            messagesRemaining = if (messagesRemaining >= 0) messagesRemaining else previous.messagesRemaining,
+            resetAtEpoch = if (resetAtEpoch > 0) resetAtEpoch else previous.resetAtEpoch
+        )
+    }
 }

app/src/main/java/me/khodak/claudeusage/data/UsageSnapshot.kt

@@ -0,0 +1,11 @@
+package me.khodak.claudeusage.data
+
+/**
+ * A single point-in-time reading of usage, stored for the in-app history chart.
+ * Percentages are 0-100; -1 means "no reading for this metric at this time".
+ */
+data class UsageSnapshot(
+    val epochMs: Long = 0L,
+    val sessionPct: Float = -1f,
+    val weeklyPct: Float = -1f
+)

app/src/main/res/layout/activity_main.xml

@@ -229,6 +229,137 @@
 
             </LinearLayout>
 
+            <!-- History card -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@drawable/widget_background"
+                android:padding="20dp"
+                android:layout_marginTop="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="HISTORY"
+                    android:textColor="#888888"
+                    android:textSize="11sp"
+                    android:letterSpacing="0.1" />
+
+                <me.khodak.claudeusage.HistoryChartView
+                    android:id="@+id/historyChart"
+                    android:layout_width="match_parent"
+                    android:layout_height="140dp"
+                    android:layout_marginTop="12dp" />
+
+                <!-- Legend -->
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_vertical">
+
+                    <View
+                        android:layout_width="12dp"
+                        android:layout_height="3dp"
+                        android:background="#CC785C" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="6dp"
+                        android:layout_marginEnd="16dp"
+                        android:text="Session"
+                        android:textColor="#AAAAAA"
+                        android:textSize="12sp" />
+
+                    <View
+                        android:layout_width="12dp"
+                        android:layout_height="3dp"
+                        android:background="#7B8FCC" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="6dp"
+                        android:text="Weekly"
+                        android:textColor="#AAAAAA"
+                        android:textSize="12sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Notifications card -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:background="@drawable/widget_background"
+                android:padding="20dp"
+                android:layout_marginTop="16dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="USAGE ALERTS"
+                        android:textColor="#888888"
+                        android:textSize="11sp"
+                        android:letterSpacing="0.1" />
+
+                    <com.google.android.material.switchmaterial.SwitchMaterial
+                        android:id="@+id/switchNotify"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tvSessionThreshLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="14dp"
+                    android:text="Session alert at 90%"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp" />
+
+                <com.google.android.material.slider.Slider
+                    android:id="@+id/sliderSession"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:valueFrom="50"
+                    android:valueTo="100"
+                    android:stepSize="5"
+                    android:value="90" />
+
+                <TextView
+                    android:id="@+id/tvWeeklyThreshLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="Weekly alert at 85%"
+                    android:textColor="#FFFFFF"
+                    android:textSize="14sp" />
+
+                <com.google.android.material.slider.Slider
+                    android:id="@+id/sliderWeekly"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:valueFrom="50"
+                    android:valueTo="100"
+                    android:stepSize="5"
+                    android:value="85" />
+
+            </LinearLayout>
+
             <Button
                 android:id="@+id/btnRefresh"
                 android:layout_width="match_parent"