Merge android branch - android support and android app/widget

.github/workflows/makefile.yml

@@ -2,9 +2,9 @@ name: Makefile CI (Test customfetch NOGUI)
 
 on:
   push:
-    branches: [ "main", "test", "windows" ]
+    branches: [ "main", "test", "android" ]
   pull_request:
-    branches: [ "main", "test", "windows" ]
+    branches: [ "main", "test", "android" ]
 
 jobs:
   build-deb:
@@ -20,7 +20,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install libwayland-dev libgtk-3-dev pkg-config libgtkmm-3.0-dev libdconf-dev libglib2.0-dev libarchive-tools
-        sudo apt-get install binutils lintian debhelper devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
+        sudo apt-get install binutils gettext lintian debhelper devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
 
     - name: Clean
       run: make clean
@@ -38,7 +38,7 @@ jobs:
       run: |
         cd /tmp/customfetch-0.10.2.orig
         sudo dpkg -i customfetch_0.10.2-1_amd64.deb
-        customfetch --wrap-lines=0
+        customfetch --wrap-lines
 
   build_ubuntu-latest:
 
@@ -48,7 +48,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Packages
-      run: sudo apt-get update && sudo apt-get install build-essential cmake neofetch tree libgtk-3-dev pkg-config libgtkmm-3.0-dev -y
+      run: sudo apt-get update && sudo apt-get install build-essential gettext cmake neofetch tree libgtk-3-dev pkg-config libgtkmm-3.0-dev -y
 
     - name: Clean
       run: make clean
@@ -69,7 +69,7 @@ jobs:
         printf "getting 0x5353 hexcode\n" && grep -nri "5353" /sys/class/ || true
 
     - name: Test customfetch
-      run: ./build/debug/customfetch --wrap-lines=0
+      run: ./build/debug/customfetch --wrap-lines
 
   build_Arch-AUR:
 
@@ -82,11 +82,12 @@ jobs:
 
     - name: Install the packages
       run: pacman -Syyu git sudo base-devel fakeroot pkgconf tree neofetch --noconfirm --needed
-    
-    - name: get /etc/sudoers
+
+    - name: Create a dedicated build user
       run: |
-        sed -i "s#root ALL=(ALL:ALL) ALL#root ALL=(ALL:ALL) NOPASSWD: ALL\nnobody ALL=(ALL:ALL) NOPASSWD: ALL#g" /etc/sudoers
-        cat /etc/sudoers
+        useradd -m -s /bin/bash builduser
+        echo "builduser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
     - name: get /etc/makepkg.conf
       run: |
         sed -i "s#purge debug lto#purge debug lto#" /etc/makepkg.conf
@@ -95,9 +96,9 @@ jobs:
     - name: Build and install using makepkg
       run: |
         git clone https://aur.archlinux.org/customfetch-git.git
-        chown -R nobody customfetch-git
+        chown -R builduser customfetch-git
         cd customfetch-git
-        sudo -u nobody makepkg -si --noconfirm
+        sudo -u builduser makepkg -si --noconfirm
 
     #- name: Setup SSH session
     #  uses: mxschmitt/action-tmate@v3
@@ -106,7 +107,7 @@ jobs:
       run: neofetch
 
     - name: Test customfetch
-      run: customfetch --wrap-lines=0
+      run: customfetch --wrap-lines
 
   build_Arch:
 
@@ -150,7 +151,29 @@ jobs:
         printf "/etc/os-release\n" && cat /etc/os-release
 
     - name: Test customfetch
-      run: ./build/debug/customfetch --wrap-lines=0
+      run: ./build/debug/customfetch --wrap-lines
+
+  build-android-app:
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x android/gradlew
+
+      - name: Build with Gradle
+        run: make distclean && make android_app
+
+      - name: Check files
+        run: tree android/app/build/outputs/apk
 
   test-all-ascii-art:
     runs-on: ubuntu-latest
