DrankCounter: Add initial app codebase

.github/workflows/drankcounter-release.yml

@@ -0,0 +1,40 @@
+name: drankcounter-release
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: write
+
+jobs:
+  drankcounter-release:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install bob
+        run: cargo install --git https://github.com/bplaat/crates.git bob
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          cmdline-tools-version: 14742923
+      - name: Build release
+        working-directory: bin/drankcounter
+        run: |
+          export JAVA_HOME=$JAVA_HOME_21_X64
+          export PATH=$JAVA_HOME/bin:$PATH
+          echo "${{ secrets.DRANKCOUNTER_KEYSTORE }}" | base64 --decode > keystore.jks
+          bob build --release
+      - name: Create Git tag and GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: bin/drankcounter
+        run: |
+          TAG_VERSION=$(sed -nE 's/^[[:space:]]*version[[:space:]]*=[[:space:]]*"([^"]+)".*/\1/p' bob.toml)
+          gh release create "drankcounter/v${TAG_VERSION}" \
+            --title "DrankCounter v${TAG_VERSION}" \
+            --notes "Download the \`.apk\` file and open it to install the application" \
+            target/release/drankcounter-${TAG_VERSION}.apk

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2025 Bastiaan van der Plaat
+Copyright (c) 2018-2026 Bastiaan van der Plaat
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -31,26 +31,26 @@ A collection of various Android apps that I created for myself and others
 </a>
 </td>
 <td width="120" align="center">
+<a href="bin/drankcounter/">
+    <img src="bin/drankcounter/docs/images/icon.svg" alt="DrankCounter icon" width="48" height="48"/><br/>
+    DrankCounter
+</a>
+</td>
+</tr>
+<tr>
+<td width="120" align="center">
 <a href="bin/hackernews/">
     <img src="bin/hackernews/docs/images/icon.svg" alt="HackerNews icon" width="48" height="48"/><br/>
     HackerNews
 </a>
 </td>
-</tr>
-<tr>
 <td width="120" align="center">
 <a href="bin/nos/">
     <img src="bin/nos/docs/images/icon.svg" alt="NOS icon" width="48" height="48"/><br/>
     NOS
 </a>
 </td>
 <td width="120" align="center">
-<a href="bin/reacttest/">
-    <img src="bin/bassietest/docs/images/icon.svg" alt="ReactTest icon" width="48" height="48"/><br/>
-    ReactTest
-</a>
-</td>
-<td width="120" align="center">
 <a href="bin/redsquare/">
     <img src="bin/redsquare/docs/images/icon.svg" alt="RedSquare icon" width="48" height="48"/><br/>
     RedSquare
