Skip to content

Commit 174abee

Browse files
committed
1 parent fbfb610 commit 174abee

File tree

6 files changed

+12
-119
lines changed

6 files changed

+12
-119
lines changed

.github/workflows/makefile.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -232,35 +232,6 @@ jobs:
232232
- name: Test customfetch
233233
run: ./build/debug/customfetch --wrap-lines
234234

235-
build-android-app:
236-
runs-on: ubuntu-latest
237-
238-
steps:
239-
- uses: actions/checkout@v4
240-
241-
- name: Set up JDK 17
242-
uses: actions/setup-java@v4
243-
with:
244-
java-version: '17'
245-
distribution: 'temurin'
246-
cache: gradle
247-
248-
- name: Grant execute permission for gradlew
249-
run: chmod +x android/gradlew
250-
251-
- name: Build with Gradle
252-
run: make distclean && make android_app
253-
254-
- name: Check files
255-
run: tree android/app/build/outputs/apk
256-
257-
- name: Upload to github artifacts
258-
uses: actions/upload-artifact@v4
259-
with:
260-
if-no-files-found: error
261-
name: customfetch-android-app
262-
path: android/app/build/outputs/apk/debug/app-debug.apk
263-
264235
build-macos:
265236
runs-on: macos-latest
266237
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -142,47 +142,9 @@ jobs:
142142
name: customfetch-gui-deb-pkg
143143
path: /tmp/customfetch-1.0.0.orig/customfetch-gui_amd64.deb
144144

145-
build-android-app:
146-
runs-on: ubuntu-latest
147-
148-
steps:
149-
- uses: actions/checkout@v4
150-
151-
- name: Set up JDK 17
152-
uses: actions/setup-java@v4
153-
with:
154-
java-version: '17'
155-
distribution: 'temurin'
156-
cache: gradle
157-
158-
- name: Create signing.properties
159-
run: |
160-
echo -n ${{ secrets.KEYSTORE_SIGNING_KEY }} > /tmp/keystore.txt && base64 -d /tmp/keystore.txt > /tmp/keystore.key
161-
cat << EOF > android/signing.properties
162-
storeFilePath=/tmp/keystore.key
163-
storePassword=${{ secrets.KEYSTORE_PASSWORD }}
164-
keyPassword=${{ secrets.KEYSTORE_PASSWORD }}
165-
keyAlias=${{ secrets.KEYSTORE_ALIAS }}
166-
EOF
167-
168-
- name: Grant execute permission for gradlew
169-
run: chmod +x android/gradlew
170-
171-
- name: Build with Gradle
172-
run: make distclean && make android_app DEBUG=0
173-
174-
- name: Check files
175-
run: tree android/app/build/outputs/apk
176-
177-
- name: Upload to github artifacts
178-
uses: actions/upload-artifact@v4
179-
with:
180-
name: customfetch-android-app
181-
path: android/app/build/outputs/apk/release/app-release.apk
182-
183145
release:
184146
name: Create GitHub Release
185-
needs: [build-tar, build-gui-tar, build-deb-gui, build-deb, build-android-app, get-version]
147+
needs: [build-tar, build-gui-tar, build-deb-gui, build-deb, get-version]
186148
runs-on: ubuntu-latest
187149
permissions:
188150
contents: write
@@ -247,12 +209,3 @@ jobs:
247209
asset_path: customfetch-gui-deb-pkg/customfetch-gui_amd64.deb
248210
asset_name: customfetch-gui_${{ needs.get-version.outputs.version }}_amd64.deb
249211
asset_content_type: application/vnd.debian.binary-package
250-
251-
- uses: actions/upload-release-asset@v1
252-
env:
253-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
254-
with:
255-
upload_url: ${{ needs.release.outputs.release-url }}
256-
asset_path: customfetch-android-app/app-release.apk
257-
asset_name: customfetch-android-app-${{ needs.get-version.outputs.version }}.apk
258-
asset_content_type: application/vnd.android.package-archive

Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,6 @@ $(TARGET): genver fmt toml $(OBJ)
8686
$(CXX) $(OBJ) $(BUILDDIR)/toml++/toml.o -o $(BUILDDIR)/$(TARGET) $(LDFLAGS)
8787
cd $(BUILDDIR)/ && ln -sf $(TARGET) cufetch
8888

89-
android_app:
90-
ifeq ($(DEBUG), 1)
91-
./android/gradlew assembleDebug --project-dir=./android
92-
else
93-
./android/gradlew assembleRelease --project-dir=./android
94-
endif
95-
@if [ $$? -eq 0 ]; then\
96-
echo "APK build successfully. Get it in $(CURDIR)/android/app/build/outputs/apk path and choose which to install (debug/release)";\
97-
fi
98-
9989
locale:
10090
scripts/make_mo.sh locale/
10191

