mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-22 22:13:35 +02:00
Convert XML files in android/ from CRLF to LF, exclude .bat files from CI check
This commit is contained in:
parent
f63c2ac5db
commit
941181b8b9
8
.github/workflows/github.yml
vendored
8
.github/workflows/github.yml
vendored
@ -148,10 +148,10 @@ jobs:
|
||||
- name: Ensure LF line endings
|
||||
if: ${{ startsWith(matrix.preset, 'linux-clang-test') }}
|
||||
run: |
|
||||
find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune \
|
||||
-o -path ./osx -prune -o -path ./test/googletest -prune -o -type f \
|
||||
-not -name '*.png' -and -not -name '*.vcxproj*' -and -not -name '*.props' \
|
||||
-not -name '*.wav' -not -name '*.ico' -print0 | { ! xargs -0 grep -l -z -P '\r\n'; }
|
||||
find . -path ./.git -prune -o -path ./AI/FuzzyLite -prune -prune -o -path ./test/googletest \
|
||||
-o -path ./osx -prune -o -type f \
|
||||
-not -name '*.png' -and -not -name '*.vcxproj*' -and -not -name '*.props' -and -not -name '*.wav' -and -not -name '*.ico' -and -not -name '*.bat' -print0 | \
|
||||
{ ! xargs -0 grep -l -z -P '\r\n'; }
|
||||
|
||||
- name: Validate JSON
|
||||
# the Python yaml module doesn't seem to work on mac-arm
|
||||
|
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient android:startColor="#000000" android:endColor="#00000000" android:angle="270"/>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient android:startColor="#000000" android:endColor="#00000000" android:angle="270"/>
|
||||
</shape>
|
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<size
|
||||
android:width="1px"
|
||||
android:height="1px" />
|
||||
<solid android:color="@color/accent" />
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<size
|
||||
android:width="1px"
|
||||
android:height="1px" />
|
||||
<solid android:color="@color/accent" />
|
||||
</shape>
|
@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item
|
||||
android:id="@+id/menu_mods_download_repo"
|
||||
android:icon="@android:drawable/stat_sys_download"
|
||||
android:title="@string/menu_mods_download_repo"
|
||||
app:showAsAction="ifRoom" />
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item
|
||||
android:id="@+id/menu_mods_download_repo"
|
||||
android:icon="@android:drawable/stat_sys_download"
|
||||
android:title="@string/menu_mods_download_repo"
|
||||
app:showAsAction="ifRoom" />
|
||||
</menu>
|
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="textMain">#FFFFFF</color>
|
||||
<color name="textSecondary">#AAAAAA</color>
|
||||
<color name="bgMain">#2C332C</color>
|
||||
<color name="bgDark">#1F221F</color>
|
||||
<color name="accent">#BBBB55</color>
|
||||
<color name="separator">@color/accent</color>
|
||||
<color name="splash">#00000000</color>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="textMain">#FFFFFF</color>
|
||||
<color name="textSecondary">#AAAAAA</color>
|
||||
<color name="bgMain">#2C332C</color>
|
||||
<color name="bgDark">#1F221F</color>
|
||||
<color name="accent">#BBBB55</color>
|
||||
<color name="separator">@color/accent</color>
|
||||
<color name="splash">#00000000</color>
|
||||
</resources>
|
@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="side_margin">16dp</dimen>
|
||||
|
||||
<dimen name="entry_min_height">80dp</dimen>
|
||||
<dimen name="entry_about_min_height">48dp</dimen>
|
||||
|
||||
<dimen name="font_normal">14sp</dimen>
|
||||
<dimen name="font_big">18sp</dimen>
|
||||
<dimen name="font_header">22sp</dimen>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="side_margin">16dp</dimen>
|
||||
|
||||
<dimen name="entry_min_height">80dp</dimen>
|
||||
<dimen name="entry_about_min_height">48dp</dimen>
|
||||
|
||||
<dimen name="font_normal">14sp</dimen>
|
||||
<dimen name="font_big">18sp</dimen>
|
||||
<dimen name="font_header">22sp</dimen>
|
||||
</resources>
|
Loading…
Reference in New Issue
Block a user