@@ -159,15 +182,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Packages
-      run: sudo apt-get update && sudo apt-get install build-essential tree pkg-config -y
+      run: sudo apt-get update && sudo apt-get install build-essential gettext tree pkg-config -y
 
     - name: Clean
       run: make clean
 
     - name: Compile
       run: sudo make install DEBUG=0 VENDOR_TEST=0 GUI_MODE=0
 
-    # yes, i know too long
-    # the --color arguments are just for adding a missing color to the non done ascii
     - name: Test all the ascii art logos
-      run: for f in assets/ascii/*; do printf "\e[31m%s\e[0m\n" "$f" && customfetch --wrap-lines=0 -s "$f" -D assets --color "c1=!#fff111" --color "c2=!#00ff1a" --color "c3=!#faa311" --color "c4=!#343412" --color "c5=!#fff311" --color "c6=!#faa3aa" && sleep 1; done
+      run: for f in assets/ascii/*; do printf "\e[31m%s\e[0m\n" "$f" && customfetch --wrap-lines --source "$f" -D assets && sleep 1; done

.github/workflows/release.yml

@@ -28,9 +28,8 @@ jobs:
     - name: Install Packages
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt upgrade -y
-        sudo apt-get install build-essential g++-10 libwayland-dev pkg-config libarchive-tools libdconf-dev libglib2.0-dev -y
+        sudo apt-get update && sudo apt upgrade -y
+        sudo apt-get install build-essential g++-10 libwayland-dev gettext pkg-config libarchive-tools libdconf-dev libglib2.0-dev -y
 
     - name: Clean
       run: make clean
@@ -56,9 +55,8 @@ jobs:
     - name: Install Packages
       run: |
         sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt upgrade -y
-        sudo apt-get install build-essential g++-10 libwayland-dev libgtk-3-dev pkg-config libdconf-dev libglib2.0-dev libgtkmm-3.0-dev libarchive-tools  -y
+        sudo apt-get update && sudo apt upgrade -y
+        sudo apt-get install build-essential g++-10 libwayland-dev gettext libgtk-3-dev pkg-config libdconf-dev libglib2.0-dev libgtkmm-3.0-dev libarchive-tools  -y
 
     - name: Clean
       run: make clean
@@ -90,7 +88,7 @@ jobs:
         sudo apt-get update
         sudo apt-get upgrade -y
         sudo apt-get install libwayland-dev g++-10 libgtk-3-dev pkg-config libgtkmm-3.0-dev libdconf-dev libglib2.0-dev libarchive-tools
-        sudo apt-get install binutils lintian debhelper devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
+        sudo apt-get install binutils gettext lintian debhelper devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
 
     - name: Clean
       run: make clean
@@ -127,7 +125,7 @@ jobs:
         sudo apt-get update
         sudo apt-get upgrade -y
         sudo apt-get install libwayland-dev g++-10 libgtk-3-dev pkg-config libgtkmm-3.0-dev libdconf-dev libglib2.0-dev libarchive-tools
-        sudo apt-get install binutils lintian debhelper devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
+        sudo apt-get install binutils lintian debhelper gettext devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
 
     - name: Clean
       run: make clean
@@ -149,10 +147,38 @@ jobs:
       with:
         name: customfetch-gui-deb-pkg
         path: /tmp/customfetch-0.10.2.orig/customfetch-gui_amd64.deb
+
+  build-android-app:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x android/gradlew
+
+      - name: Build with Gradle
+        run: make distclean && make android_app DEBUG=0
+
+      - name: Check files
+        run: tree android/app/build/outputs/apk
+
+      - name: Upload to github artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: customfetch-android-app
+          path: android/app/build/outputs/apk/release/app-release.apk
 
   release:
     name: Create GitHub Release
-    needs: [build-tar, build-gui-tar, build-deb-gui, build-deb, get-version]
+    needs: [build-tar, build-gui-tar, build-deb-gui, build-deb, build-android-app, get-version]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -217,3 +243,12 @@ jobs:
           asset_path: customfetch-gui-deb-pkg/customfetch-gui_amd64.deb
           asset_name: customfetch-gui_${{ needs.get-version.outputs.version }}_amd64.deb
           asset_content_type: application/vnd.debian.binary-package
+
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.release-url }}
+          asset_path: customfetch-android-app/app-release.apk
+          asset_name: customfetch-android-app-${{ needs.get-version.outputs.version }}.apk
+          asset_content_type: application/vnd.android.package-archive

.gitignore

@@ -1,20 +1,21 @@
-build/
+build*/
 assets/distro_ascii_arts.json
 assets/distro_ascii_arts.txt
 cufetch
 test*.txt
 pci.ids
 output/
