games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Convert XML files in android/ from CRLF to LF, exclude .bat files from CI check

Browse Source
This commit is contained in:
Alexander Wilms 2023-10-23 13:27:42 +00:00
parent f63c2ac5db
commit 941181b8b9
6 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/github.yml vendored
View File

@ -148,10 +148,10 @@ jobs:
- name: Ensure LF line endings - name: Ensure LF line endings
if: ${{ startsWith(matrix.preset, 'linux-clang-test') }} if: ${{ startsWith(matrix.preset, 'linux-clang-test') }}
run: | run: |
find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune \ find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune -prune -o -path ./test/googletest \
-o -path ./osx -prune -o -path ./test/googletest -prune -o -type f \ -o -path ./osx -prune -o -type f \
-not -name '*.png' -and -not -name '*.vcxproj*' -and -not -name '*.props' \ -not -name '*.png' -and -not -name '*.vcxproj*' -and -not -name '*.props' -and -not -name '*.wav' -and -not -name '*.ico' -and -not -name '*.bat' -print0 | \
-not -name '*.wav' -not -name '*.ico' -print0 | { ! xargs -0 grep -l -z -P '\r\n'; } { ! xargs -0 grep -l -z -P '\r\n'; }
- name: Validate JSON - name: Validate JSON
# the Python yaml module doesn't seem to work on mac-arm # the Python yaml module doesn't seem to work on mac-arm

6
android/vcmi-app/src/main/res/drawable/compat_toolbar_shadow.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:startColor="#000000" android:endColor="#00000000" android:angle="270"/> <gradient android:startColor="#000000" android:endColor="#00000000" android:angle="270"/>
</shape> </shape>

12
android/vcmi-app/src/main/res/drawable/recycler_divider_drawable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<size <size
android:width="1px" android:width="1px"
android:height="1px" /> android:height="1px" />
<solid android:color="@color/accent" /> <solid android:color="@color/accent" />
</shape> </shape>

16
android/vcmi-app/src/main/res/menu/menu_mods.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_mods_download_repo" android:id="@+id/menu_mods_download_repo"
android:icon="@android:drawable/stat_sys_download" android:icon="@android:drawable/stat_sys_download"
android:title="@string/menu_mods_download_repo" android:title="@string/menu_mods_download_repo"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
</menu> </menu>

18
android/vcmi-app/src/main/res/values/colors.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="textMain">#FFFFFF</color> <color name="textMain">#FFFFFF</color>
<color name="textSecondary">#AAAAAA</color> <color name="textSecondary">#AAAAAA</color>
<color name="bgMain">#2C332C</color> <color name="bgMain">#2C332C</color>
<color name="bgDark">#1F221F</color> <color name="bgDark">#1F221F</color>
<color name="accent">#BBBB55</color> <color name="accent">#BBBB55</color>
<color name="separator">@color/accent</color> <color name="separator">@color/accent</color>
<color name="splash">#00000000</color> <color name="splash">#00000000</color>
</resources> </resources>

20
android/vcmi-app/src/main/res/values/dimen.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="side_margin">16dp</dimen> <dimen name="side_margin">16dp</dimen>
<dimen name="entry_min_height">80dp</dimen> <dimen name="entry_min_height">80dp</dimen>
<dimen name="entry_about_min_height">48dp</dimen> <dimen name="entry_about_min_height">48dp</dimen>
<dimen name="font_normal">14sp</dimen> <dimen name="font_normal">14sp</dimen>
<dimen name="font_big">18sp</dimen> <dimen name="font_big">18sp</dimen>
<dimen name="font_header">22sp</dimen> <dimen name="font_header">22sp</dimen>
</resources> </resources>