@@ -75,6 +75,7 @@ A collection of various Android apps that I created for myself and others
 - [BassieTest](bin/bassietest/) A example test app for the bob build tool and sandbox for some ideas
 - [Bible](bin/bible/) An offline Android Bible app containing multiple bible translations
 - [CoinList](bin/coinlist/) A cryptocurrency information app similar to the [coinlist](https://github.com/bplaat/coinlist) website
+- [DrankCounter](bin/drankcounter/) A basic alcohol tracker app with home screen widget
 - [HackerNews](bin/hackernews/) A simple [HackerNews](https://news.ycombinator.com/) webview app because installed PWA's suck sadly
 - [NOS](bin/nos/) A simple sync-once [NOS](https://nos.nl/) feed reader app
 - [ReactTest](bin/reacttest/) A test app for the [ReactDroid](lib/reactdroid/) library
@@ -102,6 +103,6 @@ A collection of various Android apps that I created for myself and others
 
 ## License
 
-Copyright © 2018-2025 [Bastiaan van der Plaat](https://github.com/bplaat)
+Copyright © 2018-2026 [Bastiaan van der Plaat](https://github.com/bplaat)
 
 Licensed under the [MIT](LICENSE) license.

bin/drankcounter/AndroidManifest.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="nl.plaatsoft.drankcounter">
+
+    <application android:allowBackup="true"
+        android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
+        android:theme="@style/Theme.App"
+        android:enableOnBackInvokedCallback="true">
+
+        <activity android:name=".activities.MainActivity"
+            android:launchMode="singleTask"
+            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden"
+            android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".activities.SettingsActivity"
+            android:parentActivityName=".activities.MainActivity"
+            android:launchMode="singleTop"
+            android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden"
+            android:exported="false" />
+
+        <receiver android:name=".WidgetProvider" android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/widget_drankcounter" />
+        </receiver>
+    </application>
+</manifest>

bin/drankcounter/README.md

@@ -0,0 +1,3 @@
+# DrankCounter Android App
+
+A basic alcohol tracker app with home screen widget

bin/drankcounter/bob.toml

@@ -0,0 +1,12 @@
+[package]
+name = "drankcounter"
+id = "nl.plaatsoft.drankcounter"
+version = "1.0.0"
+
+[dependencies]
+alerts = { path = "../../lib/alerts" }
+compat = { path = "../../lib/compat" }
+jspecify = { maven = "org.jspecify:jspecify:1.0.0" }
+
+[package.metadata.android]
+main_activity = ".activities.MainActivity"

bin/drankcounter/res/drawable-anydpi/ic_account_supervisor.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M16.5,12A2.5,2.5 0 0,0 19,9.5A2.5,2.5 0 0,0 16.5,7A2.5,2.5 0 0,0 14,9.5A2.5,2.5 0 0,0 16.5,12M9,11A3,3 0 0,0 12,8A3,3 0 0,0 9,5A3,3 0 0,0 6,8A3,3 0 0,0 9,11M16.5,14C14.67,14 11,14.92 11,16.75V19H22V16.75C22,14.92 18.33,14 16.5,14M9,13C6.67,13 2,14.17 2,16.5V19H9V16.75C9,15.9 9.33,14.41 11.37,13.28C10.5,13.1 9.66,13 9,13Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_arrow_left.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_cup.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M18.32,8H5.67L5.23,4H18.77M3,2L5,20.23C5.13,21.23 5.97,22 7,22H17C18,22 18.87,21.23 19,20.23L21,2H3Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_cup_white.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#ffffff" android:pathData="M18.32,8H5.67L5.23,4H18.77M3,2L5,20.23C5.13,21.23 5.97,22 7,22H17C18,22 18.87,21.23 19,20.23L21,2H3Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_dots_vertical.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_glass_mug.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M10,4V7H18V4H10M8,2H20L21,2V3L20,4V20L21,21V22H20L8,22H7V21L8,20V18.6L4.2,16.83C3.5,16.5 3,15.82 3,15V8A2,2 0 0,1 5,6H8V4L7,3V2H8M5,15L8,16.39V8H5V15Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_glass_mug_white.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#ffffff" android:pathData="M10,4V7H18V4H10M8,2H20L21,2V3L20,4V20L21,21V22H20L8,22H7V21L8,20V18.6L4.2,16.83C3.5,16.5 3,15.82 3,15V8A2,2 0 0,1 5,6H8V4L7,3V2H8M5,15L8,16.39V8H5V15Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_glass_wine.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M15.5,21.27L14.66,21.18C13.9,21.11 13.25,20.6 13,19.87C12.47,17.91 12.47,15.83 13,13.87C15.32,13.4 17,11.37 17,9C17,7 15,2 15,2H9C9,2 7,7 7,9C7,11.38 8.67,13.42 11,13.9C11.53,15.86 11.53,17.94 11,19.9C10.76,20.62 10.12,21.13 9.37,21.21L8.5,21.3C8.5,21.3 8,21.28 8,22H16C16,21.28 15.5,21.27 15.5,21.27M9.44,7L10.44,4H13.56L14.56,7H9.44Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_glass_wine_white.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#ffffff" android:pathData="M15.5,21.27L14.66,21.18C13.9,21.11 13.25,20.6 13,19.87C12.47,17.91 12.47,15.83 13,13.87C15.32,13.4 17,11.37 17,9C17,7 15,2 15,2H9C9,2 7,7 7,9C7,11.38 8.67,13.42 11,13.9C11.53,15.86 11.53,17.94 11,19.9C10.76,20.62 10.12,21.13 9.37,21.21L8.5,21.3C8.5,21.3 8,21.28 8,22H16C16,21.28 15.5,21.27 15.5,21.27M9.44,7L10.44,4H13.56L14.56,7H9.44Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_information.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M13,9H11V7H13M13,17H11V11H13M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_invert_colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M12,19.58V19.58C10.4,19.58 8.89,18.96 7.76,17.83C6.62,16.69 6,15.19 6,13.58C6,12 6.62,10.47 7.76,9.34L12,5.1M17.66,7.93L12,2.27V2.27L6.34,7.93C3.22,11.05 3.22,16.12 6.34,19.24C7.9,20.8 9.95,21.58 12,21.58C14.05,21.58 16.1,20.8 17.66,19.24C20.78,16.12 20.78,11.05 17.66,7.93Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_launcher_foreground.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="24" android:viewportHeight="24">
+    <group android:translateX="7.2" android:translateY="7.2" android:scaleX="0.4" android:scaleY="0.4">
+        <path android:fillColor="#fff" android:pathData="M3 14C3 15.3 3.8 16.4 5 16.8V20H3V22H9V20H7V16.8C8.2 16.4 9 15.3 9 14V6H3V14M5 8H7V11H5V8M20.6 8.5L19.6 8.2C19.3 8.1 19 7.7 19 7.3V3C19 2.5 18.5 2 18 2H15C14.4 2 14 2.5 14 3V7.3C14 7.7 13.7 8.1 13.3 8.3L12.4 8.6C11.6 8.9 11 9.6 11 10.5V20C11 21.1 11.9 22 13 22H20C21.1 22 22 21.1 22 20V10.4C22 9.6 21.5 8.8 20.6 8.5M16 4H17V5H16V4M13 10.4L13.9 10.1C15.2 9.7 16 8.6 16 7.3V7H17V7.3C17 8.6 17.8 9.7 19 10.1L20 10.4V12H13V10.4M20 20H13V18H20V20Z"/>
+    </group>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_plus.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_share_variant.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19A2.92,2.92 0 0,0 18,16.08Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_star.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z"/>
+</vector>

bin/drankcounter/res/drawable-anydpi/ic_web.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="@color/icon_color" android:pathData="M16.36,14C16.44,13.34 16.5,12.68 16.5,12C16.5,11.32 16.44,10.66 16.36,10H19.74C19.9,10.64 20,11.31 20,12C20,12.69 19.9,13.36 19.74,14M14.59,19.56C15.19,18.45 15.65,17.25 15.97,16H18.92C17.96,17.65 16.43,18.93 14.59,19.56M14.34,14H9.66C9.56,13.34 9.5,12.68 9.5,12C9.5,11.32 9.56,10.65 9.66,10H14.34C14.43,10.65 14.5,11.32 14.5,12C14.5,12.68 14.43,13.34 14.34,14M12,19.96C11.17,18.76 10.5,17.43 10.09,16H13.91C13.5,17.43 12.83,18.76 12,19.96M8,8H5.08C6.03,6.34 7.57,5.06 9.4,4.44C8.8,5.55 8.35,6.75 8,8M5.08,16H8C8.35,17.25 8.8,18.45 9.4,19.56C7.57,18.93 6.03,17.65 5.08,16M4.26,14C4.1,13.36 4,12.69 4,12C4,11.31 4.1,10.64 4.26,10H7.64C7.56,10.66 7.5,11.32 7.5,12C7.5,12.68 7.56,13.34 7.64,14M12,4.03C12.83,5.23 13.5,6.57 13.91,8H10.09C10.5,6.57 11.17,5.23 12,4.03M18.92,8H15.97C15.65,6.75 15.19,5.55 14.59,4.44C16.43,5.07 17.96,6.34 18.92,8M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z"/>
+</vector>

bin/drankcounter/res/drawable/app_bar_icon_button_ripple.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight"
+    android:radius="24dp" />

bin/drankcounter/res/drawable/widget_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/widget_background_color" />
+    <corners android:radius="16dp" />
+</shape>

bin/drankcounter/res/layout-night/widget_drankcounter.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/WidgetContainer">
+
+    <LinearLayout android:id="@+id/widget_beer_button"
+        style="@style/WidgetDrinkButton">
+        <ImageView
+            android:src="@drawable/ic_glass_mug"
+            android:contentDescription="@string/main_add_beer"
+            style="@style/WidgetDrinkButtonIcon" />
+        <TextView android:id="@+id/widget_beer_count"
+            android:text="0"
+            style="@style/WidgetDrinkCount" />
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/widget_wine_button"
+        style="@style/WidgetDrinkButton">
+        <ImageView
+            android:src="@drawable/ic_glass_wine"
+            android:contentDescription="@string/main_add_wine"
+            style="@style/WidgetDrinkButtonIcon" />
+        <TextView android:id="@+id/widget_wine_count"
+            android:text="0"
+            style="@style/WidgetDrinkCount" />
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/widget_liqueur_button"
+        style="@style/WidgetDrinkButton">
+        <ImageView
+            android:src="@drawable/ic_cup"
+            android:contentDescription="@string/main_add_liqueur"
+            style="@style/WidgetDrinkButtonIcon" />
+        <TextView android:id="@+id/widget_liqueur_count"
+            android:text="0"
+            style="@style/WidgetDrinkCount" />
+    </LinearLayout>
+</LinearLayout>
+

bin/drankcounter/res/layout/activity_main.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Fill">
+
+    <LinearLayout style="@style/ActionBar">
+        <TextView android:text="@string/app_name"
+            style="@style/ActionBarTitle" />
+
+        <ImageButton android:id="@+id/main_options_menu_button"
+            android:src="@drawable/ic_dots_vertical"
+            style="@style/ActionBarIconButton" />
+    </LinearLayout>
+
+    <!-- Drink list with header and empty state overlay -->
+    <FrameLayout style="@style/MainContentArea">
+
+        <ListView android:id="@+id/main_drink_list"
+            style="@style/MainDrinkList" />
+
+        <TextView android:id="@+id/main_empty_list"
+            android:text="@string/main_empty_list"
+            style="@style/MainEmptyList" />
+    </FrameLayout>
+</LinearLayout>