+useless_stuff/
 customfetch
 customfetch_r
 cufetch_r
-thinkpad-arch_logo.txt
-tanjiro_logo.txt
+locale/
 scripts/ascii_parser.py
 scripts/dict_to_files.py
 scripts/test*
 
 *.tar.*
+*.mo
 
 # Prerequisites
 *.d
@@ -49,3 +50,4 @@ scripts/test*
 *.out
 *.app
 .cache
+signing.properties

CMakeLists.txt

@@ -0,0 +1,77 @@
+# Please use the makefile if something goes wrong
+#
+
+cmake_minimum_required(VERSION 3.10)
+
+project(customfetch)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3 -O0 -DDEBUG=1 -Wall -Wextra -Wpedantic -Wno-unused-parameter")
+
+include_directories(include)
+
+file(GLOB
+	SRC
+	"src/*.cpp"
+	"src/query/unix/*.cpp"
+	"src/query/android/*.cpp"
+	"src/query/unix/utils/*.cpp"
+	"src/toml++/toml.cpp")
+
+add_executable(customfetch ${SRC})
+
+# get git branch
+execute_process(
+    COMMAND git rev-parse --abbrev-ref HEAD
+    OUTPUT_VARIABLE GIT_BRANCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+set(VERSION "0.10.2")
+target_compile_definitions(customfetch PRIVATE
+    VERSION="${VERSION}"
+    BRANCH="${GIT_BRANCH}"
+)
+
+# https://github.com/libcpr/cpr/blob/5f475522597b8f3721e2440daddeced7a969f24c/CMakeLists.txt#L39
+macro(add_option OPTION_NAME OPTION_TEXT OPTION_DEFAULT)
+    option(${OPTION_NAME} ${OPTION_TEXT} ${OPTION_DEFAULT})
+    if(DEFINED ENV{${OPTION_NAME}})
+        # Allow overriding the option through an environment variable
+        set(${OPTION_NAME} $ENV{${OPTION_NAME}})
+    endif()
+    if(${OPTION_NAME})
+        add_definitions(-D${OPTION_NAME})
+    endif()
+    message(STATUS "  ${OPTION_NAME}: ${${OPTION_NAME}}")
+endmacro()
+
+message(STATUS "Set flags:")
+message(STATUS "=================")
+add_option(GUI_MODE "Enable GTK3 GUI mode" 0)
+add_option(USE_DCONF "Compile customfetch with dconf support" 1)
+#add_option(VARS "Add additional flags at CXXFLAGS" )
+message(STATUS "=================")
+
+if(GUI_MODE)
+	find_package(PkgConfig REQUIRED)
+	pkg_check_modules(GTKMM REQUIRED gtkmm-3.0 gdkmm-3.0)
+	target_link_libraries(customfetch PUBLIC ${GTKMM_LIBRARIES})
+	target_include_directories(customfetch PUBLIC ${GTKMM_INCLUDE_DIRS})
+	target_compile_options(customfetch PUBLIC ${GTKMM_CFLAGS_OTHER})
+endif()
+
+if(USE_DCONF)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(DCONF dconf)
+        target_link_libraries(customfetch PUBLIC ${DCONF_LIBRARIES})
+        target_include_directories(customfetch PUBLIC ${DCONF_INCLUDE_DIRS})
+        target_compile_options(customfetch PUBLIC ${DCONF_CFLAGS_OTHER})
+endif()
+
+
+# fmt
+add_library(fmt STATIC
+	"src/fmt/os.cc"
+	"src/fmt/format.cc")
+
+target_link_libraries(customfetch PUBLIC fmt)