Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KieronQuinn/Smartspacer Loading
base: main
Choose a base ref
...
head repository: 0xf104a/Smartspacer Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 15 files changed
  • 1 contributor

Commits on Feb 5, 2024

  1. Initial implementation of pages auto-switching

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    c803a5a View commit details
    Browse the repository at this point in the history

  2. WIP: pages auto-switching configuration

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    0e0faad View commit details
    Browse the repository at this point in the history

  3. Add option to enable/disable switching

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    7d2bd51 View commit details
    Browse the repository at this point in the history

  4. Get rid off some Google proprietary stuff

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    1232ce9 View commit details
    Browse the repository at this point in the history

  5. Drop firebase and crashlytics

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    0c570d5 View commit details
    Browse the repository at this point in the history

  6. Migrate to own versioning

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    7f6a669 View commit details
    Browse the repository at this point in the history

  7. Update .gitignore, tweak versioning, add workflow

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    832007d View commit details
    Browse the repository at this point in the history

  8. Use our updates source

    @0xf104a
    0xf104a committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    e2e915d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Allow Smartspacer to be digital assistant

    @0xf104a
    0xf104a committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    256ea96 View commit details
    Browse the repository at this point in the history

  2. Bump fork version to 2

    @0xf104a
    0xf104a committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    10f4060 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge remote-tracking branch 'original/main' 

    # Conflicts:
#	app/build.gradle
    @0xf104a
    0xf104a committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    0733604 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Remove conflicting features

    @0xf104a
    0xf104a committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    e4de3a5 View commit details
    Browse the repository at this point in the history

  2. Create local.properties when building with gradle

    @0xf104a
    0xf104a committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f56bd5e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge remote-tracking branch 'original/main' 

    # Conflicts:
#	app/build.gradle
#	app/src/main/java/com/kieronquinn/app/smartspacer/model/database/AppWidget.kt
#	app/src/main/java/com/kieronquinn/app/smartspacer/ui/screens/widget/SmartspacerWidgetConfigurationFragment.kt
#	app/src/main/java/com/kieronquinn/app/smartspacer/ui/screens/widget/SmartspacerWidgetConfigurationViewModel.kt
#	app/src/main/res/layout/fragment_smartspacer_widget_configuration.xml
#	app/src/main/res/values-af-rZA/strings.xml
#	app/src/main/res/values-ar-rSA/strings.xml
#	app/src/main/res/values-ca-rES/strings.xml
#	app/src/main/res/values-cs-rCZ/strings.xml
#	app/src/main/res/values-da-rDK/strings.xml
#	app/src/main/res/values-de-rDE/strings.xml
#	app/src/main/res/values-el-rGR/strings.xml
#	app/src/main/res/values-en-rGB/strings.xml
#	app/src/main/res/values-en-rUS/strings.xml
#	app/src/main/res/values-es-rES/strings.xml
#	app/src/main/res/values-fi-rFI/strings.xml
#	app/src/main/res/values-fr-rFR/strings.xml
#	app/src/main/res/values-hu-rHU/strings.xml
#	app/src/main/res/values-it-rIT/strings.xml
#	app/src/main/res/values-iw-rIL/strings.xml
#	app/src/main/res/values-ja-rJP/strings.xml
#	app/src/main/res/values-ko-rKR/strings.xml
#	app/src/main/res/values-nl-rNL/strings.xml
#	app/src/main/res/values-no-rNO/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-pt-rPT/strings.xml
#	app/src/main/res/values-ro-rRO/strings.xml
#	app/src/main/res/values-ru-rRU/strings.xml
#	app/src/main/res/values-sr-rSP/strings.xml
#	app/src/main/res/values-sv-rSE/strings.xml
#	app/src/main/res/values-tr-rTR/strings.xml
#	app/src/main/res/values-vi-rVN/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
    @0xf104a
    0xf104a committed May 7, 2024
    Configuration menu
    Copy the full SHA
    299371f View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. HOTFIX: remove testing config from gradle

    @0xf104a
    0xf104a committed May 11, 2024
    Configuration menu
    Copy the full SHA
    3f5261e View commit details
    Browse the repository at this point in the history

  2. Add google-services.json stub for CI working

    @0xf104a
    0xf104a committed May 11, 2024
    Configuration menu
    Copy the full SHA
    7b679fe View commit details
    Browse the repository at this point in the history

  3. Fixes to aapt2 compiling errors, fix imports and duplications

    @0xf104a
    0xf104a committed May 11, 2024
    Configuration menu
    Copy the full SHA
    0484997 View commit details
    Browse the repository at this point in the history

  4. Fix version and reduce build tasks

    @0xf104a
    0xf104a committed May 11, 2024
    Configuration menu
    Copy the full SHA
    b3e368a View commit details
    Browse the repository at this point in the history
Loading