Fix build issues and improve grayscale filter discoverability

.github/workflows/publish.yaml

@@ -60,50 +60,89 @@ jobs:
       - name: Determine version bump
         id: version
         run: |
-          # Get the latest tag
-          latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
-          echo "Latest tag: $latest_tag"
+          echo "Determining version bump..."
+
+          # Get the latest tag, or an empty string if none exist
+          echo "Checking for existing git tags..."
+          latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          echo "Latest tag (if any): $latest_tag"
+
+          # Determine the commit range for analysis
+          echo "Determining commit range for analysis..."
+          if [ -z "$latest_tag" ]; then
+            # No tags exist, so analyze all commits for the first release
+            commit_range="HEAD"
+            # Set a base version for the very first run
+            latest_version="0.0.0"
+            echo "No existing tags found, using base version: $latest_version"
+          else
+            # Analyze commits since the last tag
+            commit_range="$latest_tag..HEAD"
+            latest_version=${latest_tag#v}
+            echo "Found tag $latest_tag, extracted version: $latest_version"
+          fi
+          echo "Analyzing commits in range: $commit_range"
 
           # Parse semantic version
-          latest_version=${latest_tag#v}
-          IFS='.' read -r major minor patch <<< "$latest_version"
+          echo "Parsing version components from: $latest_version"
+          major=$(echo "$latest_version" | cut -d. -f1)
+          minor=$(echo "$latest_version" | cut -d. -f2)
+          patch=$(echo "$latest_version" | cut -d. -f3)
+          echo "Parsed version - Major: $major, Minor: $minor, Patch: $patch"
 
           # Default bump type based on conventional commits
           bump_type="patch"  # Default to patch
+          echo "Default bump type set to: $bump_type"
 
           # Check for force bump input
           if [ -n "${{ github.event.inputs.force-bump }}" ]; then
             bump_type="${{ github.event.inputs.force-bump }}"
+            echo "Force bump detected: $bump_type"
           else
-            # Get conventional commits since last tag
-            commits=$(git log $latest_tag..HEAD --pretty=format:"%s")
+            # Get conventional commits from the determined range
+            echo "Analyzing commit messages for conventional commit patterns..."
+            commits=$(git log $commit_range --pretty=format:"%s")
+            echo "Found $(echo "$commits" | wc -l) commits to analyze"
 
+            echo "Checking for feature commits..."
             if echo "$commits" | grep -q "^feat\|^feat("; then
               bump_type="minor"
+              echo "Feature commit detected. Bumping to minor version."
             fi
 
+            echo "Checking for breaking changes..."
             if echo "$commits" | grep -q "^BREAKING CHANGE\|^feat!:\|^fix!:"; then
               bump_type="major"
+              echo "Breaking change detected. Bumping to major version."
             fi
           fi
 
+          echo "Final bump type determined: $bump_type"
+
           # Increment version based on bump type
+          echo "Incrementing version numbers..."
           if [ "$bump_type" = "patch" ]; then
-            ((patch++))
+            echo "Incrementing patch version from $patch to $((patch + 1))"
+            patch=$((patch + 1))
           elif [ "$bump_type" = "minor" ]; then
+            echo "Incrementing minor version from $minor to $((minor + 1)) and resetting patch to 0"
             minor=$((minor + 1))
             patch=0
           elif [ "$bump_type" = "major" ]; then
+            echo "Incrementing major version from $major to $((major + 1)) and resetting minor/patch to 0"
             major=$((major + 1))
             minor=0
             patch=0
           fi
 
           # Calculate version code (e.g., 10203 for 1.2.3)
+          echo "Calculating version code..."
           version_code=$((major * 10000 + minor * 100 + patch))
+          echo "Calculated version code: $version_code"
 
           # Set outputs
           new_version="$major.$minor.$patch"
+          echo "Setting environment variables..."
           echo "NEW_VERSION=$new_version" >> $GITHUB_ENV
           echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
           echo "BUMP_TYPE=$bump_type" >> $GITHUB_ENV
@@ -169,15 +208,15 @@ jobs:
           fi
 
           # Handle Features
-          features=$(git log v2.0.6..HEAD --pretty=format:"%s" | grep -E "^feat(\(.*\))?:" | sed -E "s/^feat(\(.*\))?: //" | sed 's/^/- /' || true)
+          features=$(git log $git_range --pretty=format:"%s" | grep -E "^feat(\(.*\))?:" | sed -E "s/^feat(\(.*\))?: //" | sed 's/^/- /' || true)
               if [ -n "$features" ]; then
                 echo "✨ New Features" >> "$changelog_file"
                 echo "$features" >> "$changelog_file"
                 echo "" >> "$changelog_file"
               fi
 
           # Handle Bug Fixes
-          fixes=$(git log v2.0.6..HEAD --pretty=format:"%s" | grep -E "^fix(\(.*\))?:" | sed -E "s/^fix(\(.*\))?: //" | sed 's/^/- /' || true)
+          fixes=$(git log $git_range --pretty=format:"%s" | grep -E "^fix(\(.*\))?:" | sed -E "s/^fix(\(.*\))?: //" | sed 's/^/- /' || true)
               if [ -n "$fixes" ]; then
                 echo "🐛 Bug Fixes" >> "$changelog_file"
                 echo "$fixes" >> "$changelog_file"
@@ -186,24 +225,21 @@ jobs:
 
               # Show the changelog
               cat "$changelog_file"
+
+      - name: Decode Keystore
+        run: echo "${{ secrets.SIGNING_KEY }}" | base64 --decode > release.keystore
 
-      - name: Build APK
+      - name: Build and Sign Release APK
         run: ./gradlew assembleRelease
-
-      - name: Sign APK
-        uses: ilharp/sign-android-release@nightly
-        id: sign_app
-        with:
-          releaseDir: app/build/outputs/apk/release
-          signingKey: ${{ secrets.SIGNING_KEY }}
-          keyAlias: ${{ secrets.KEY_ALIAS }}
-          keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
-          keyPassword: ${{ secrets.KEY_PASSWORD }}
-          buildToolsVersion: 35.0.0
+        env:
+          SIGNING_STORE_FILE: "release.keystore"
+          SIGNING_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+          SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
 
       - name: Rename signed APK
         run: |
-          mv ${{ steps.sign_app.outputs.signedFile }} ./app-$NEW_VERSION.apk
+          mv app/build/outputs/apk/release/app-release.apk ./app-v${{ env.NEW_VERSION }}.apk
 
       - name: Create Git tag
         run: |
@@ -222,6 +258,6 @@ jobs:
           tag_name: v${{ env.NEW_VERSION }}
           name: Release v${{ env.NEW_VERSION }}
           body_path: fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
-          files: ./app-${{ env.NEW_VERSION }}.apk
+          files: ./app-v${{ env.NEW_VERSION }}.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -11,7 +11,7 @@
 
 Usually, "Digital Detoxing" apps in Android are about opting-in for a contract to not use our phones for the next X minutes. Or that we will not use the app Y for more than Z minutes. These contracts are often reinforced with financial incentives, i.e. if we fail we will have to pay a fee of a few dollars to the developers.
 
-This app follows a different approach by stripping away all the attention-grabbing and manipulative features of other apps. DetoxDroid does not require you to choose a time and place when you want to "detox", or punish you if you fail. Instead, it aims to enable you to use your phone rather than letting your phone use you.
+This app follows a different approach by default, stripping away all the attention-grabbing and manipulative features of other apps. DetoxDroid does not require you to choose a time and place when you want to "detox", or punish you if you fail. Instead, it aims to enable you to use your phone rather than letting your phone use you.
 
 ## Features
 

app/build.gradle.kts

@@ -11,12 +11,29 @@ android {
     namespace = "com.flx_apps.digitaldetox"
     compileSdk = 35
 
+    signingConfigs {
+        create("release") {
+            // Provide these values via GitHub Secrets and environment variables
+            val storeFile = System.getenv("SIGNING_STORE_FILE")
+            val storePassword = System.getenv("SIGNING_STORE_PASSWORD")
+            val keyAlias = System.getenv("SIGNING_KEY_ALIAS")
+            val keyPassword = System.getenv("SIGNING_KEY_PASSWORD")
+
+            if (storeFile != null && !storeFile.isNullOrEmpty()) {
+                this.storeFile = file("$rootDir/$storeFile")
+                this.storePassword = storePassword
+                this.keyAlias = keyAlias
+                this.keyPassword = keyPassword
+            }
+        }
+    }
+
     defaultConfig {
         applicationId = "com.flx_apps.digitaldetox"
         minSdk = 26
         targetSdk = 33
-        versionCode = 20007
-        versionName = "2.0.7"
+        versionCode = 104
+        versionName = "0.1.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -30,6 +47,8 @@ android {
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )
+            // Tell the release build to use signing config
+            signingConfig = signingConfigs.getByName("release")
         }
     }
     compileOptions {
@@ -106,10 +125,8 @@ dependencies {
     // Material Icons
     implementation("androidx.compose.material:material-icons-extended")
 
-    // RootTools for running (adb) commands as root
-    implementation("com.github.Stericson:RootShell:1.6")
 }
 
 kotlin.sourceSets.all {
     languageSettings.enableLanguageFeature("DataObjects")
-}
+}

app/src/main/java/com/flx_apps/digitaldetox/ui/screens/app_exceptions/AppExceptionsScreen.kt

@@ -50,7 +50,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.flx_apps.digitaldetox.R
 import com.flx_apps.digitaldetox.feature_types.AppExceptionListType
 import com.flx_apps.digitaldetox.feature_types.FeatureId
-import com.flx_apps.digitaldetox.feature_types.SupportsAppExceptionsFeature
 import com.flx_apps.digitaldetox.ui.screens.app_exceptions.AppExceptionItem
 import com.flx_apps.digitaldetox.ui.screens.app_exceptions.AppExceptionsViewModel
 import com.flx_apps.digitaldetox.ui.screens.nav_host.NavViewModel
@@ -72,6 +71,8 @@ fun ManageAppExceptionsScreen(
     appExceptionsViewModel: AppExceptionsViewModel = AppExceptionsViewModel.withFeatureId(featureId),
 ) {
     var showSearchBar by remember { mutableStateOf(false) }
+    val listType = appExceptionsViewModel.exceptionListType
+
     Scaffold(topBar = {
         TopAppBar(navigationIcon = {
             IconButton(onClick = {
@@ -105,7 +106,7 @@ fun ManageAppExceptionsScreen(
                         }) {}
                 }
                 AnimatedVisibility(visible = !it) {
-                    Text(stringResource(id = R.string.feature_settings_exceptions))
+                    Text(stringResource(id = if (listType == AppExceptionListType.NOT_LIST) R.string.feature_settings_exceptions else R.string.feature_settings_inclusions))
                 }
             }
         }, actions = {
@@ -147,6 +148,8 @@ fun InstalledAppsList(
     appExceptionsViewModel: AppExceptionsViewModel = viewModel()
 ) {
     val appExceptions = appExceptionsViewModel.appExceptionItems.collectAsState().value
+    val listType = appExceptionsViewModel.exceptionListType
+
     if (appExceptions.isNullOrEmpty()) {
         Center {
             if (appExceptions == null) {
@@ -158,7 +161,12 @@ fun InstalledAppsList(
     } else {
         LazyColumn {
             item {
-                InfoCard(infoText = stringResource(id = R.string.feature_settings_exceptions_description))
+                val descriptionResId = if (listType == AppExceptionListType.NOT_LIST) {
+                    R.string.feature_settings_exceptions_description
+                } else {
+                    R.string.feature_settings_inclusions_description
+                }
+                InfoCard(infoText = stringResource(id = descriptionResId))
             }
             items(appExceptions, key = { item -> item.packageName }) { appException ->
                 AppExceptionListItem(appException)
@@ -283,24 +291,9 @@ fun AppExceptionsListSettingsSheet(
                         }
                     }
                 })
-            val listTypeMap = mapOf(
-                R.string.feature_settings_exceptions_listType_notList to AppExceptionListType.NOT_LIST,
-                R.string.feature_settings_exceptions_listType_onlyList to AppExceptionListType.ONLY_LIST
-            ).filter { (viewModel.feature as SupportsAppExceptionsFeature).listTypes.contains(it.value) }
-            if (listTypeMap.size > 1) {
-                androidx.compose.material3.ListItem(headlineContent = { Text(stringResource(id = R.string.feature_settings_exceptions_listType)) },
-                    supportingContent = {
-                        Column {
-                            Text(text = stringResource(id = R.string.feature_settings_exceptions_listType_description))
-                            OptionsRow(options = listTypeMap,
-                                selectedOption = viewModel.exceptionListType.collectAsState().value,
-                                onOptionSelected = { viewModel.setExceptionListType(it as AppExceptionListType) })
-                        }
-                    })
-            }
             // FIXME there should be a better way to do this, e.g. using Modifier.navigationBarsPadding(),
             //  but I couldn't get it to work for some reason
             Box(modifier = Modifier.height(48.dp))
         }
     }
-}
+}

app/src/main/java/com/flx_apps/digitaldetox/ui/screens/app_exceptions/AppExceptionsViewModel.kt

@@ -50,6 +50,9 @@ class AppExceptionsViewModel @Inject constructor(
      */
     private val appExceptionsFeature = feature as SupportsAppExceptionsFeature
 
+    val exceptionListType: AppExceptionListType
+        get() = appExceptionsFeature.appExceptionListType
+
     /**
      * Holds the list of all installed apps.
      */
@@ -85,9 +88,6 @@ class AppExceptionsViewModel @Inject constructor(
     private val _filteredAppExceptionItems = MutableStateFlow<List<AppExceptionItem>?>(null)
     val appExceptionItems = _filteredAppExceptionItems.asStateFlow()
 
-    private val _exceptionListType = MutableStateFlow(appExceptionsFeature.appExceptionListType)
-    val exceptionListType = _exceptionListType.asStateFlow()
-
     /**
      * Whether the bottom sheet to configure the list should be shown.
      */
@@ -198,15 +198,6 @@ class AppExceptionsViewModel @Inject constructor(
         filterApps()
     }
 
-    /**
-     * Sets the type of the app exception list.
-     * @see AppExceptionListType
-     */
-    fun setExceptionListType(type: AppExceptionListType) {
-        appExceptionsFeature.appExceptionListType = type
-        _exceptionListType.value = type
-    }
-
     /**
      * Sets whether the bottom sheet to configure the list should be shown.
      */

app/src/main/java/com/flx_apps/digitaldetox/ui/screens/feature/OpenAppExceptionsTile.kt

@@ -28,12 +28,21 @@ import com.flx_apps.digitaldetox.ui.widgets.SimpleListTile
 fun OpenAppExceptionsTile(
     featureViewModel: FeatureViewModel = viewModel(),
     navViewModel: NavViewModel = viewModel(viewModelStoreOwner = LocalContext.current as MainActivity),
-    titleText: String = stringResource(id = R.string.feature_settings_exceptions),
+    titleText: String? = null,
     subtitleText: String? = null,
+    listType: AppExceptionListType? = null
 ) {
     val feature = featureViewModel.feature as SupportsAppExceptionsFeature
-    SimpleListTile(titleText = titleText, subtitleText = subtitleText ?: stringResource(
-        id = if (feature.appExceptionListType == AppExceptionListType.NOT_LIST) R.string.feature_settings_exceptions__notListed
+    val currentListType = listType ?: feature.appExceptionListType
+
+    val finalTitleText = titleText ?: if (currentListType == AppExceptionListType.NOT_LIST) {
+        stringResource(id = R.string.feature_settings_exceptions)
+    } else {
+        stringResource(id = R.string.feature_settings_inclusions)
+    }
+
+    SimpleListTile(titleText = finalTitleText, subtitleText = subtitleText ?: stringResource(
+        id = if (currentListType == AppExceptionListType.NOT_LIST) R.string.feature_settings_exceptions__notListed
         else R.string.feature_settings_exceptions__onlyListed, feature.appExceptions.size
     ), trailing = {
         Icon(