@@ -149,8 +139,6 @@ delete: uninstall
149139

150140
updatever:
151141
sed -i "s#$(OLDVERSION)#$(VERSION)#g" $(wildcard .github/workflows/*.yml) compile_flags.txt
152-
sed -i "s#versionName = \"$(OLDVERSION)\"#versionName = \"$(VERSION)\"#g" android/app/build.gradle.kts
153-
sed -i "s#set(VERSION \"$(OLDVERSION)\")#set(VERSION \"$(VERSION)\")#g" CMakeLists.txt android/CMakeLists.txt
154142
sed -i "s#Project-Id-Version: customfetch $(OLDVERSION)#Project-Id-Version: customfetch $(VERSION)#g" po/*
155143

156-
.PHONY: $(TARGET) android_app updatever remove uninstall delete dist distclean fmt toml install all locale
144+
.PHONY: $(TARGET) updatever remove uninstall delete dist distclean fmt toml install all locale

README.md

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,18 @@
3030
</p>
3131
<img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="1px" height="1px" align="left" />
3232
<img src="screenshots/pipeline-style.png" />
33-
<h2 align="center">
34-
It's even an <b>android widget</b> and <b>GTK3 app</b>
35-
</h2>
36-
<img align=right width=54.4% src="screenshots/gui-example.png"/>
37-
<img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="45%" height="14px" align="right" />
38-
<img align=right width=54.2% src="screenshots/android_widget2.png"/>
39-
<p align=left>
40-
<img width=42.45% src="screenshots/android_widget.jpg" />
41-
</p>
4233

4334
## Key Features
44-
* Run customfetch as a **terminal** or **GTK3 application** or even as an **android widget**
45-
* Really easy customizable and fast, check [Config (with explanation)](#config-with-explanation) section
46-
* Super lightweight, 3.3MB max
35+
* Run customfetch as a **terminal** or **GTK3 application** or even as an [android widget](https://github.com/Toni500github/customfetch-android-app)
36+
* Really easy to customize (check [Config (with explanation)](#config-with-explanation) section)
37+
* Fast (maybe) as [fastfetch](https://github.com/fastfetch-cli/fastfetch)
38+
* Super lightweight, 3.3MB max (GTK3 application)
39+
40+
# Dependencies
41+
Customfetch requires **no mandatory** dependencies.\
42+
For building from source, only requires **C++20** but it's possible to compile with C++17 too (may not be always supported)
4743

48-
# Depends
49-
Customfetch only requires the standard C++ library from `gcc-libs`, which should come already pre-installed in almost all distros. Other than that, customfetch requires **no mandatory** dependencies.\
50-
Currently requires **C++20**, but it's possible to compile with C++17 too (may not be always supported)\
44+
Here I'll list some packages to install for the GTK3 app or for making customfetch faster.
5145
The names of the packages can vary depending on the package manager or distro.
5246

5347
If you want to install the GUI app install from your package manager:
@@ -65,8 +59,7 @@ optional dependencies that will make customfetch faster.
6559
Download the latest `.deb` package in [releases](https://github.com/Toni500github/customfetch/releases/latest)
6660

6761
## Android widget
68-
Download the latest `.apk` file in the [releases](https://github.com/Toni500github/customfetch/releases/latest) \
69-
AFAIK The google play protect doesn't detect any malware. If your antivirus does, please open an [issue here](https://github.com/Toni500github/customfetch/issues)
62+
Moved to the new repo: https://github.com/Toni500github/customfetch-android-app
7063

7164
## Arch and based (AUR)
7265
```bash
@@ -99,18 +92,6 @@ yay -S customfetch-git
9992
yay -S customfetch-gui-git
10093
```
10194

102-
## Android widget app (unstable)
103-
Download the latest apk build from the [GitHub actions](https://github.com/Toni500github/customfetch/actions/workflows/makefile.yml) artifacts\
104-
If you can't download or you are not logged in GitHub, use this link: https://nightly.link/Toni500github/customfetch/workflows/makefile/main/customfetch-android-app.zip
105-
106-
## Android widget app (source)
107-
```bash
108-
# need java 17 + gradle 8.9 installed.
109-
# It's suggested to build from android studio,
110-
# so you that you can install the NDK library
111-
./android/gradlew assembleDebug --project-dir=./android
112-
```
113-
11495
## Compile from (source) (unstable)
11596
```bash
11697
# clone the git dir

screenshots/android_widget.jpg

-78.6 KB
Binary file not shown.

screenshots/android_widget2.png

-873 KB
Binary file not shown.

0 commit comments

Comments
 (0)