android: set requestLegacyExternalStorage specifically for Android 10 which didn't had MANAGE_EXTERNAL_STORAGE yet

This reverts commit c1c0c2761d.

.cirrus.yml

@@ -7,8 +7,7 @@ task:
     - pkg install -y pkgconf git sdl2 python fontconfig libvorbis opusfile bzip2 libbacktrace
     - git submodule update --init --recursive
   test_script:
-    - ./scripts/cirrus/build_freebsd.sh dedicated
+    - ./scripts/cirrus/build_freebsd.sh
-    - ./scripts/cirrus/build_freebsd.sh full
 
 task:
   name: freebsd-15-amd64
@@ -19,5 +18,4 @@ task:
     - pkg install -y pkgconf git sdl2 python fontconfig libvorbis opusfile bzip2 libbacktrace
     - git submodule update --init --recursive
   test_script:
-    - ./scripts/cirrus/build_freebsd.sh dedicated
+    - ./scripts/cirrus/build_freebsd.sh
-    - ./scripts/cirrus/build_freebsd.sh full

.github/workflows/c-cpp.yml

@@ -15,35 +15,39 @@ jobs:
         include:
           # Linux build specifically want oldest Ubuntu as possible
           # to be crossdistribution compatible, otherwise use ubuntu-latest
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             targetos: linux
             targetarch: amd64
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             targetos: linux
             targetarch: i386
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             targetos: linux
             targetarch: arm64
             cross: true
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             targetos: linux
             targetarch: armhf
             cross: true
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04 # riscv64 would benefit from having latest compilers
             targetos: linux
             targetarch: riscv64
             cross: true
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             targetos: linux
             targetarch: ppc64el
             cross: true
-#          - os: ubuntu-aarch64-20.04
+#          - os: ubuntu-aarch64-22.04
 #            targetos: linux
 #            targetarch: aarch64
-          - os: ubuntu-20.04
+#          - os: ubuntu-latest
+#            targetos: linux
+#            targetarch: e2k-8c
+#            cross: true
+          - os: ubuntu-latest
             targetos: android
             targetarch: multiarch
-#          - os: ubuntu-20.04
+#          - os: ubuntu-22.04
 #            targetos: motomagx
 #            targetarch: armv6
 
@@ -56,7 +60,7 @@ jobs:
           - os: windows-latest
             targetos: win32
             targetarch: amd64
-          - os: windows-2019 # always use the oldest possible for 32-bit because of older compilers, and better support of certain legacy OSes
+          - os: windows-2022 # always use the oldest possible for 32-bit because of older compilers, and better support of certain legacy OSes
             targetos: win32
             targetarch: i386
           - os: macos-14 # arm64 as per github documentation
@@ -66,8 +70,10 @@ jobs:
             targetos: apple
             targetarch: amd64
     env:
-      SDL_VERSION: 2.32.0
+      SDL_VERSION: 2.32.8
+      FFMPEG_VERSION: 7.1
       GH_CPU_ARCH: ${{ matrix.targetarch }}
+      GH_CPU_OS: ${{ matrix.targetos }}
       GH_CROSSCOMPILING: ${{ matrix.cross }}
     steps:
     - name: Checkout
@@ -93,7 +99,7 @@ jobs:
         include:
           - app: su.xash.Engine.Compat.i386
     container:
-      image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
+      image: ghcr.io/flathub-infra/flatpak-github-actions:freedesktop-24.08
       options: --privileged
     steps:
     - name: Checkout
@@ -101,7 +107,7 @@ jobs:
       with:
         submodules: recursive
     - name: Build flatpak (Compat.i386)
-      uses: FWGS/flatpak-github-actions/flatpak-builder@v6.3-fix
+      uses: FWGS/flatpak-github-actions/flatpak-builder@v6.5
       with:
         bundle: ${{ matrix.app }}.flatpak
         manifest-path: scripts/flatpak/${{ matrix.app }}.yml

.gitignore

@@ -222,7 +222,7 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
@@ -345,3 +345,12 @@ enc_temp_folder/
 
 # ccls langauge server
 .ccls-*
+
+# JetBrains
+.idea/
+cmake-build-*
+
+# some Android-specific build stuff
+3rdparty/SDL
+3rdparty/hlsdk-portable
+!scripts/build-ninja.py

.gitmodules

@@ -37,3 +37,6 @@
 [submodule "3rdparty/libbacktrace/libbacktrace"]
 	path = 3rdparty/libbacktrace/libbacktrace
 	url = https://github.com/ianlancetaylor/libbacktrace
+[submodule "3rdparty/maintui"]
+	path = 3rdparty/maintui
+	url = https://github.com/numas13/xash3d-maintui.git

3rdparty/gl4es/wscript

@@ -13,10 +13,12 @@ def configure(conf):
 
 def build(bld):
 	gl4es_srcdir = bld.path.find_node('gl4es/src')
-
+	cflags = []
+	if bld.env.COMPILER_CC != 'msvc':
+		cflags += ['-w', '-fvisibility=hidden', '-std=gnu99']
 	bld.stlib(source   = gl4es_srcdir.ant_glob(['gl/*.c', 'gl/*/*.c', 'glx/hardext.c']),
 		target   = 'gl4es',
 		includes = ['gl4es/src', 'gl4es/src/gl', 'gl4es/src/glx', 'gl4es/include'],
 		defines  = ['NOX11', 'NO_GBM', 'NO_INIT_CONSTRUCTOR', 'DEFAULT_ES=2', 'NOEGL', 'NO_LOADER', 'STATICLIB'],
-		cflags   = ['-w', '-fvisibility=hidden', '-std=gnu99'],
+		cflags   = cflags,
 		export_includes = '.')

3rdparty/libbacktrace/wscript

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 from waflib import TaskGen
+from waflib.Tools.c_config import DEFKEYS
 
 FRAGMENT_ATOMIC='''int i;
 int main(void) {
@@ -74,13 +75,8 @@ def configure(conf):
 		conf.fatal('Can\'t find libbacktrace submodule. Run `git submodule update --init --recursive`.')
 		return
 
-	if conf.env.DEST_SIZEOF_VOID_P == 8:
+	conf.define('BACKTRACE_ELF_SIZE', 64 if conf.env.DEST_SIZEOF_VOID_P == 8 else 32)
-		conf.define('BACKTRACE_ELF_SIZE', 64)
+	conf.define('BACKTRACE_XCOFF_SIZE', 64 if conf.env.DEST_SIZEOF_VOID_P == 8 else 32)
-		conf.define('BACKTRACE_XCOFF_SIZE', 64)
-	else:
-		conf.define('BACKTRACE_ELF_SIZE', 32)
-		conf.define('BACKTRACE_XCOFF_SIZE', 32)
-
 	conf.define('_ALL_SOURCE', 1)
 	conf.define('_GNU_SOURCE', 1)
 	conf.define('_POSIX_PTHREAD_SEMANTICS', 1)
@@ -96,7 +92,10 @@ def configure(conf):
 		conf.env.HAVE_FRANDOM_SEED = True
 
 	def check_header(hdr):
-		return {'header_name':hdr, 'msg':'... %s header' % hdr, 'mandatory':False, 'id':hdr}
+		return {'header_name':hdr, 'msg':'... %s header' % hdr, 'mandatory':False, 'id':hdr, 'compiler': 'c'}
+
+	def check_frag(frag, msg, define, **kw):
+		return dict({'fragment': frag, 'msg':'... %s' % msg, 'mandatory': False, 'compiler': 'c'}, **kw)
 
 	conf.multicheck(
 		check_header('dlfcn.h'),
@@ -117,20 +116,20 @@ def configure(conf):
 		check_header('unistd.h'),
 		check_header('windows.h'),
 
-		{'fragment':FRAGMENT_ATOMIC, 'msg':'... __atomic extensions', 'define_name':'HAVE_ATOMIC_FUNCTIONS', 'mandatory':False},
+		check_frag(FRAGMENT_ATOMIC, '__atomic extensions', 'HAVE_ATOMIC_FUNCTIONS'),
-		{'fragment':FRAGMENT_SYNC, 'msg':'...  __sync extensions', 'define_name':'HAVE_SYNC_FUNCTIONS', 'mandatory':False},
+		check_frag(FRAGMENT_SYNC, ' __sync extensions', 'HAVE_SYNC_FUNCTIONS'),
-		{'fragment':FRAGMENT_GETPAGESIZE, 'msg':'...  getpagesize function', 'define_name':'HAVE_DECL_GETPAGESIZE', 'mandatory':False},
+		check_frag(FRAGMENT_GETPAGESIZE, ' getpagesize function', 'HAVE_DECL_GETPAGESIZE'),
-		{'fragment':FRAGMENT_STRNLEN, 'msg':'...  strnlen function', 'define_name':'HAVE_DECL_STRNLEN', 'mandatory':False},
+		check_frag(FRAGMENT_STRNLEN, ' strnlen function', 'HAVE_DECL_STRNLEN'),
-		{'fragment':FRAGMENT_DL_ITERATE_PHDR % 'link.h', 'msg':'...  dl_iterate_phdr function in link.h', 'define_name':'HAVE_DL_ITERATE_PHDR', 'after_tests': ['link.h'], 'mandatory':False},
+		check_frag(FRAGMENT_DL_ITERATE_PHDR % 'link.h', ' dl_iterate_phdr function in link.h', 'HAVE_DL_ITERATE_PHDR', after_tests=['link.h']),
-		{'fragment':FRAGMENT_DL_ITERATE_PHDR % 'sys/link.h', 'msg':'...  dl_iterate_phdr function in sys/link.h', 'define_name':'HAVE_DL_ITERATE_PHDR', 'after_tests': ['sys/link.h'], 'mandatory':False},
+		check_frag(FRAGMENT_DL_ITERATE_PHDR % 'sys/link.h', ' dl_iterate_phdr function in sys/link.h', 'HAVE_DL_ITERATE_PHDR', after_tests=['sys/link.h']),
-		{'fragment':FRAGMENT_FCNTL,'msg':'...  fnctl function', 'define_name':'HAVE_FCNTL', 'mandatory':False},
+		check_frag(FRAGMENT_FCNTL, 'fnctl function', 'HAVE_FCNTL'),
-		{'fragment':FRAGMENT_GETEXECNAME,'msg':'...  getexecname function','define_name':'HAVE_GETEXECNAME', 'mandatory':False},
+		check_frag(FRAGMENT_GETEXECNAME, 'getexecname function','HAVE_GETEXECNAME'),
-		{'fragment':FRAGMENT_GETIPINFO, 'msg':'...  _Unwind_GetIPInfo function', 'define_name':'HAVE_GETIPINFO', 'mandatory':False},
+		check_frag(FRAGMENT_GETIPINFO, '_Unwind_GetIPInfo function', 'HAVE_GETIPINFO'),
-		{'fragment':FRAGMENT_KERN_PROC % 'KERN_PROC', 'msg': '...  KERN_PROC and KERN_PROC_PATHNAME defines', 'define_name':'HAVE_KERN_PROC', 'mandatory':False},
+		check_frag(FRAGMENT_KERN_PROC % 'KERN_PROC', 'KERN_PROC and KERN_PROC_PATHNAME defines', 'HAVE_KERN_PROC'),
-		{'fragment':FRAGMENT_KERN_PROC % 'KERN_PROC_ARGS', 'msg': '...  KERN_PROC_ARGS and KERN_PROC_PATHNAME defines', 'define_name':'HAVE_KERN_PROC_ARGS', 'mandatory':False},
+		check_frag(FRAGMENT_KERN_PROC % 'KERN_PROC_ARGS', 'KERN_PROC_ARGS and KERN_PROC_PATHNAME defines', 'HAVE_KERN_PROC_ARGS'),
-		{'fragment':FRAGMENT_LOADQUERY, 'msg': '...  loadquery function', 'define_name':'HAVE_LOADQUERY', 'mandatory':False},
+		check_frag(FRAGMENT_LOADQUERY, 'loadquery function', 'HAVE_LOADQUERY'),
-		{'fragment':FRAGMENT_LSTAT, 'msg': '...  lstat function', 'define_name':'HAVE_LSTAT', 'mandatory':False},
+		check_frag(FRAGMENT_LSTAT, 'lstat function', 'HAVE_LSTAT'),
-		{'fragment':FRAGMENT_READLINK, 'msg': '...  readlink function', 'define_name':'HAVE_READLINK', 'mandatory':False},
+		check_frag(FRAGMENT_READLINK, 'readlink function', 'HAVE_READLINK'),
 
 #		{'lib':'lzma', 'define_name':'HAVE_LIBLZMA', 'uselib_store':'lzma', 'msg':'... lzma library', 'mandatory':False},
 #		{'lib':'z', 'define_name':'HAVE_ZLIB', 'uselib_store':'z', 'msg':'... zlib library', 'mandatory':False},
@@ -138,6 +137,8 @@ def configure(conf):
 		msg='Checking for in parallel'
 	)
 
+	conf.env[DEFKEYS].sort()
+
 	conf.write_config_header()
 
 	conf.define('BACKTRACE_SUPPORTED', 1)

3rdparty/opus/wscript

@@ -23,6 +23,17 @@ int main (void) {
 	int * array = alloca(foo);
 }'''
 
+FRAGMENT_LRINT='''#include <math.h>
+#include <stdlib.h>
+int main (int argc, char **argv) {
+	return lrint%s((%s)atof(argv[1]));
+}'''
+
+# assuming MSVC always enables NEON
+FRAGMENT_NEON='''#if !defined __ARM_NEON__ && !defined _MSC_VER
+#error
+#endif'''
+
 def options(opt):
 	pass
 
@@ -31,15 +42,61 @@ def configure(conf):
 		conf.fatal('Can\'t find opus submodule. Run `git submodule update --init --recursive`.')
 		return
 
+	if conf.check_cc(fragment=FRAGMENT_LRINT % ('', 'double'), msg = 'Checking for C99 lrint', use = 'M', mandatory = False):
+		conf.define('HAVE_LRINT', 1)
+
+	if conf.check_cc(fragment=FRAGMENT_LRINT % ('f', 'float'), msg = 'Checking for C99 lrintf', use = 'M', mandatory = False):
+		conf.define('HAVE_LRINTF', 1)
+
 	# Check for C99 variable-size arrays, or alloca() as fallback
 	if conf.check_cc(fragment=FRAGMENT_VLA, msg = 'Checking for C99 VLA support', mandatory = False):
 		conf.define('VAR_ARRAYS', 1)
 	elif conf.check_cc(fragment=FRAGMENT_ALLOCA_H, msg = 'Checking for alloca in alloca.h header', mandatory = False):
 		conf.define('USE_ALLOCA', 1)
 		conf.define('HAVE_ALLOCA_H', 1)
-	elif conf.check_cc(fragmenmt=FRAGMENT_STDLIB_H, msg = 'Checking for alloca.h in stdlib.h', mandatory = False):
+	elif conf.check_cc(fragment=FRAGMENT_STDLIB_H, msg = 'Checking for alloca.h in stdlib.h', mandatory = False):
 		conf.define('USE_ALLOCA', 1)
 
+	if conf.env.DEST_CPU in ['thumb', 'arm']:
+		if conf.check(header_name='arm_neon.h', mandatory = False):
+			if conf.check(fragment=FRAGMENT_NEON, msg = 'Checking if compiler enabled NEON', mandatory = False):
+				conf.env.HAVE_NEON = True
+				conf.define('OPUS_ARM_MAY_HAVE_NEON_INTR', 1)
+				conf.define('OPUS_ARM_PRESUME_NEON', 1)
+	elif conf.env.DEST_CPU.startswith('x86'):
+		if conf.check(header_name='xmmintrin.h', mandatory = False):
+			if conf.env.COMPILER_CC != 'msvc':
+				conf.env.CFLAGS += ['-msse']
+			conf.define('OPUS_X86_MAY_HAVE_SSE', 1)
+			if conf.env.DEST_SIZEOF_VOID_P > 4:
+				conf.define('OPUS_X86_PRESUME_SSE', 1)
+
+		if conf.check(header_name='emmintrin.h', mandatory = False):
+			if conf.env.COMPILER_CC != 'msvc':
+				conf.env.CFLAGS += ['-msse2']
+			conf.define('OPUS_X86_MAY_HAVE_SSE2', 1)
+			if conf.env.DEST_SIZEOF_VOID_P > 4:
+				conf.define('OPUS_X86_PRESUME_SSE2', 1)
+
+		# on x86_64 we enable both SSE and SSE2, so RTCD can be disabled (it's actually doesn't even build with RTCD enabled)
+		if conf.env.DEST_SIZEOF_VOID_P == 4:
+			if conf.check(header_name='cpuid.h', mandatory=False):
+				conf.define('CPU_INFO_BY_C', 1)
+			else:
+				conf.define('CPU_INFO_BY_ASM', 1)
+
+			conf.define('OPUS_HAVE_RTCD', 1)
+
+#		if conf.check(header_name='smmintrin.h', mandatory = False):
+#			if conf.env.COMPILER_CC != 'msvc':
+#				conf.env.CFLAGS += ['-msse4.1']
+#			conf.define('OPUS_X86_MAY_HAVE_SSE4_1', 1)
+
+#		if conf.check(header_name='immintrin.h', mandatory = False):
+#			if conf.env.COMPILER_CC != 'msvc':
+#				conf.env.CFLAGS += ['-mavx']
+#			conf.define('OPUS_X86_MAY_HAVE_AVX', 1)
+
 	# TODO: ARM/x86 intrinsics detection
 	# TODO: maybe call autotools/cmake/meson instead?
 
@@ -55,8 +112,23 @@ def build(bld):
 		'opus/src/opus_compare.c',
 		'opus/celt/opus_custom_demo.c'
 	])
-	includes = ['opus/include/', 'opus/celt/', 'opus/silk/', 'opus/silk/float/']
+
-	defines = ['OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.4.0"', 'CUSTOM_MODES']
+	includes = ['opus', 'opus/include/', 'opus/celt/', 'opus/silk/', 'opus/silk/float/']
+
+	if bld.env.DEST_CPU in ['thumb', 'arm']:
+		if bld.env.HAVE_NEON:
+			sources += bld.path.ant_glob(['opus/silk/arm/*.c', 'opus/celt/arm/*.c'])
+			includes += ['opus/silk/arm', 'opus/celt/arm']
+	elif bld.env.DEST_CPU.startswith('x86'):
+		sources += ['opus/silk/x86/x86_silk_map.c',
+			'opus/celt/x86/pitch_sse.c',
+			'opus/celt/x86/pitch_sse2.c',
+			'opus/celt/x86/vq_sse2.c',
+			'opus/celt/x86/x86_celt_map.c',
+			'opus/celt/x86/x86cpu.c']
+		includes += ['opus/silk/x86', 'opus/celt/x86']
+
+	defines = ['OPUS_BUILD', 'FLOAT_APPROX', 'PACKAGE_VERSION="1.4.0"', 'CUSTOM_MODES', 'ENABLE_HARDENING']
 
 	bld.stlib(
 		source = sources,

CONTRIBUTING.md

@@ -45,3 +45,8 @@
   Tags can be any: subsystem, simple feature name or even just a filename, without extension.
   Just keep them always same, it helps keep history clean and commit messages short.
 
+## LLM-based tools usage.
+
+While we wouldn't recommend using any LLM-based (also misleadingly called AI) tools, we understand that they are here to stay.
+
+Whether you're reporting bug or contributing the code, you take complete authorship and responsibility over provided content and the same rules will apply to you as for everybody else, so validate the bug report or the patch before sending it.

Documentation/donate.md

@@ -2,23 +2,27 @@
 
 On this page you can find links where you can support each developer individually, who has provided public sponsorship information.
 
-### [a1batross](https://github.com/a1batross)
+## [a1batross](https://github.com/a1batross)
 
-* Initial Xash3D SDL2/Linux port author, Xash3D FWGS engine maintainer, creator of non-commercial Flying With Gauss organization.
+Initial Xash3D SDL2/Linux port author, Xash3D FWGS engine maintainer, creator of non-commercial Flying With Gauss organization.
-* Boosty page: https://boosty.to/a1ba
 
-### [nekonomicon](https://github.com/nekonomicon)
+* [Boosty page](https://boosty.to/a1ba)
 
-* [hlsdk-portable](https://github.com/FWGS/hlsdk-portable), [mdldec](../utils/mdldec), [opensource-mods.md](opensource-mods.md) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=nekonomicon) (*BSD/clang port, PNG support, etc).
+## [nekonomicon](https://github.com/nekonomicon)
-* Boosty page: https://boosty.to/nekonomicon
 
-### [Velaron](https://github.com/Velaron)
+[hlsdk-portable](https://github.com/FWGS/hlsdk-portable), [mdldec](../utils/mdldec), [opensource-mods.md](opensource-mods.md) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=nekonomicon) (*BSD/clang port, PNG support, etc).
-* [cs16-client](https://github.com/Velaron/cs16-client) & [tf15-client](https://github.com/Velaron/tf15-client) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=Velaron) (Android port, voice chat, etc).
-* BuyMeACoffee page: https://www.buymeacoffee.com/velaron
 
-### [SNMetamorph](https://github.com/SNMetamorph)
+* [Boosty page](https://boosty.to/nekonomicon)
-* [PrimeXT](https://github.com/SNMetamorph/PrimeXT) & [GoldSrc Monitor](https://github.com/SNMetamorph/goldsrc-monitor) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=SNMetamorph) (Windows port, voice chat, etc).
+
-* BTC: `16GAzK3qei5AwBW7sggXp3yNcFHBtdpxXj`
+## [Velaron](https://github.com/Velaron)
-* ETH (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
+
-* USDT (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
+[cs16-client](https://github.com/Velaron/cs16-client) & [tf15-client](https://github.com/Velaron/tf15-client) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=Velaron) (Android port, voice chat, etc).
-* USDC (ERC20): `0xb580eeca9756e3881f9d6d026e28db28eb72a383`
+
+* [Boosty page](https://boosty.to/velaron)
+
+## [SNMetamorph](https://github.com/SNMetamorph)
+
+[PrimeXT](https://github.com/SNMetamorph/PrimeXT) & [GoldSrc Monitor](https://github.com/SNMetamorph/goldsrc-monitor) maintainer and Xash3D FWGS [contributor](https://github.com/FWGS/xash3d-fwgs/commits?author=SNMetamorph) (Windows port, voice chat, etc).
+
+* [Boosty page](https://boosty.to/snmetamorph)
+* [Other donation methods](https://snmetamorph.github.io/donate)

Documentation/extensions/library-naming.md

@@ -42,3 +42,6 @@ Issue #3: Some mods (like The Specialists, Tyrian, ...) already apply suffixes _
 Resolution: On x86 on **Win/Lin/Mac**, don't change anything. Otherwise, strip the _i?86 part and follow the usual scheme.
 
 See discussion: https://github.com/FWGS/xash3d-fwgs/issues/39
+
+Issue #4: When distributing game libraries on Android inside an APK, they couldn't be loaded.
+Resolution: Enable `useLegacyPackaging` option in build.gradle, when distributing games in APK. Always force game libraries to have `lib` prefix on Android, regardless if they are packaged in APK or not..

Documentation/not-supported-mod-list-and-reasons-why.md

@@ -2,10 +2,19 @@
 
 |Name							|Version			|Why not working						|What was made for that
 |----							|-------			|---------------						|----------------------
-|Blue Shift						|The latest steam release	|Uses vgui2 library which xash3d does not support		|Recreated source code here: https://github.com/FWGS/hlsdk-xash3d/tree/bshift
+|Area 51						|Update 1			|Uses outdated BSP31 map format and custom HLFX SDK libraries.	|You can try [this tool](https://hlfx.ru/forum/showthread.php?threadid=5250) to convert maps but there no warranty if it works.
-|Counter Strike						|1.6(The latest steam release)	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Arrange Mod: Rebirth					|v150				|No idea yet.							|
-|Counter Strike: Condition Zero				|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Blue Shift						|The latest steam release	|Uses vgui2 library which xash3d does not support.		|Recreated source code here: https://github.com/FWGS/hlsdk-xash3d/tree/bshift.
-|Counter Strike: Condition Zero - Deleted scenes	|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|Counter Strike						|Beta 6.5-			|Uses an old WON HL 1.0.0.16- interface.			|
-|Day of Defeat						|The latest steam release	|Uses vgui2 library which xash3d does not support		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface
+|							|1.4				|Has encrypted blob instead of normal client.dll.		|You can try [this tool](https://aluigi.altervista.org/papers/hldlldec.zip) to decrypt client.dll but there no warranty if it works.
-|Sven-Coop						|5.0+				|Uses custom GoldSrc engine					|
+|							|1.5				|Has encrypted blob instead of normal client.dll.		|Decrypted blob here: https://csm.dev/threads/cs-1-5-client-dll-decrypted-patched-for-usage.38845.
-
+|							|1.6(The latest steam release)	|Uses vgui2 library which xash3d does not support.		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface. Recreated Client Source Code here: https://github.com/Velaron/cs16-client.
+|Counter Strike: Condition Zero				|The latest steam release	|Uses vgui2 library which xash3d does not support.		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface. Recreated Client Source Code here: https://github.com/Velaron/cs16-client.
+|Counter Strike: Condition Zero - Deleted scenes	|The latest steam release	|Uses vgui2 library which xash3d does not support. Uses new sequences code on engine-side that was never used in any other mods before.		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface.
+|Day of Defeat						|The latest steam release	|Uses vgui2 library which xash3d does not support.		|Some work on vgui2 support was made here: https://github.com/FWGS/xash3d/tree/vinterface.
+|Half-Life: Extended					|Day One demo			|Uses many hooks to GoldSource engine and version check.	|Just wait new version or use more old version.
+|Icon of Hell						|Beta 0.99			|Uses outdated BSP31 map format and paranoia 2 libraries.	|You can try [this tool](https://hlfx.ru/forum/showthread.php?threadid=5250) to convert maps and use Paranoia 2: The Savior 1.51 libraries but there no warranty if it works.
+|Paranoia 2: The Savior					|All builds older 1.51		|Uses an old renderer interface and engine features.		|
+|Rebellion						|1.0				|Uses an old WON HL 1.0.0.16- interface.			|Recreated source code here: https://github.com/FWGS/hlsdk-xash3d/tree/rebellion.
+|Sven-Coop						|5.0+				|Uses custom GoldSrc engine.					|
+|Time Shadows						|Beta 0.1			|Uses Direct3D renderer.					|

Documentation/opensource-mods.md

@@ -32,6 +32,9 @@ Version 1.9 mirrored on github - https://github.com/solidi/hl-mods/tree/master/c
 ## Cold Ice Ressurection
 Mirrored on github - https://github.com/solidi/hl-mods/tree/master/cir
 
+## Counter-Life
+Available on ModDB - https://www.moddb.com/mods/counter-life/downloads/cl-version-1-source-code
+
 ## Cthulhu
 Uploaded to github by Oleg Cherkasky - https://github.com/gunrunners-paradise/Cthulhu-HLmod-SDK
 
@@ -124,6 +127,11 @@ Mirrored on github - https://github.com/nekonomicon/HeartOfEvil
 ## Ingram Chillin' Mod
 Official SourceForge repository - https://sourceforge.net/projects/icm-hl/
 
+## Master Sword
+Official github repository of Master Sword Classic - https://github.com/BerntA/MasterSwordClassic
+
+Official github repository of Master Sword Rebirth - https://github.com/MSRevive/MasterSwordRebirth
+
 ## MechMod
 Official github repository - https://github.com/vermagav/mechmod
 
@@ -202,7 +210,7 @@ Branch **redempt** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tr
 OpenAG by YaLTeR - https://github.com/YaLTeR/OpenAG
 
 ## Afraid of Monsters
-malortie's recreation - https://github.com/malortie/hl-aom
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-aom
 
 Branch **aom** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aom
 
@@ -210,17 +218,17 @@ Branch **aom** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/a
 Reverse-engineered code: branch **aomdc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/aomdc
 
 ## Azure Sheep
-malortie's recreation - https://github.com/malortie/hl-asheep
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-asheep
 
 Reverse-engineered code: branch **asheep** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/asheep
 
 ## Big Lolly
-malortie's recreation - https://github.com/malortie/hl-biglolly
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-biglolly
 
 Branch **biglolly** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/biglolly
 
 ## Black Ops
-malortie's recreation - https://github.com/malortie/hl-blackops
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-blackops
 
 Branch **blackops** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/blackops
 
@@ -249,7 +257,7 @@ Recreation by lostgamer aka nillerusr - https://github.com/LostGamerHL/crack_lif
 Reverse-engineered code: branch **clcampaign** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/clcampaign
 
 ## Escape from the Darkness
-malortie's recreation - https://github.com/malortie/hl-eftd
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-eftd
 
 Reverse-engineered code: branch **eftd** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/eftd
 
@@ -280,7 +288,7 @@ Reverse-engineered code: branch **rebellion** in hlsdk-portable - https://github
 Branch **hl_urbicide** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/hl_urbicide
 
 ## Half-Life: Visitors
-malortie's recreation - https://github.com/malortie/hl-visitors
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-visitors
 
 Reverse-engineered code: branch **visitors** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/visitors
 
@@ -288,17 +296,17 @@ Reverse-engineered code: branch **visitors** in hlsdk-portable - https://github.
 Branch **half-secret** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/half-secret
 
 ## Night at the Office
-malortie's recreation - https://github.com/malortie/hl-nato
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-nato
 
 Branch **noffice** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/noffice
 
 ## Poke 646
-malortie's recreation - https://github.com/malortie/hl-poke646
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-poke646
 
 Reverse-engineered code: branch **poke646** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646
 
 ## Poke 646: Vendetta
-malortie's recreation - https://github.com/malortie/hl-poke646-vendetta
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-poke646-vendetta
 
 Reverse-engineered code: branch **poke646_vendetta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/poke646_vendetta
 
@@ -315,19 +323,19 @@ Branch **sewer_beta** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable
 Reverse-engineered code by Velaron - https://github.com/Velaron/tf15-client
 
 ## The Gate
-malortie's recreation - https://github.com/malortie/hl-thegate
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-thegate
 
 Reverse-engineered code: branch **thegate** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/thegate
 
 ## They Hunger
-malortie's recreation - https://github.com/malortie/hl-theyhunger
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-theyhunger
 
 Reverse-engineered code: branch **theyhunger** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/theyhunger
 
 They Hunger: Tactical - https://www.moddb.com/mods/they-hunger-tactical/downloads/tht-source-code-documentation
 
 ## Times of Troubles
-malortie's recreation - https://github.com/malortie/hl-tot
+malortie's recreation - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-tot
 
 Branch **tot** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/tot
 
@@ -349,7 +357,7 @@ Branch **dmc** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/d
 Branch **echoes** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/echoes
 
 ## Half-Life: Invasion
-Port to HLSDK 2.4 by malortie - https://github.com/malortie/hl-invasion
+Port to HLSDK 2.4 by malortie - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-invasion
 
 Port to Linux by fmoraw - https://github.com/fmoraw/hlinvasion
 
@@ -368,7 +376,7 @@ Port to Linux - https://github.com/fmoraw/NS
 Version 1.2: branch **sohl1.2** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/sohl1.2
 
 ## Swiss Cheese Halloween 2002
-Just more playable version by malortie - https://github.com/malortie/hl-shall
+Just more playable version by malortie - https://github.com/HL1-Mods-Reimplementations-and-Ports/hl-shall
 
 Branch **halloween** in hlsdk-portable - https://github.com/FWGS/hlsdk-portable/tree/halloween
 

Documentation/psvita.md

@@ -2,11 +2,14 @@
 
 ### Prerequisites
 1. Make sure your PSVita is [set up to run homebrew applications](https://vita.hacks.guide/).
-2. Install [kubridge](https://github.com/TheOfficialFloW/kubridge/releases/) by copying `kubridge.suprx` to your taiHEN plugins folder (usually `ux0:/tai`) and add it to your `config.txt`, for example:
+2. Install [kubridge](https://github.com/TheOfficialFloW/kubridge/releases/). It is recommended to use kubridge version `0.1`, because other versions aren't tested, we don't know are they suitable or not.
+
+   Worth to notice, we got reports that automatic plugins management app EasyPlugin have issues with installing kubridge plugin, so it's better to install it manually: by copying `kubridge.suprx` to your taiHEN plugins folder (usually `ux0:/tai`, but could be `ur0:/tai`) and add it to your `config.txt`, for example:
    ```
    *KERNEL
    ux0:tai/kubridge.skprx
    ```
+
 3. Install `libshacccg.suprx` by following [this guide](https://cimmerian.gitbook.io/vita-troubleshooting-guide/shader-compiler/extract-libshacccg.suprx).
 
 ### Installation

Documentation/public-servers-rules-and-recommendations.md

@@ -1,15 +0,0 @@
-As online community is growing, we don't want to keep bad or invalid servers on the Internet Games list. It's a common rules for all Xash3D server owners who are using default master server. 
-
-1. Breaking master server or clients is prohibited in any way. If you found a serious bug, contact us at contact 'at' fwgs.ru or post an issue at GitHub.
-
-2. Changing settings, exploiting vulnerabilities of clients is prohibited in any way. If you found a serious bug, contact us at contact 'at' fwgs.ru or post an issue at GitHub.
-
-2. Agressive advertisement and spam on other servers is prohibited in any way.
-
-3. If your server is require downloading custom content, it should be available for everyone. Recommended way to deliver custom content is FastDL.
-
-4. It's recommended to keep your server is up-to-date. You may use our public Debian/Ubuntu/Arch Linux [repository](https://github.com/FWGS/xash3d/wiki/How-to-set-up-a-Xash3D-Dedicated-Server-on-Debian-or-Ubuntu) to simplify updating process.
-
-Just follow these rules to not get banned on our master server. Good luck, have fun!
-
-

Documentation/supported-mod-list.md

@@ -982,27 +982,33 @@ Support for other platforms may be available later.
 
 To run this mod on specific platforms you may be need to compile libraries from **eftd** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-19. **[Half-Life: Blue Shift](https://store.steampowered.com/app/130/HalfLife_Blue_Shift/)**
+19. **[Gang Wars](https://www.moddb.com/mods/gangwars)**
-
-To run this mod on specific platforms you may be need to compile libraries from **bshift** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
-
-20. **[Half-Life: Decay](https://www.moddb.com/mods/half-life-decay)**
-
-Currently, you can compile mod libraries for x86 Linux from **pc-decay2** branch [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
-
-Support for other platforms may be available later.
-
-21. **[Half-Life: Echoes](https://www.moddb.com/mods/half-life-echoes)**
-
-To run this mod on specific platforms you may be need to compile libraries from **echoes** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
-
-22. **[Half-Life: Field Intensity](https://www.moddb.com/mods/field-intensity)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-23. **Half-Life: Gravgun** (unfinished) by *mittorn*, *a1batross* and *Solexid*
+20. **[Half-Life: Blue Shift](https://store.steampowered.com/app/130/HalfLife_Blue_Shift/)**
+
+To run this mod on specific platforms you may be need to compile libraries from **bshift** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
+
+21. **[Half-Life: Decay](https://www.moddb.com/mods/half-life-decay)**
+
+Currently, you can compile mod libraries for x86 Linux from **decay-pc** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
+
+Support for other platforms may be available later.
+
+22. **[Half-Life: Echoes](https://www.moddb.com/mods/half-life-echoes)**
+
+To run this mod on specific platforms you may be need to compile libraries from **echoes** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
+
+23. **[Half-Life: Field Intensity](https://www.moddb.com/mods/field-intensity)**
+
+This mod already supports x86 Linux.
+
+Support for other platforms may be available later.
+
+24. **Half-Life: Gravgun** (unfinished) by *mittorn*, *a1batross* and *Solexid*
 
 *Support temporary abandoned*
 
@@ -1012,163 +1018,163 @@ Currently, MSVC is not supported, use MinGW if you need build for Windows.
 
 Mod files: [1](http://mittorn.fwgs.ru/coop-entpatches/), [2](http://mittorn.fwgs.ru/ggm/), [3](https://github.com/nillerusr/gravgun-extras).
 
-24. **[Half-Life: Induction 1.2](https://www.moddb.com/mods/half-life-induction)**
+25. **[Half-Life: Induction 1.2](https://www.moddb.com/mods/half-life-induction)**
 
 To run this mod on specific platforms you may be need to compile libraries from **induction_1.2** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-25. **[Half-Life: Invasion](https://www.moddb.com/mods/half-life-invasion)**
+26. **[Half-Life: Invasion](https://www.moddb.com/mods/half-life-invasion)**
 
 This mod supports x86 Linux.
 
 Support for other platforms may be available later.
 
-26. **[Half-Life: Intense Force](https://www.moddb.com/downloads/intense-force)**
+27. **[Half-Life: Intense Force](https://www.moddb.com/downloads/intense-force)**
 
 This mod already supports x86 Linux.
 
 To run this mod on specific platforms you may be need to compile libraries from **intense_force** branch of [halflife-featureful](https://github.com/FreeSlave/halflife-featureful).
 
-27. **[Half-Life: Opposing Force](https://store.steampowered.com/app/50/HalfLife_Opposing_Force/)**
+28. **[Half-Life: Opposing Force](https://store.steampowered.com/app/50/HalfLife_Opposing_Force/)**
 
 Steam version already supports x86 Linux.
 
 To run this mod on specific platforms you may be need to compile libraries from **opfor** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-28. **[Half-Life: Quest mod](https://csm.dev/threads/half-life-the-quest-mod-isxodniki.38030/)**
+29. **[Half-Life: Quest mod](https://csm.dev/threads/half-life-the-quest-mod-isxodniki.38030/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **sci** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-29. **[Half-Life: TopDown](https://www.moddb.com/mods/half-life-top-downs)**
+30. **[Half-Life: TopDown](https://www.moddb.com/mods/half-life-top-downs)**
 
 To run this mod on specific platforms you may be need to compile libraries from **topdown** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-30. **[Half-Life: Urbicide](https://www.moddb.com/mods/half-life-urbicide)**
+31. **[Half-Life: Urbicide](https://www.moddb.com/mods/half-life-urbicide)**
 
 To run this mod on specific platforms you may be need to compile libraries from **hl_urbicide** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-31. **[Half-Life: Visitors](https://www.moddb.com/mods/half-life-visitors)**
+32. **[Half-Life: Visitors](https://www.moddb.com/mods/half-life-visitors)**
 
 To run this mod on specific platforms you may be need to compile libraries from **visitors** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-32. **[Half-Rats: Parasomnia](https://www.moddb.com/mods/half-rats-parasomnia/downloads/half-rats-parasomnia-v10b-steamlinux)**
+33. **[Half-Rats: Parasomnia](https://www.moddb.com/mods/half-rats-parasomnia/downloads/half-rats-parasomnia-v10b-steamlinux)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-33. **[Half-Screwed: Death and Rebirth](https://www.moddb.com/mods/half-screwed)**
+34. **[Half-Screwed: Death and Rebirth](https://www.moddb.com/mods/half-screwed)**
 
 To run this mod on specific platforms you may be need to compile libraries from **half-screwed** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-34. **[Half-Secret](https://www.moddb.com/mods/half-secret)**
+35. **[Half-Secret](https://www.moddb.com/mods/half-secret)**
 
 To run this mod on specific platforms you may be need to compile libraries from **half-secret** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-35. **[Natural Selection](https://www.moddb.com/mods/natural-selection)**
+36. **[Natural Selection](https://www.moddb.com/mods/natural-selection)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-36. **[Night at the Office](https://www.moddb.com/mods/night-at-the-office)**
+37. **[Night at the Office](https://www.moddb.com/mods/night-at-the-office)**
 
 To run this mod on specific platforms you may be need to compile libraries from **noffice** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-37. **[Paranoia](https://www.moddb.com/mods/paranoia)**
+38. **[Paranoia](https://www.moddb.com/mods/paranoia)**
 
 *Support temporary abandoned*
 
 [Source code](https://github.com/FWGS/paranoia_toolkit).
 
-38. **[Poke646](https://poke646.com/)**
+39. **[Poke646](https://poke646.com/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **poke646** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-39. **[Poke646: Vendetta](https://poke646.com/)**
+40. **[Poke646: Vendetta](https://poke646.com/)**
 
 To run this mod on specific platforms you may be need to compile libraries from **poke646_vendetta** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-40. [PrimeXT](https://snmetamorph.github.io/PrimeXT/)
+41. [PrimeXT](https://snmetamorph.github.io/PrimeXT/)
 
 [Source code](https://github.com/SNMetamorph/PrimeXT)
 
-41. **[Quake Remake](https://www.moddb.com/games/quake-remake)**
+42. **[Quake Remake](https://www.moddb.com/games/quake-remake)**
 
 *Support was fully abandoned due Quake Wrapper release.*
 
 [Actual source code](https://github.com/FWGS/quakeremake)
 
-42. **[Rebellion](https://www.moddb.com/mods/rebellion1)**
+43. **[Rebellion](https://www.moddb.com/mods/rebellion1)**
 
 To run this mod on specific platforms you may be need to compile libraries from **rebellion** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-43. **[Residual Life](https://www.moddb.com/mods/hl-residual-life)**
+44. **[Residual Life](https://www.moddb.com/mods/hl-residual-life)**
 
 To run this mod on specific platforms you may be need to compile libraries from **residual_point** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-44. **[Residual Point](https://www.moddb.com/mods/hl-residual-point)**
+45. **[Residual Point](https://www.moddb.com/mods/hl-residual-point)**
 
 To run this mod on specific platforms you may be need to compile libraries from **residual_point** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-45. **[Ricochet](https://store.steampowered.com/app/60/Ricochet/)**
+46. **[Ricochet](https://store.steampowered.com/app/60/Ricochet/)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-46. [Sewer](https://www.moddb.com/games/half-life/addons/sewer-beta)
+47. [Sewer](https://www.moddb.com/games/half-life/addons/sewer-beta)
 
 To run this mod on specific platforms you may be need to compile libraries from **sewer_beta** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-47. [Spirit of Half-Life 1.2](https://www.moddb.com/mods/spirit-of-half-life)
+48. [Spirit of Half-Life 1.2](https://www.moddb.com/mods/spirit-of-half-life)
 
 To run this mod on specific platforms you may be need to compile libraries from **sohl1.2** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-48. **[Swiss Cheese Halloween](https://www.moddb.com/mods/half-life-halloween-mod)**
+49. **[Swiss Cheese Halloween](https://www.moddb.com/mods/half-life-halloween-mod)**
 
 To run this mod on specific platforms you may be need to compile libraries from **halloween** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-49. **[Team Fortress Classic](https://store.steampowered.com/app/20/Team_Fortress_Classic/)**
+50. **[Team Fortress Classic](https://store.steampowered.com/app/20/Team_Fortress_Classic/)**
 
 This mod already supports x86 Linux.
 
 Currently, only source code of [client part](https://github.com/Velaron/tf15-client) is available.
 
-50. **[The Gate](https://www.moddb.com/mods/the-gate)**
+51. **[The Gate](https://www.moddb.com/mods/the-gate)**
 
 To run this mod on specific platforms you may be need to compile libraries from **thegate** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-51. **[They Hunger: Trilogy](https://www.moddb.com/mods/they-hunger)**
+52. **[They Hunger: Trilogy](https://www.moddb.com/mods/they-hunger)**
 
 To run this mod on specific platforms you may be need to compile libraries from **theyhunger** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-52. **[ThreeWave CTF](https://www.moddb.com/games/deathmatch-classic/downloads/threewave-ctf)**
+53. **[ThreeWave CTF](https://www.moddb.com/games/deathmatch-classic/downloads/threewave-ctf)**
 
 To run this mod on specific platforms you may be need to compile libraries from **dmc** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-53. **[Times of Troubles](https://www.moddb.com/mods/times-of-troubles)**
+54. **[Times of Troubles](https://www.moddb.com/mods/times-of-troubles)**
 
 To run this mod on specific platforms you may be need to compile libraries from **tot** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
-54. [XashXT](https://csm.dev/threads/xashxt-0-65-rev-4-release-stable.38319/)
+55. [XashXT](https://csm.dev/threads/xashxt-0-65-rev-4-release-stable.38319/)
 
 *Support was fully abandoned due PrimeXT development*
 
 [Source code](https://github.com/FWGS/XashXT-FWGS/)
 
-55. **[X-Half-Life DeathMatch](https://www.moddb.com/mods/xdm)**
+56. **[X-Half-Life DeathMatch](https://www.moddb.com/mods/xdm)**
 
 This mod already supports x86 Linux.
 
 Support for other platforms may be available later.
 
-56. **[Xen-Warrior](https://www.moddb.com/mods/xen-warrior)**
+57. **[Xen-Warrior](https://www.moddb.com/mods/xen-warrior)**
 
 To run this mod on specific platforms you may be need to compile libraries from **sohl1.2** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 
 Don't forget to enable XENWARRIOR build option!!!
 
-57. [Zombie-X](https://www.moddb.com/mods/zombie-x-10-final)
+58. [Zombie-X](https://www.moddb.com/mods/zombie-x-10-final)
 
 To run this mod on specific platforms you may be need to compile libraries from **zombie-x** branch of [hlsdk-portable](https://github.com/FWGS/hlsdk-portable).
 

Documentation/touch-controls.md

@@ -0,0 +1,149 @@
+# Touch controls configuring
+
+## Introduction
+
+Thanks to mittorn, we have the ability to fully customize the controls in Xash3D. The new config allows you to not only add and change control buttons, but also create custom menus. There is also a built-in visual editor available, which simplifies the customization process without the need for manual file editing.
+
+## Editor mode usage
+
+1. Launch Xash3D and start the game.
+2. To enter the edit mode, click on the gear icon (command `touch_enableedit`).
+3. In the edit mode, the grid is displayed. The number of cells can be changed with the command `touch_grid_count` (default is 50). The grid can be disabled with the command `touch_grid_enable 0`.
+
+*Touch controls layout editor*
+![](images/editor.jpg)
+
+*Touch profiles window*
+![](images/touch-profiles.jpg)
+
+*Touch buttons parameters window*
+![](images/touch-buttons.jpg)
+
+## Layout editor features
+
+* **Moving buttons**: click on a button, drag it to the desired location, and release.
+* **Resizing buttons**: place your first finger on the top left corner of the button, and use your second finger to resize it.
+* **Hiding/showing buttons**: select the button (it will turn red), then use the menu:
+    * **Close**: closes the editing mode (`touch_disableedit`).
+    * **Reset**: resets the button to its default values.
+    * **Hide/Show**: hides or shows the button (`touch_hide <name>` / `touch_show <name>`).
+
+## Working with configuration files / console
+
+All changes made in the visual editor are automatically saved to the touch profile file. The files are located in the `touch_profiles` folder inside game directory. The file name depends on the selected profile.
+
+### Common commands in configuration files
+
+```
+// Comment: lines starting with // are ignored.
+
+// Swipe zones for movement. Specify how far you need to swipe to speed up.
+// The default values ​​are set to be optimal for a small swipe to immediately walk quickly.
+touch_forwardzone "0.060000" ; touch_sidezone "0.060000"
+
+// Sensitivity settings (pitch - horizontal, yaw - vertical).
+touch_pitch ; touch_yaw
+
+// Grid settings (see above).
+touch_grid_count ; touch_grid_enable
+
+// Draws a border around the button.
+touch_set_stroke <thickness> <c> <v> <e> <t>
+(<r> - red; <g> - green; <b> - blue; <a> - alpha/transparency)
+
+// Show (1) or hide (0) client buttons.
+touch_setclientonly
+
+// Removes all buttons from the screen.
+touch_removeall
+
+// Shows all available buttons in the configuration file.
+touch_list
+
+// Saves the config after editing. You can specify a new file name.
+touch_config_file command.cfg
+```
+
+*The full list of buttons in the standard `touch.cfg` file, displayed in the console when using `touch_list`.*
+![](images/example2.jpg)
+
+
+## Adding new buttons
+
+To add a new button, use the console command:
+
+```
+touch_addbutton "digits" "touch/key_1.png" "toggle_digits" 0.340000 0.782222 0.400000 0.888889 255 255 255 100 0
+```
+
+### Parameters of `touch_addbutton` command
+
+| Parameter | Description |
+| --- | --- |
+| `"digits"` | Unique name of the button. |
+| `"touch/key_1.png"` | Path to the icon file (`.png` format). If the icon is not needed, leave `""`. |
+| `"toggle_digits"` | Command to execute after clicking (for example, `"buy"` for purchase). |
+| `0.340000` | X coordinate of the upper-left corner of the button. |
+| `0.782222` | Y coordinate of the upper-left corner of the button. |
+| `0.400000` | X coordinate of the lower-right corner of the button. |
+| `0.888889` | Y coordinate of the lower-right corner of the button. |
+| `255 255 255` | Button color in RGB format. |
+| `100` | Button transparency (0 - fully transparent, 255 - fully opaque). |
+| `0` | Flags (see next section). |
+
+## List of flags
+
+Flags define the behavior of the button. Their values ​​are powers of two:
+
+| Flag | Value | Description |
+| --- | --- | --- |
+| `TOUCH_FL_HIDE` | 1 | Hides the button (not displayed in the game, but visible in the editor). |
+| `TOUCH_FL_NOEDIT` | 2 | Disables editing of the button in the editor. |
+| `TOUCH_FL_CLIENT` | 4 | The button is client-side (not saved in the main control file). |
+| `TOUCH_FL_MP` | 8 | The button is displayed only in multiplayer. |
+| `TOUCH_FL_SP` | 16 | The button is displayed only in singleplayer. |
+| `TOUCH_FL_DEF_SHOW` | 32 | The button is always displayed on startup. |
+| `TOUCH_FL_DEF_HIDE` | 64 | The button is always hidden on startup. |
+| `TOUCH_FL_DRAW_ADDITIVE` | 128 | The button colors are added together in blend mode. |
+| `TOUCH_FL_STROKE` | 256 | Enables outline stroke around the button. |
+
+Flags can be combined by adding their values ​​together. For example, `5 = 1 + 4` is the combination of `TOUCH_FL_HIDE` and `TOUCH_FL_CLIENT` flags, which is a hidden client button.
+
+*In the image below, the `spray`, `scores`, `messagemode` buttons are displayed simultaneously with the flag 8 and `loadquick`, `savequick` with the flag 16, and each is displayed in the corresponding game mode.*
+![](images/example1.jpg)
+
+## Useful commands
+
+* `touch_hide <pattern>`: hides buttons by pattern.
+* `touch_setcommand`: changes the command bound to a button.
+* `touch_settexture`: quickly changes the button image.
+* `touch_setcolor`: sets the button color.
+* `touch_exportconfig`: exports the current configuration, including aspect ratio.
+
+## Usage examples
+
+* `touch_hide menu*` hides all buttons with names starting with `menu`.
+* `touch_setcolor "attack" 255 160 0 128` changes the color of the primary fire button from opaque white to translucent orange, similar to the color of the HUD in Half-Life.
+
+    *Result of executing this command*
+    ![](images/example3.jpg)
+
+* Example of adding a new button with a custom icon (the `lastinv` command is used - quick change between weapons)
+    ![](images/example4.jpg)
+
+    *View of this button in layout editor*
+    ![](images/example5.jpg)
+
+## Tips
+
+* To prevent the `look` and `move` buttons from interfering with editing other elements, place them before the others in the configuration file.
+* And vice versa, to make a button appear on top of others, place it at the end of the configuration file.
+* You can assign commands to buttons that change other buttons, see the previous section "Usage examples".
+* After editing each parameter of each individual button in the Touch Buttons section, do not forget to press Save, otherwise the applied parameters will not be saved.
+* To create your own icon for the button, you can use any graphics editor (for Android, Photo Editor by iudesk is suitable). Saving conditions:
+    * Image format - `.png` with transparency (e.g. alpha channel)
+    * Aspect ratio / size - 1:1 / 256x256
+    * Path to the icons location - `touch/gfx` inside game directory.
+    
+### Additional links
+* [Handy palette for selecting color in RGB format](https://www.rapidtables.com/web/color/RGB_Color.html)

README.md

@@ -36,6 +36,11 @@ You still needed to copy `valve` directory as all game resources located there.
 
 For additional info, run Xash3D with `-help` command line key.
 
+### Android
+0) Install the APK file.
+1) Copy `valve` directory to a folder named `xash` in the Internal storage.
+2) Run games from within the app.
+
 ## Contributing
 * Before sending an issue, check if someone already reported your issue. Make sure you're following "How To Ask Questions The Smart Way" guide by Eric Steven Raymond. Read more: http://www.catb.org/~esr/faqs/smart-questions.html.
 * Issues are accepted in both English and Russian.
@@ -44,7 +49,7 @@ For additional info, run Xash3D with `-help` command line key.
 ## Build instructions
 We are using Waf build system. If you have some Waf-related questions, I recommend you to read [Waf Book](https://waf.io/book/).
 
-NOTE: NEVER USE GitHub's ZIP ARCHIVES. GitHub doesn't include external dependencies we're using!
+**NOTE: NEVER USE GitHub's ZIP ARCHIVES. GitHub doesn't include external dependencies we're using!**
 
 ### Prerequisites
 If your CPU is x86 compatible and you're on Windows or Linux, we are building 32-bit code by default. This was done to maintain compatibility with Steam releases of Half-Life and based on it's engine games.
@@ -84,6 +89,15 @@ This repository contains our fork of HLSDK and restored source code for Half-Lif
 
 * Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
 
+#### Android (Windows/Linux/macOS)
+* Install [Android Studio](https://developer.android.com/studio) (or the command line tools).
+* Install [Python](https://python.org) (at least 2.7, latest is better).
+* Install [Git](https://git-scm.com/download/win).
+* Install [Ninja](https://ninja-build.org/).
+* Install [CMake](https://cmake.org/) (for some dependencies).
+
+* Clone this repostory: `$ git clone --recursive https://github.com/FWGS/xash3d-fwgs`.
+
 ### Building
 #### Windows (Visual Studio)
 0) Open command line.
@@ -100,3 +114,6 @@ If compiling 32-bit on amd64, make sure `PKG_CONFIG_PATH` from the previous step
 1) Configure build: `./waf configure` (you need to pass `-8` to compile 64-bit engine on 64-bit x86 processor).
 2) Compile: `./waf build`.
 3) Install: `./waf install --destdir=/path/to/any/output/directory`.
+
+#### Android (Windows/Linux/macOS)
+You can just open the `android` folder in Android Studio and build from here, or use `gradlew` to build from command line.

android/app/CMakeLists.txt

@@ -1,95 +0,0 @@
-cmake_minimum_required(VERSION 3.22)
-
-# Only used to build Android project
-
-project(XASH_ANDROID)
-
-# armeabi-v7a requires cpufeatures library
-if(ANDROID)
-	include_directories(${ANDROID_NDK}/sources/android/cpufeatures)
-	add_library(cpufeatures ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
-	target_link_libraries(cpufeatures dl)
-endif()
-
-include(FindPython)
-
-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-	set(BUILD_TYPE "debug")
-else()
-	set(BUILD_TYPE "release")
-	list(APPEND WAF_EXTRA_ARGS --enable-poly-opt --enable-lto --enable-limited-debuginfo)
-endif()
-
-if(ANDROID_ABI STREQUAL "x86")
-	# HACKHACK: I don't know why but engine gets built as 64-bit binary here
-	list(APPEND WAF_EXTRA_ARGS -4)
-endif()
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
-
-# not cleanest way to get upper directory
-set(ENGINE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../")
-
-set(WAF_CC "${CMAKE_C_COMPILER} --target=${CMAKE_C_COMPILER_TARGET}")
-set(WAF_CXX "${CMAKE_CXX_COMPILER} --target=${CMAKE_CXX_COMPILER_TARGET}")
-set(WAF ${Python_EXECUTABLE} ${ENGINE_SOURCE_DIR}waf -t ${ENGINE_SOURCE_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/xash3d-fwgs)
-
-# try to build minimal SDL. Enable features as we're gonna use them
-set(SDL_RENDER OFF)
-set(SDL_POWER OFF)
-set(SDL_VULKAN OFF)
-set(SDL_DISKAUDIO OFF)
-set(SDL_DUMMYAUDIO OFF)
-set(SDL_DUMMYVIDEO OFF)
-set(SDL_VULKAN OFF)
-set(SDL_OFFSCREEN OFF)
-set(SDL_STATIC OFF)
-add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/SDL" SDL)
-
-include(ExternalProject)
-
-# gradle passes backslashes to cmake, how does this even work for everybody else?
-string(REPLACE "\\" "/" CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-
-ExternalProject_Add(
-	Xash3DFWGS
-	SOURCE_DIR ${ENGINE_SOURCE_DIR}
-	INSTALL_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-	BUILD_IN_SOURCE TRUE
-	DEPENDS SDL2
-	BUILD_ALWAYS TRUE
-	LOG_CONFIGURE TRUE
-	LOG_BUILD TRUE
-	LOG_INSTALL TRUE
-	LOG_OUTPUT_ON_FAILURE TRUE
-	LOG_MERGED_STDOUTERR TRUE
-
-#	USES_TERMINAL_CONFIGURE TRUE
-#	USES_TERMINAL_BUILD TRUE
-#	USES_TERMINAL_INSTALL TRUE
-
-	# NOTE: setting up WAFLOCK is important to avoid possible race conditions
-	CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env
-		ANDROID_NDK=${ANDROID_NDK}
-		BUILD_CMAKE_LIBRARY_OUTPUT_DIRECTORY=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-		WAFLOCK=.lock-waf_android_${ANDROID_ABI}_build
-		${WAF} configure -T ${BUILD_TYPE} --android=${ANDROID_ABI},,${CMAKE_SYSTEM_VERSION}
-		-s "${ENGINE_SOURCE_DIR}/3rdparty/SDL" --enable-bundled-deps ${WAF_EXTRA_ARGS}
-
-	BUILD_COMMAND ${CMAKE_COMMAND} -E env
-		WAFLOCK=.lock-waf_android_${ANDROID_ABI}_build
-		${WAF} build -v
-
-	INSTALL_COMMAND ${CMAKE_COMMAND} -E env
-		WAFLOCK=.lock-waf_android_${ANDROID_ABI}_build
-		${WAF} install --destdir=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
-)
-
-add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/hlsdk-portable" hlsdk-portable)
-
-# a1ba: without this, xash3d target will be ignored as nothing depends on it
-add_dependencies(client Xash3DFWGS)
-add_dependencies(server Xash3DFWGS)
-
-

android/app/build.gradle.kts

@@ -1,130 +1,140 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.time.LocalDateTime
 import java.time.Month
 import java.time.temporal.ChronoUnit
 
 plugins {
-    id("com.android.application")
+	alias(libs.plugins.android.application)
-    id("org.jetbrains.kotlin.android")
+	alias(libs.plugins.kotlin.android)
 }
 
 android {
-    namespace = "su.xash.engine"
+	namespace = "su.xash.engine"
-    ndkVersion = "28.0.13004108"
+	ndkVersion = "28.2.13676358"
+	compileSdk = 35
 
-    defaultConfig {
+	defaultConfig {
-        applicationId = "su.xash"
+		applicationId = "su.xash.engine"
-        applicationIdSuffix = "engine"
+		versionName = "0.21-" + getGitHash()
-        versionName = "0.21"
+		versionCode = getBuildNum()
-        versionCode = getBuildNum()
+		minSdk = 21
-        minSdk = 21
+		targetSdk = 35
-        targetSdk = 34
-        compileSdk = 34
 
-        externalNativeBuild {
+		externalNativeBuild {
-            cmake {
+			val engineRoot = projectDir.parentFile.parent
-                abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-                arguments("-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF")
-            }
-        }
-    }
 
-    externalNativeBuild {
+			experimentalProperties["ninja.abiFilters"] = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-        cmake {
+			experimentalProperties["ninja.path"] = File(engineRoot, "wscript").path
-            version = "3.22.1"
+			experimentalProperties["ninja.configure"] = "run-python"
-            path = file("CMakeLists.txt")
+			experimentalProperties["ninja.arguments"] = setOf(
-        }
+				File(engineRoot, "scripts/configure-ninja.py").path,
-    }
+				engineRoot,
+				"--variant=\${ndk.variantName}",
+				"--abi=\${ndk.abi}",
+				"--configuration-dir=\${ndk.buildRoot}",
+				"--ndk-version=\${ndk.moduleNdkVersion}",
+				"--min-sdk-version=\${ndk.minPlatform}",
+				"--ndk-root=${android.ndkDirectory}",
+				// shut up, fake options
+				"-p:Configuration=\${ndk.variantName}",
+				"-p:Platform=\${ndk.abi}"
+			)
+		}
+	}
 
-    compileOptions {
+	compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
+		sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_1_8
+		targetCompatibility = JavaVersion.VERSION_11
-    }
+	}
 
-    kotlinOptions {
+	kotlin {
-        jvmTarget = "1.8"
+		compilerOptions {
-    }
+			jvmTarget = JvmTarget.JVM_11
+		}
+	}
 
-    buildTypes {
+	buildFeatures {
-        debug {
+		viewBinding = true
-            isMinifyEnabled = false
+		buildConfig = true
-            isShrinkResources = false
+	}
-            isDebuggable = true
-            applicationIdSuffix = ".test"
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
-        }
 
-        release {
+	lint {
-            isMinifyEnabled = true
+		abortOnError = false
-            isShrinkResources = true
+	}
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
-        }
 
-        register("asan") {
+/*
-            initWith(getByName("debug"))
+	androidResources {
-        }
+		noCompress += ""
+	}
+*/
 
-        register("continuous") {
+	packaging {
-            initWith(getByName("release"))
+		jniLibs {
-            applicationIdSuffix = ".test"
+			keepDebugSymbols.add("**/*.so")
-        }
+			useLegacyPackaging = true
-    }
+		}
+	}
 
-    sourceSets {
+	sourceSets {
-        getByName("main") {
+		getByName("main") {
-            assets.srcDirs("../../3rdparty/extras/xash-extras", "../moddb")
+			assets.srcDirs("../../3rdparty/extras/xash-extras")
-            java.srcDir("../../3rdparty/SDL/android-project/app/src/main/java")
+			java.srcDir("../../3rdparty/SDL/android-project/app/src/main/java")
-        }
+		}
-    }
+	}
 
-    lint {
+	buildTypes {
-        abortOnError = false
+		debug {
-    }
+			isMinifyEnabled = false
+			isShrinkResources = false
+			isDebuggable = true
+			applicationIdSuffix = ".test"
+			proguardFiles(
+				getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+			)
+		}
 
-    buildFeatures {
+		release {
-        viewBinding = true
+			isMinifyEnabled = true
-        buildConfig = true
+			isShrinkResources = true
-    }
+			proguardFiles(
+				getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+			)
+		}
 
-    androidResources {
+		register("asan") {
-        noCompress += ""
+			initWith(getByName("debug"))
-    }
+		}
 
-    packaging {
+		register("continuous") {
-        jniLibs {
+			initWith(getByName("release"))
-            useLegacyPackaging = true
+			applicationIdSuffix = ".test"
-            keepDebugSymbols.add("**/*.so")
+		}
-        }
+	}
-    }
 }
 
 dependencies {
-    implementation("com.google.android.material:material:1.11.0")
+	implementation(libs.material)
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.7.7")
-    implementation("androidx.navigation:navigation-ui-ktx:2.7.7")
-    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.annotation:annotation:1.7.1")
-    implementation("androidx.fragment:fragment-ktx:1.6.2")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.work:work-runtime-ktx:2.9.0")
-//  implementation "androidx.legacy:legacy-support-v4:1.0.0"
 
-    implementation("com.madgag.spongycastle:prov:1.58.0.0")
+	implementation(libs.appcompat)
-    implementation("in.dragonbra:javasteam:1.2.0")
+	implementation(libs.navigation.runtime.ktx)
+	implementation(libs.navigation.fragment.ktx)
+	implementation(libs.navigation.ui.ktx)
+	implementation(libs.preference.ktx)
+	implementation(libs.swiperefreshlayout)
 
-    implementation("ch.acra:acra-http:5.11.2")
+	implementation(libs.acra.http)
 }
 
 fun getBuildNum(): Int {
-    val now = LocalDateTime.now()
+	val now = LocalDateTime.now()
-    val releaseDate = LocalDateTime.of(2015, Month.APRIL, 1, 0, 0, 0)
+	val releaseDate = LocalDateTime.of(2015, Month.APRIL, 1, 0, 0, 0)
-    val qBuildNum = releaseDate.until(now, ChronoUnit.DAYS)
+	val qBuildNum = releaseDate.until(now, ChronoUnit.DAYS)
-    val minuteOfDay = now.hour * 60 + now.minute
+	val minuteOfDay = now.hour * 60 + now.minute
-    return (qBuildNum * 10000 + minuteOfDay).toInt()
+	return (qBuildNum * 10000 + minuteOfDay).toInt()
+}
+
+fun getGitHash(): String {
+	val process = ProcessBuilder("git", "rev-parse", "--short", "HEAD").directory(project.rootDir)
+		.redirectErrorStream(true).start()
+	return process.inputStream.bufferedReader().readText().trim()
 }

android/app/proguard-rules.pro

@@ -1,3 +1,25 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
 -keep class su.xash.engine.XashActivity {
     java.lang.String loadAndroidID();
     java.lang.String getAndroidID();
@@ -87,3 +109,8 @@
     void hapticRun(int, float, int);
     void hapticStop(int);
 }
+
+# Unexpected reference to missing service class: META-INF/services/javax.annotation.processing.Processor.
+-dontwarn javax.annotation.processing.Processor
+-dontwarn javax.annotation.processing.AbstractProcessor
+-dontwarn javax.annotation.processing.SupportedOptions

android/app/run-python

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec python $@

android/app/run-python.bat

@@ -0,0 +1 @@
+python %*

android/app/src/debug/res/values/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Xash3D FWGS (Test)</string>
+	<string name="app_name" translatable="false">Xash3D FWGS (Test)</string>
-    <string name="authority" translatable="false">su.xash.engine.test.documents</string>
+</resources>
-</resources>

android/app/src/main/AndroidManifest.xml

@@ -1,101 +1,89 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+	android:allowAudioPlaybackCapture="true"
-    android:allowAudioPlaybackCapture="true"
+	android:installLocation="preferExternal">
-    android:installLocation="preferExternal"
+	<!-- OpenGL ES 1.1 -->
-    tools:targetApi="q">
+	<uses-feature android:glEsVersion="0x00010000" />
-    <!-- OpenGL ES 1.1 -->
+	<!-- Touchscreen support -->
-    <uses-feature android:glEsVersion="0x00010000" />
+	<uses-feature
-    <!-- Touchscreen support -->
+		android:name="android.hardware.touchscreen"
-    <uses-feature
+		android:required="false" />
-        android:name="android.hardware.touchscreen"
+	<!-- Game controller support -->
-        android:required="false" />
+	<uses-feature
-    <!-- Game controller support -->
+		android:name="android.hardware.bluetooth"
-    <uses-feature
+		android:required="false" />
-        android:name="android.hardware.bluetooth"
+	<uses-feature
-        android:required="false" />
+		android:name="android.hardware.gamepad"
-    <uses-feature
+		android:required="false" />
-        android:name="android.hardware.gamepad"
+	<uses-feature
-        android:required="false" />
+		android:name="android.hardware.usb.host"
-    <uses-feature
+		android:required="false" />
-        android:name="android.hardware.usb.host"
+	<!-- External mouse input events -->
-        android:required="false" />
+	<uses-feature
-    <!-- External mouse input events -->
+		android:name="android.hardware.type.pc"
-    <uses-feature
+		android:required="false" />
-        android:name="android.hardware.type.pc"
+	<!-- Audio recording support -->
-        android:required="false" />
+	<uses-feature
-    <!-- Audio recording support -->
+		android:name="android.hardware.microphone"
-    <uses-feature
+		android:required="false" />
-        android:name="android.hardware.microphone"
+	<!-- Allow downloading to the external storage on Android 5.1 and older -->
-        android:required="false" />
+	<uses-permission
-    <!-- Allow downloading to the external storage on Android 5.1 and older -->
+		android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-    <uses-permission
+		android:maxSdkVersion="22" />
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+	<uses-permission
-        android:maxSdkVersion="22" />
+		android:name="android.permission.READ_EXTERNAL_STORAGE"
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+		android:maxSdkVersion="32" />
-        android:maxSdkVersion="32" />
+	<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-    <!-- Allow access to Bluetooth devices -->
+	<!-- Allow access to Bluetooth devices -->
-    <!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
+	<!-- Currently this is just for Steam Controller support and requires setting SDL_HINT_JOYSTICK_HIDAPI_STEAM -->
-    <uses-permission
+	<uses-permission
-        android:name="android.permission.BLUETOOTH"
+		android:name="android.permission.BLUETOOTH"
-        android:maxSdkVersion="30" />
+		android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+	<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <!-- Allow access to the vibrator -->
+	<!-- Allow access to the vibrator -->
-    <uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.VIBRATE" />
-    <!-- Allow recording audio -->
+	<!-- Allow recording audio -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+	<uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <!-- Allow internet access -->
+	<!-- Allow internet access -->
-    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.INTERNET" />
-    <!-- Dedicated server -->
+	<!-- Dedicated server -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <application
+	<application
-        android:name=".MainApplication"
+		android:name=".MainApplication"
-        android:allowBackup="true"
+		android:allowBackup="true"
-        android:hardwareAccelerated="true"
+		android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher"
+		android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+		android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher"
-        android:theme="@style/Theme.App"
+		android:theme="@style/Theme.App"
-        android:usesCleartextTraffic="true">
+		android:usesCleartextTraffic="true"
-        <activity
+		android:requestLegacyExternalStorage="true">
-            android:name=".MainActivity"
+		<activity
-            android:exported="true">
+			android:name=".MainActivity"
-            <intent-filter>
+			android:exported="true">
-                <action android:name="android.intent.action.MAIN" />
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+				<category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+			</intent-filter>
-        </activity>
+		</activity>
-        <activity
+		<activity
-            android:name=".XashActivity"
+			android:name=".XashActivity"
-            android:alwaysRetainTaskState="true"
+			android:alwaysRetainTaskState="true"
-            android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation|touchscreen"
+			android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation|touchscreen"
-            android:exported="true"
+			android:exported="true"
-            android:launchMode="singleTask"
+			android:launchMode="singleTask"
-            android:preferMinimalPostProcessing="true"
+			android:preferMinimalPostProcessing="true"
-            android:windowSoftInputMode="adjustResize"
+			android:windowSoftInputMode="adjustResize">
-            tools:targetApi="r">
+			<intent-filter>
-            <intent-filter>
+				<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
-                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+			</intent-filter>
-            </intent-filter>
+		</activity>
-        </activity>
+	</application>
-
+	<queries>
-        <provider
+		<intent>
-            android:name=".XashDocumentsProvider"
+			<action android:name="su.xash.engine.MOD" />
-            android:authorities="@string/authority"
+		</intent>
-            android:exported="true"
+	</queries>
-            android:grantUriPermissions="true"
+</manifest>
-            android:permission="android.permission.MANAGE_DOCUMENTS">
-            <intent-filter>
-                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
-            </intent-filter>
-        </provider>
-    </application>
-
-    <queries>
-        <intent>
-            <action android:name="su.xash.engine.MOD" />
-        </intent>
-    </queries>
-</manifest>

android/app/src/main/java/su/xash/engine/AndroidBug5497Workaround.java

@@ -1,49 +0,0 @@
-package su.xash.engine;
-
-import android.app.Activity;
-import android.graphics.Rect;
-import android.view.View;
-import android.widget.FrameLayout;
-
-public class AndroidBug5497Workaround {
-    // For more information, see https://code.google.com/p/android/issues/detail?id=5497
-    // To use this class, simply invoke assistActivity() on an Activity that already has its content view set.
-
-    public static void assistActivity(Activity activity) {
-        new AndroidBug5497Workaround(activity);
-    }
-
-    private View mChildOfContent;
-    private int usableHeightPrevious;
-    private FrameLayout.LayoutParams frameLayoutParams;
-
-    private AndroidBug5497Workaround(Activity activity) {
-        FrameLayout content = activity.findViewById(android.R.id.content);
-        mChildOfContent = content.getChildAt(0);
-        mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
-        frameLayoutParams = (FrameLayout.LayoutParams) mChildOfContent.getLayoutParams();
-    }
-
-    private void possiblyResizeChildOfContent() {
-        int usableHeightNow = computeUsableHeight();
-        if (usableHeightNow != usableHeightPrevious) {
-            int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
-            int heightDifference = usableHeightSansKeyboard - usableHeightNow;
-            if (heightDifference > (usableHeightSansKeyboard / 4)) {
-                // keyboard probably just became visible
-                frameLayoutParams.height = usableHeightSansKeyboard - heightDifference;
-            } else {
-                // keyboard probably just became hidden
-                frameLayoutParams.height = usableHeightSansKeyboard;
-            }
-            mChildOfContent.requestLayout();
-            usableHeightPrevious = usableHeightNow;
-        }
-    }
-
-    private int computeUsableHeight() {
-        Rect r = new Rect();
-        mChildOfContent.getWindowVisibleDisplayFrame(r);
-        return (r.bottom - r.top);
-    }
-}

android/app/src/main/java/su/xash/engine/DedicatedActivity.kt

@@ -1,4 +1,3 @@
 package su.xash.engine
 
-class DedicatedActivity {
+class DedicatedActivity {}
-}

android/app/src/main/java/su/xash/engine/DedicatedService.kt

@@ -4,8 +4,8 @@ import android.app.Service
 import android.content.Intent
 import android.os.IBinder
 
-class DedicatedService: Service() {
+class DedicatedService : Service() {
-    override fun onBind(intent: Intent?): IBinder? {
+	override fun onBind(intent: Intent?): IBinder? {
-        TODO("Not yet implemented")
+		TODO("Not yet implemented")
-    }
+	}
-}
+}

android/app/src/main/java/su/xash/engine/MainActivity.kt

@@ -10,26 +10,26 @@ import androidx.navigation.ui.setupActionBarWithNavController
 import su.xash.engine.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityMainBinding
+	private lateinit var binding: ActivityMainBinding
-    private lateinit var appBarConfiguration: AppBarConfiguration
+	private lateinit var appBarConfiguration: AppBarConfiguration
-    private lateinit var navController: NavController
+	private lateinit var navController: NavController
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+	override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+		super.onCreate(savedInstanceState)
 
-        binding = ActivityMainBinding.inflate(layoutInflater)
+		binding = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+		setContentView(binding.root)
 
-        setSupportActionBar(binding.toolbar)
+		setSupportActionBar(binding.toolbar)
 
-        val navHostFragment =
+		val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as NavHostFragment
+			supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as NavHostFragment
-        navController = navHostFragment.navController
+		navController = navHostFragment.navController
-        appBarConfiguration = AppBarConfiguration(navController.graph)
+		appBarConfiguration = AppBarConfiguration(navController.graph)
-        setupActionBarWithNavController(navController, appBarConfiguration)
+		setupActionBarWithNavController(navController, appBarConfiguration)
-    }
+	}
 
-    override fun onSupportNavigateUp(): Boolean {
+	override fun onSupportNavigateUp(): Boolean {
-        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
+		return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
-    }
+	}
 }

android/app/src/main/java/su/xash/engine/MainApplication.kt

@@ -3,26 +3,25 @@ package su.xash.engine
 import android.app.Application
 import android.content.Context
 import android.os.StrictMode
-import org.acra.config.httpSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
 
 class MainApplication : Application() {
-    override fun attachBaseContext(base: Context?) {
+	override fun attachBaseContext(base: Context?) {
-        super.attachBaseContext(base)
+		super.attachBaseContext(base)
 
-        if (!BuildConfig.DEBUG) {
+		if (!BuildConfig.DEBUG) {
             initAcra {
                 buildConfigClass = BuildConfig::class.java
                 reportFormat = StringFormat.JSON
 
-                httpSender {
+//                httpSender {
-                    uri = "http://bodis.pp.ua:5000/report"
+//                    uri = "http://bodis.pp.ua:5000/report"
-                }
+//                }
             }
-        } else {
+		} else {
-            // enable strict mode to detect memory leaks etc.
+			// enable strict mode to detect memory leaks etc.
-            StrictMode.enableDefaults();
+			StrictMode.enableDefaults();
-        }
+		}
-    }
+	}
-}
+}

android/app/src/main/java/su/xash/engine/XashActivity.java

@@ -5,6 +5,7 @@ import android.content.pm.ActivityInfo;
 import android.content.res.AssetManager;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.provider.Settings.Secure;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -12,137 +13,142 @@ import android.view.WindowManager;
 
 import org.libsdl.app.SDLActivity;
 
+import su.xash.engine.util.AndroidBug5497Workaround;
+
 public class XashActivity extends SDLActivity {
-    private boolean mUseVolumeKeys;
+	private boolean mUseVolumeKeys;
-    private String mPackageName;
+	private String mPackageName;
-    private static final String TAG = "XashActivity";
+	private static final String TAG = "XashActivity";
 
-    @Override
+	@Override
-    protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+		super.onCreate(savedInstanceState);
 
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            //getWindow().addFlags(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
+			//getWindow().addFlags(WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES);
-            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+			getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-        }
+		}
 
-        AndroidBug5497Workaround.assistActivity(this);
+		AndroidBug5497Workaround.assistActivity(this);
-    }
+	}
 
-    @Override
+	@Override
-    public void onDestroy()
+	public void onDestroy() {
-    {
+		super.onDestroy();
-        super.onDestroy();
 
-        // Now that we don't exit from native code, we need to exit here, resetting
+		// Now that we don't exit from native code, we need to exit here, resetting
-        // application state (actually global variables that we don't cleanup on exit)
+		// application state (actually global variables that we don't cleanup on exit)
-        //
+		//
-        // When the issue with global variables will be resolved, remove that exit() call
+		// When the issue with global variables will be resolved, remove that exit() call
-        System.exit(0);
+		System.exit(0);
-    }
+	}
 
-    @Override
+	@Override
-    protected String[] getLibraries() {
+	protected String[] getLibraries() {
-        return new String[]{"SDL2", "xash"};
+		return new String[]{"SDL2", "xash"};
-    }
+	}
 
-    @SuppressLint("HardwareIds")
+	@SuppressLint("HardwareIds")
-    private String getAndroidID() {
+	private String getAndroidID() {
-        return Secure.getString(getContentResolver(), Secure.ANDROID_ID);
+		return Secure.getString(getContentResolver(), Secure.ANDROID_ID);
-    }
+	}
 
-    @SuppressLint("ApplySharedPref")
+	@SuppressLint("ApplySharedPref")
-    private void saveAndroidID(String id) {
+	private void saveAndroidID(String id) {
-        getSharedPreferences("xash_preferences", MODE_PRIVATE).edit().putString("xash_id", id).commit();
+		getSharedPreferences("xash_preferences", MODE_PRIVATE).edit().putString("xash_id", id).commit();
-    }
+	}
 
-    private String loadAndroidID() {
+	private String loadAndroidID() {
-        return getSharedPreferences("xash_preferences", MODE_PRIVATE).getString("xash_id", "");
+		return getSharedPreferences("xash_preferences", MODE_PRIVATE).getString("xash_id", "");
-    }
+	}
 
-    @Override
+	@Override
-    public String getCallingPackage() {
+	public String getCallingPackage() {
-        if (mPackageName != null) {
+		if (mPackageName != null) {
-            return mPackageName;
+			return mPackageName;
-        }
+		}
 
-        return super.getCallingPackage();
+		return super.getCallingPackage();
-    }
+	}
 
-    private AssetManager getAssets(boolean isEngine) {
+	private AssetManager getAssets(boolean isEngine) {
-        AssetManager am = null;
+		AssetManager am = null;
 
-        if (isEngine) {
+		if (isEngine) {
-            am = getAssets();
+			am = getAssets();
-        } else {
+		} else {
-            try {
+			try {
-                am = getPackageManager().getResourcesForApplication(getCallingPackage()).getAssets();
+				am = getPackageManager().getResourcesForApplication(getCallingPackage()).getAssets();
-            } catch (Exception e) {
+			} catch (Exception e) {
-                Log.e(TAG, "Unable to load mod assets!");
+				Log.e(TAG, "Unable to load mod assets!");
-                e.printStackTrace();
+				e.printStackTrace();
-            }
+			}
-        }
+		}
 
-        return am;
+		return am;
-    }
+	}
 
-    private String[] getAssetsList(boolean isEngine, String path) {
+	private String[] getAssetsList(boolean isEngine, String path) {
-        AssetManager am = getAssets(isEngine);
+		AssetManager am = getAssets(isEngine);
 
-        try {
+		try {
-            return am.list(path);
+			return am.list(path);
-        } catch (Exception e) {
+		} catch (Exception e) {
-            e.printStackTrace();
+			e.printStackTrace();
-        }
+		}
 
-        return new String[]{};
+		return new String[]{};
-    }
+	}
 
-    @Override
+	@Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
+	public boolean dispatchKeyEvent(KeyEvent event) {
-        if (SDLActivity.mBrokenLibraries) {
+		if (SDLActivity.mBrokenLibraries) {
-            return false;
+			return false;
-        }
+		}
 
-        int keyCode = event.getKeyCode();
+		int keyCode = event.getKeyCode();
-        if (!mUseVolumeKeys) {
+		if (!mUseVolumeKeys) {
-            if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+			if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_CAMERA || keyCode == KeyEvent.KEYCODE_ZOOM_IN || keyCode == KeyEvent.KEYCODE_ZOOM_OUT) {
-                    keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+				return false;
-                    keyCode == KeyEvent.KEYCODE_CAMERA ||
+			}
-                    keyCode == KeyEvent.KEYCODE_ZOOM_IN ||
+		}
-                    keyCode == KeyEvent.KEYCODE_ZOOM_OUT) {
-                return false;
-            }
-        }
 
-        return getWindow().superDispatchKeyEvent(event);
+		return getWindow().superDispatchKeyEvent(event);
-    }
+	}
 
-    // TODO: REMOVE LATER, temporary launchers support?
+	// TODO: REMOVE LATER, temporary launchers support?
-    @Override
+	@Override
-    protected String[] getArguments() {
+	protected String[] getArguments() {
-        String gamedir = getIntent().getStringExtra("gamedir");
+		String gamedir = getIntent().getStringExtra("gamedir");
-        if (gamedir == null) gamedir = "valve";
+		if (gamedir == null) gamedir = "valve";
-        nativeSetenv("XASH3D_GAME", gamedir);
+		nativeSetenv("XASH3D_GAME", gamedir);
 
-        String gamelibdir = getIntent().getStringExtra("gamelibdir");
+		String gamelibdir = getIntent().getStringExtra("gamelibdir");
-        if (gamelibdir != null) nativeSetenv("XASH3D_GAMELIBDIR", gamelibdir);
+		if (gamelibdir != null) nativeSetenv("XASH3D_GAMELIBDIR", gamelibdir);
 
-        String pakfile = getIntent().getStringExtra("pakfile");
+		String pakfile = getIntent().getStringExtra("pakfile");
-        if (pakfile != null) nativeSetenv("XASH3D_EXTRAS_PAK2", pakfile);
+		if (pakfile != null) nativeSetenv("XASH3D_EXTRAS_PAK2", pakfile);
 
-        mUseVolumeKeys = getIntent().getBooleanExtra("usevolume", false);
+		String basedir = getIntent().getStringExtra("basedir");
-        mPackageName = getIntent().getStringExtra("package");
+		if (basedir != null) {
+			nativeSetenv("XASH3D_BASEDIR", basedir);
+		} else {
+			String rootPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/xash";
+			nativeSetenv("XASH3D_BASEDIR", rootPath);
+		}
 
-        String[] env = getIntent().getStringArrayExtra("env");
+		mUseVolumeKeys = getIntent().getBooleanExtra("usevolume", false);
-        if (env != null) {
+		mPackageName = getIntent().getStringExtra("package");
-            for (int i = 0; i < env.length; i += 2)
-                nativeSetenv(env[i], env[i + 1]);
-        }
 
-        String argv = getIntent().getStringExtra("argv");
+		String[] env = getIntent().getStringArrayExtra("env");
-        if (argv == null) argv = "-console -log";
+		if (env != null) {
-        return argv.split(" ");
+			for (int i = 0; i < env.length; i += 2)
-    }
+				nativeSetenv(env[i], env[i + 1]);
+		}
+
+		String argv = getIntent().getStringExtra("argv");
+		if (argv == null) argv = "-console -log";
+		return argv.split(" ");
+	}
 }

android/app/src/main/java/su/xash/engine/XashDocumentsProvider.java

@@ -1,253 +0,0 @@
-package su.xash.engine;
-
-import android.annotation.TargetApi;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.graphics.Point;
-import android.os.Build;
-import android.os.CancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.provider.DocumentsContract.Document;
-import android.provider.DocumentsContract.Root;
-import android.provider.DocumentsProvider;
-import android.webkit.MimeTypeMap;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-@TargetApi(Build.VERSION_CODES.KITKAT)
-public class XashDocumentsProvider extends DocumentsProvider {
-    private static final String ALL_MIME_TYPES = "*/*";
-    private File mRootDir;
-
-    private static final String TAG = "XashDocumentsProvider";
-
-    @Override
-    public boolean onCreate() {
-        mRootDir = getContext().getExternalFilesDir(null);
-
-        return true;
-    }
-
-    private static final String[] DEFAULT_ROOT_PROJECTION = new String[]{Root.COLUMN_ROOT_ID,
-            Root.COLUMN_MIME_TYPES,
-            Root.COLUMN_FLAGS,
-            Root.COLUMN_ICON,
-            Root.COLUMN_TITLE,
-            Root.COLUMN_SUMMARY,
-            Root.COLUMN_DOCUMENT_ID,
-            Root.COLUMN_AVAILABLE_BYTES};
-
-    private static final String[] DEFAULT_DOCUMENT_PROJECTION = new String[]{Document.COLUMN_DOCUMENT_ID,
-            Document.COLUMN_MIME_TYPE,
-            Document.COLUMN_DISPLAY_NAME,
-            Document.COLUMN_LAST_MODIFIED,
-            Document.COLUMN_FLAGS,
-            Document.COLUMN_SIZE};
-
-    @Override
-    public Cursor queryRoots(String[] projection) {
-        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_ROOT_PROJECTION);
-
-        final String appName = getContext().getString(R.string.app_name);
-        final String docId = getDocIdForFile(mRootDir);
-
-        int flags;
-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH;
-        } else {
-            flags = Root.FLAG_LOCAL_ONLY | Root.FLAG_SUPPORTS_CREATE | Root.FLAG_SUPPORTS_SEARCH | Root.FLAG_SUPPORTS_IS_CHILD;
-        }
-
-        final MatrixCursor.RowBuilder row = result.newRow();
-        row.add(Root.COLUMN_ROOT_ID, docId);
-        row.add(Root.COLUMN_DOCUMENT_ID, docId);
-        row.add(Root.COLUMN_SUMMARY, null);
-        row.add(Root.COLUMN_FLAGS, flags);
-        row.add(Root.COLUMN_TITLE, appName);
-        row.add(Root.COLUMN_MIME_TYPES, ALL_MIME_TYPES);
-        row.add(Root.COLUMN_AVAILABLE_BYTES, mRootDir.getFreeSpace());
-        row.add(Root.COLUMN_ICON, R.mipmap.ic_launcher);
-
-        return result;
-    }
-
-    @Override
-    public Cursor queryDocument(String documentId, String[] projection) throws FileNotFoundException {
-        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
-
-        includeFile(result, documentId, null);
-
-        return result;
-    }
-
-    @Override
-    public Cursor queryChildDocuments(String parentDocumentId, String[] projection, String sortOrder) throws FileNotFoundException {
-        final MatrixCursor result = new MatrixCursor(projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION);
-
-        final File parent = getFileForDocId(parentDocumentId);
-        final File[] filesList = parent.listFiles();
-
-        if (filesList != null) {
-            for (File file : filesList) {
-                includeFile(result, null, file);
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public ParcelFileDescriptor openDocument(final String documentId, String mode, CancellationSignal signal) throws FileNotFoundException {
-        final File file = getFileForDocId(documentId);
-
-        final int accessMode = ParcelFileDescriptor.parseMode(mode);
-
-        return ParcelFileDescriptor.open(file, accessMode);
-    }
-
-    @Override
-    public AssetFileDescriptor openDocumentThumbnail(String documentId, Point sizeHint, CancellationSignal signal) throws FileNotFoundException {
-        final File file = getFileForDocId(documentId);
-
-        final ParcelFileDescriptor pfd = ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
-
-        return new AssetFileDescriptor(pfd, 0, file.length());
-    }
-
-    @Override
-    public String createDocument(String parentDocumentId, String mimeType, String displayName) throws FileNotFoundException {
-        File newFile = new File(parentDocumentId, displayName);
-
-        int noConflictId = 1;
-
-        while (newFile.exists()) {
-            newFile = new File(parentDocumentId, displayName + " (" + noConflictId++ + ")");
-        }
-
-        try {
-            boolean succeeded;
-
-            if (Document.MIME_TYPE_DIR.equals(mimeType)) {
-                succeeded = newFile.mkdir();
-            } else {
-                succeeded = newFile.createNewFile();
-            }
-
-            if (!succeeded) {
-                throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
-            }
-        } catch (IOException e) {
-            throw new FileNotFoundException("Failed to create document with id " + newFile.getPath());
-        }
-
-        return newFile.getPath();
-    }
-
-    @Override
-    public void deleteDocument(String documentId) throws FileNotFoundException {
-        File file = getFileForDocId(documentId);
-
-        if (file.isDirectory()) {
-            if (!deleteDirectory(file)) {
-                throw new FileNotFoundException("Failed to delete document with id " + documentId);
-            }
-        } else if (!file.delete()) {
-            throw new FileNotFoundException("Failed to delete document with id " + documentId);
-        }
-    }
-
-    @Override
-    public String getDocumentType(String documentId) throws FileNotFoundException {
-        File file = getFileForDocId(documentId);
-
-        return getMimeType(file);
-    }
-
-    @Override
-    public boolean isChildDocument(String parentDocumentId, String documentId) {
-        return documentId.startsWith(parentDocumentId);
-    }
-
-    private static File getFileForDocId(String docId) throws FileNotFoundException {
-        final File f = new File(docId);
-
-        if (!f.exists()) throw new FileNotFoundException(f.getAbsolutePath() + " not found");
-
-        return f;
-    }
-
-    private static String getDocIdForFile(File file) {
-        return file.getAbsolutePath();
-    }
-
-    private static String getMimeType(File file) {
-        if (file.isDirectory()) {
-            return Document.MIME_TYPE_DIR;
-        } else {
-            final String name = file.getName();
-            final int lastDot = name.lastIndexOf('.');
-
-            if (lastDot >= 0) {
-                final String extension = name.substring(lastDot + 1).toLowerCase();
-                final String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-
-                if (mime != null) return mime;
-            }
-
-            return "application/octet-stream";
-        }
-    }
-
-    private static boolean deleteDirectory(File dir) {
-        final File[] allContents = dir.listFiles();
-
-        if (allContents != null) {
-            for (File file : allContents) {
-                deleteDirectory(file);
-            }
-        }
-        return dir.delete();
-    }
-
-    private void includeFile(MatrixCursor result, String docId, File file) throws FileNotFoundException {
-        if (docId == null) {
-            docId = getDocIdForFile(file);
-        } else {
-            file = getFileForDocId(docId);
-        }
-
-        int flags = 0;
-
-        if (file.isDirectory()) {
-            if (file.canWrite()) {
-                flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
-            }
-        } else if (file.canWrite()) {
-            flags |= Document.FLAG_SUPPORTS_WRITE;
-        }
-
-        File parentFile = file.getParentFile();
-        if (parentFile != null && parentFile.canWrite()) {
-            flags |= Document.FLAG_SUPPORTS_DELETE;
-        }
-
-        final String displayName = file.getName();
-        final String mimeType = getMimeType(file);
-
-        if (mimeType.startsWith("image/")) {
-            flags |= Document.FLAG_SUPPORTS_THUMBNAIL;
-        }
-
-        final MatrixCursor.RowBuilder row = result.newRow();
-        row.add(Document.COLUMN_DOCUMENT_ID, docId);
-        row.add(Document.COLUMN_DISPLAY_NAME, displayName);
-        row.add(Document.COLUMN_SIZE, file.length());
-        row.add(Document.COLUMN_MIME_TYPE, mimeType);
-        row.add(Document.COLUMN_LAST_MODIFIED, file.lastModified());
-        row.add(Document.COLUMN_FLAGS, flags);
-        row.add(Document.COLUMN_ICON, R.mipmap.ic_launcher);
-    }
-}

android/app/src/main/java/su/xash/engine/adapters/GameAdapter.kt

@@ -14,64 +14,57 @@ import su.xash.engine.ui.library.LibraryViewModel
 
 
 class GameAdapter(private val libraryViewModel: LibraryViewModel) :
-    ListAdapter<Game, GameAdapter.GameViewHolder>(DiffCallback()) {
+	ListAdapter<Game, GameAdapter.GameViewHolder>(DiffCallback()) {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameAdapter.GameViewHolder {
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GameAdapter.GameViewHolder {
-        val binding = CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+		val binding = CardGameBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return GameViewHolder(binding)
+		return GameViewHolder(binding)
-    }
+	}
 
-    override fun onBindViewHolder(holder: GameAdapter.GameViewHolder, position: Int) {
+	override fun onBindViewHolder(holder: GameAdapter.GameViewHolder, position: Int) {
-        return holder.bind(getItem(position))
+		return holder.bind(getItem(position))
-    }
+	}
 
-    private class DiffCallback : DiffUtil.ItemCallback<Game>() {
+	private class DiffCallback : DiffUtil.ItemCallback<Game>() {
-        override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
+		override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem.basedir.name == newItem.basedir.name
+			return oldItem.basedir.name == newItem.basedir.name
-        }
+		}
 
-        override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
+		override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
-            return oldItem.basedir.name == newItem.basedir.name && oldItem.installed == newItem.installed
+			return oldItem.basedir.name == newItem.basedir.name
-        }
+		}
 
-    }
+	}
 
-    inner class GameViewHolder(val binding: CardGameBinding) :
+	inner class GameViewHolder(val binding: CardGameBinding) :
-        RecyclerView.ViewHolder(binding.root) {
+		RecyclerView.ViewHolder(binding.root) {
-        fun bind(game: Game) {
+		fun bind(game: Game) {
-            binding.apply {
+			binding.apply {
-                gameTitle.text = game.title
+				gameTitle.text = game.title
 
-                if (game.icon != null) {
+				if (game.icon != null) {
-                    gameIcon.setImageBitmap(game.icon)
+					gameIcon.setImageBitmap(game.icon)
-                } else {
+				} else {
-                    gameIcon.visibility = View.GONE
+					gameIcon.visibility = View.GONE
-                }
+				}
 
-                if (game.cover != null) {
+				if (game.cover != null) {
-                    gameCover.setImageBitmap(game.cover)
+					gameCover.setImageBitmap(game.cover)
-                } else {
+				} else {
-                    gameCover.visibility = View.GONE
+					gameCover.visibility = View.GONE
-                }
+				}
 
-                if (!game.installed) {
+				settingsButton.setOnClickListener {
-                    launchButton.visibility = View.GONE
+					libraryViewModel.setSelectedGame(game)
-                    settingsButton.visibility = View.GONE
+					it.findNavController()
-                    progressIndicator.visibility = View.VISIBLE
+						.navigate(R.id.action_libraryFragment_to_gameSettingsFragment)
-                    return
+				}
-                }
 
-                settingsButton.setOnClickListener {
+				root.setOnClickListener { libraryViewModel.startEngine(it.context, game) }
-                    libraryViewModel.setSelectedGame(game)
+				launchButton.setOnClickListener {
-                    it.findNavController()
+					libraryViewModel.startEngine(it.context, game)
-                        .navigate(R.id.action_libraryFragment_to_gameSettingsFragment)
+				}
-                }
+			}
-
+		}
-                root.setOnClickListener { libraryViewModel.startEngine(it.context, game) }
+	}
-                launchButton.setOnClickListener {
+}
-                    libraryViewModel.startEngine(it.context, game)
-                }
-            }
-        }
-    }
-}

android/app/src/main/java/su/xash/engine/model/BackgroundBitmap.kt

@@ -1,89 +1,90 @@
 package su.xash.engine.model
 
-import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import androidx.documentfile.provider.DocumentFile
 import su.xash.engine.util.TGAReader
+import java.io.File
+import java.io.FileInputStream
 import java.util.Scanner
 
 
 object BackgroundBitmap {
-    private const val BACKGROUND_ROWS = 3
+	private const val BACKGROUND_ROWS = 3
-    private const val BACKGROUND_COLUMNS = 4
+	private const val BACKGROUND_COLUMNS = 4
-    private const val BACKGROUND_WIDTH = 800
+	private const val BACKGROUND_WIDTH = 800
-    private const val BACKGROUND_HEIGHT = 600
+	private const val BACKGROUND_HEIGHT = 600
 
-    fun createBackground(ctx: Context, file: DocumentFile): Bitmap {
+	fun createBackground(file: File): Bitmap {
-        var bitmap =
+		var bitmap =
-            Bitmap.createBitmap(BACKGROUND_WIDTH, BACKGROUND_HEIGHT, Bitmap.Config.ARGB_8888)
+			Bitmap.createBitmap(BACKGROUND_WIDTH, BACKGROUND_HEIGHT, Bitmap.Config.ARGB_8888)
-        var canvas = Canvas(bitmap)
+		var canvas = Canvas(bitmap)
-        var x: Int
+		var x: Int
-        var y = 0
+		var y = 0
-        var width: Int
+		var width: Int
-        var height = 0
+		var height = 0
 
-        var bgLayout = file.findFile("resource")?.findFile("HD_BackgroundLayout.txt")
+		val resourceFolder = File(file, "resource")
-        if (bgLayout == null) {
+		var bgLayout = File(resourceFolder, "HD_BackgroundLayout.txt")
-            bgLayout = file.findFile("resource")?.findFile("BackgroundLayout.txt")
+		if (!bgLayout.exists()) {
-        }
+			bgLayout = File(resourceFolder, "BackgroundLayout.txt")
+		}
 
-        if (bgLayout == null) {
+		if (!bgLayout.exists()) {
-            val dir = file.findFile("resource")?.findFile("background")
+			val dir = File(resourceFolder, "background")
-            for (i in 0 until BACKGROUND_ROWS) {
+			for (i in 0 until BACKGROUND_ROWS) {
-                x = 0
+				x = 0
-                for (j in 0 until BACKGROUND_COLUMNS) {
+				for (j in 0 until BACKGROUND_COLUMNS) {
-                    val filename = "${BACKGROUND_WIDTH}_${i + 1}_${'a' + j}_loading.tga"
+					val filename = "${BACKGROUND_WIDTH}_${i + 1}_${'a' + j}_loading.tga"
-                    val bmpFile = dir?.findFile(filename)
+					val bmpFile = File(dir, filename)
-                    val bmpImage = loadTga(ctx, bmpFile!!)
+					val bmpImage = loadTga(bmpFile)
 
-                    canvas.drawBitmap(bmpImage, x.toFloat(), y.toFloat(), null)
+					canvas.drawBitmap(bmpImage, x.toFloat(), y.toFloat(), null)
-                    x += bmpImage.width
+					x += bmpImage.width
-                    height = bmpImage.height
+					height = bmpImage.height
 
-                }
+				}
-                y += height
+				y += height
-            }
+			}
-            return bitmap
+			return bitmap
-        }
+		}
 
-        ctx.contentResolver.openInputStream(bgLayout.uri).use { inputStream ->
+		FileInputStream(bgLayout).use { inputStream ->
-            Scanner(inputStream).use { scanner ->
+			Scanner(inputStream).use { scanner ->
-                while (scanner.hasNext()) {
+				while (scanner.hasNext()) {
-                    when (val str = scanner.next()) {
+					when (val str = scanner.next()) {
-                        "resolution" -> {
+						"resolution" -> {
-                            width = scanner.nextInt()
+							width = scanner.nextInt()
-                            height = scanner.nextInt()
+							height = scanner.nextInt()
-                            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+							bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-                            canvas = Canvas(bitmap)
+							canvas = Canvas(bitmap)
-                        }
+						}
 
-                        else -> {
+						else -> {
-                            var bmpFile = file
+							var bmpFile = file
-                            str.split("/").forEach { bmpFile = bmpFile.findFile(it)!! }
+							str.split("/").forEach { bmpFile = File(bmpFile, it) }
-                            //skip
+							//skip
-                            scanner.next()
+							scanner.next()
-                            x = scanner.nextInt()
+							x = scanner.nextInt()
-                            y = scanner.nextInt()
+							y = scanner.nextInt()
-                            val bmp = loadTga(ctx, bmpFile)
+							val bmp = loadTga(bmpFile)
-                            canvas.drawBitmap(bmp, x.toFloat(), y.toFloat(), null)
+							canvas.drawBitmap(bmp, x.toFloat(), y.toFloat(), null)
-                        }
+						}
-                    }
+					}
-                }
+				}
-            }
+			}
-        }
+		}
-        return bitmap
+		return bitmap
-    }
+	}
 
-    private fun loadTga(ctx: Context, file: DocumentFile): Bitmap {
+	private fun loadTga(file: File): Bitmap {
-        ctx.contentResolver.openInputStream(file.uri).use {
+		FileInputStream(file).use {
-            val buffer = it?.readBytes()
+			val buffer = it.readBytes()
-            val pixels = TGAReader.read(buffer, TGAReader.ARGB)
+			val pixels = TGAReader.read(buffer, TGAReader.ARGB)
 
-            val width = TGAReader.getWidth(buffer)
+			val width = TGAReader.getWidth(buffer)
-            val height = TGAReader.getHeight(buffer)
+			val height = TGAReader.getHeight(buffer)
 
-            return Bitmap.createBitmap(pixels, 0, width, width, height, Bitmap.Config.ARGB_8888)
+			return Bitmap.createBitmap(pixels, 0, width, width, height, Bitmap.Config.ARGB_8888)
-        }
+		}
-    }
+	}
-}
+}

android/app/src/main/java/su/xash/engine/model/Game.kt

@@ -5,118 +5,123 @@ import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.net.Uri
-import android.provider.MediaStore
-import androidx.documentfile.provider.DocumentFile
 import su.xash.engine.XashActivity
+import java.io.File
+import java.io.FileInputStream
 
 
-class Game(val ctx: Context, val basedir: DocumentFile, var installed: Boolean = true) {
+class Game(val ctx: Context, val basedir: File) {
-    private var iconName = "game.ico"
+	private var iconName = "game.ico"
-    var title = "Unknown Game"
+	var title = "Unknown Game"
-    var icon: Bitmap? = null
+	var icon: Bitmap? = null
-    var cover: Bitmap? = null
+	var cover: Bitmap? = null
 
-    private val pref = ctx.getSharedPreferences(basedir.name, Context.MODE_PRIVATE)
+	private val pref = ctx.getSharedPreferences(basedir.name, Context.MODE_PRIVATE)
 
-    init {
+	init {
-        basedir.findFile("gameinfo.txt")?.let {
+		val gameInfo = File(basedir, "gameinfo.txt")
-            parseGameInfo(it)
+		if (gameInfo.exists()) {
-        } ?: basedir.findFile("liblist.gam")?.let { parseGameInfo(it) }
+			parseGameInfo(gameInfo)
+		} else {
+			val libListGam = File(basedir, "liblist.gam")
+			if (libListGam.exists()) parseGameInfo(libListGam)
+		}
 
-        basedir.findFile(iconName)
+		val iconFile = File(basedir, iconName)
-            ?.let { icon = MediaStore.Images.Media.getBitmap(ctx.contentResolver, it.uri) }
+		if (iconFile.exists()) {
+			icon = BitmapFactory.decodeFile(iconFile.path)
+		}
 
-        try {
+		try {
-            cover = BackgroundBitmap.createBackground(ctx, basedir)
+			cover = BackgroundBitmap.createBackground(basedir)
-        } catch (e: Exception) {
+		} catch (e: Exception) {
-            e.printStackTrace()
+			e.printStackTrace()
-        }
+		}
-    }
+	}
 
-    fun startEngine(ctx: Context) {
+	fun startEngine(ctx: Context) {
-        ctx.startActivity(Intent(ctx, XashActivity::class.java).apply {
+		ctx.startActivity(Intent(ctx, XashActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+			flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-            putExtra("gamedir", basedir.name)
+			putExtra("gamedir", basedir.name)
-            putExtra("argv", pref.getString("arguments", "-console -log"))
+			putExtra("argv", pref.getString("arguments", "-console -log"))
-            putExtra("usevolume", pref.getBoolean("use_volume_buttons", false))
+			putExtra("usevolume", pref.getBoolean("use_volume_buttons", false))
-            //.putExtra("gamelibdir", getGameLibDir(context))
+			putExtra("basedir", basedir.parent)
-            //.putExtra("package", getPackageName()) }
+			//.putExtra("gamelibdir", getGameLibDir(context))
-        })
+			//.putExtra("package", getPackageName()) }
-    }
+		})
+	}
 
-    private fun parseGameInfo(file: DocumentFile) {
+	private fun parseGameInfo(file: File) {
-        ctx.contentResolver.openInputStream(file.uri).use { inputStream ->
+		FileInputStream(file).use { inputStream ->
-            inputStream?.bufferedReader().use { reader ->
+			inputStream.bufferedReader().use { reader ->
-                reader?.forEachLine {
+				reader.forEachLine {
-                    val tokens = it.split("\\s+".toRegex(), limit = 2)
+					val tokens = it.split("\\s+".toRegex(), limit = 2)
-                    if (tokens.size >= 2) {
+					if (tokens.size >= 2) {
-                        val k = tokens[0]
+						val k = tokens[0]
-                        val v = tokens[1].trim('"')
+						val v = tokens[1].trim('"')
 
-                        if (k == "title" || k == "game") title = v
+						if (k == "title" || k == "game") title = v
-                        if (k == "icon") iconName = v
+						if (k == "icon") iconName = v
-                    }
+					}
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
 
-    private fun getPackageName(): String? {
+	private fun getPackageName(): String? {
 //        return if (mDbEntry != null) {
 //            mDbEntry.getPackageName()
 //        } else null
-        return null
+		return null
-    }
+	}
 
-    private fun getGameLibDir(ctx: Context): String? {
+	private fun getGameLibDir(ctx: Context): String? {
-        val pkgName = getPackageName()
+		val pkgName = getPackageName()
-        if (pkgName != null) {
+		if (pkgName != null) {
-            val pkgInfo: PackageInfo = try {
+			val pkgInfo: PackageInfo = try {
-                ctx.packageManager.getPackageInfo(pkgName, 0)
+				ctx.packageManager.getPackageInfo(pkgName, 0)
-            } catch (e: PackageManager.NameNotFoundException) {
+			} catch (e: PackageManager.NameNotFoundException) {
-                e.printStackTrace()
+				e.printStackTrace()
-                ctx.startActivity(
+				ctx.startActivity(
-                    Intent(
+					Intent(
-                        Intent.ACTION_VIEW, Uri.parse("market://details?id=$pkgName")
+						Intent.ACTION_VIEW, Uri.parse("market://details?id=$pkgName")
-                    ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+					).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                )
+				)
-                return null
+				return null
-            }
+			}
-            return pkgInfo.applicationInfo.nativeLibraryDir
+			return pkgInfo.applicationInfo?.nativeLibraryDir
-        }
+		}
-        return ctx.applicationInfo.nativeLibraryDir
+		return ctx.applicationInfo.nativeLibraryDir
-    }
+	}
 
-    companion object {
+	companion object {
-        fun getGames(ctx: Context, file: DocumentFile): List<Game> {
+		fun getGames(ctx: Context, file: File): List<Game> {
-            val games = mutableListOf<Game>()
+			val games = mutableListOf<Game>()
 
-            if (checkIfGamedir(file)) {
+			if (checkIfGamedir(file)) {
-                games.add(Game(ctx, file))
+				games.add(Game(ctx, file))
-            } else {
+			} else {
-                file.listFiles().forEach {
+				file.listFiles()?.forEach {
-                    if (it.isDirectory) {
+					if (it.isDirectory) {
-                        if (checkIfGamedir(it)) {
+						if (checkIfGamedir(it)) {
-                            games.add(Game(ctx, it))
+							games.add(Game(ctx, it))
-                        }
+						}
-                    }
+					}
-                }
+				}
-            }
+			}
 
-            return games
+			return games
-        }
+		}
 
-        fun checkIfGamedir(file: DocumentFile): Boolean {
+		fun checkIfGamedir(file: File): Boolean {
-            // exclude unfinished downloads
+			if (File(file, "liblist.gam").exists()) return true
-            if (file.name?.startsWith('.') == true)
+			if (File(file, "gameinfo.txt").exists()) return true
-                return false
 
-            file.findFile("liblist.gam")?.let { return true }
+			return false
-            file.findFile("gameinfo.txt")?.let { return true }
+		}
-            return false
+	}
-        }
-    }
 }
 
 //    Intent intent = new Intent("su.xash.engine.MOD");

android/app/src/main/java/su/xash/engine/model/ModDatabase.kt

@@ -1,59 +0,0 @@
-package su.xash.engine.model
-
-import org.json.JSONArray
-import org.json.JSONObject
-import java.io.InputStream
-
-class ModDatabase(inputStream: InputStream) {
-    val entries = mutableListOf<Entry>()
-
-    companion object {
-        const val VERSION = 1
-
-        fun getFilename(): String {
-            return "v${VERSION}.json"
-        }
-    }
-
-    init {
-        inputStream.bufferedReader().use {
-            val jsonArray = JSONArray(it.readText())
-
-            for (i in 0..<jsonArray.length()) {
-                entries.add(Entry(jsonArray.getJSONObject(i)))
-            }
-        }
-    }
-
-    fun getByGameDir(gamedir: String): Entry? {
-        return entries.filter { it.gamedir.equals(gamedir) }.firstOrNull()
-    }
-
-
-    inner class Entry(jsonObject: JSONObject) {
-        var name: String? = null
-        var appid: Int? = null
-        var gamedir: String? = null
-
-        // TODO Depots
-        var pkgname: String? = null
-
-        init {
-            if (jsonObject.has("name")) {
-                name = jsonObject.getString("name");
-            }
-
-            if (jsonObject.has("app_id")) {
-                appid = jsonObject.getInt("app_id");
-            }
-
-            if (jsonObject.has("gamedir")) {
-                gamedir = jsonObject.getString("gamedir");
-            }
-
-            if (jsonObject.has("package_name")) {
-                pkgname = jsonObject.getString("package_name");
-            }
-        }
-    }
-}

android/app/src/main/java/su/xash/engine/ui/library/LibraryFragment.kt

@@ -1,94 +1,110 @@
 package su.xash.engine.ui.library
 
-import android.annotation.SuppressLint
 import android.content.Intent
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import android.util.Log
+import android.os.Environment
+import android.provider.Settings
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
-import kotlinx.coroutines.launch
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import su.xash.engine.BuildConfig
 import su.xash.engine.R
 import su.xash.engine.adapters.GameAdapter
 import su.xash.engine.databinding.FragmentLibraryBinding
 
 class LibraryFragment : Fragment(), MenuProvider {
-    private var _binding: FragmentLibraryBinding? = null
+	private var _binding: FragmentLibraryBinding? = null
-    private val binding get() = _binding!!
+	private val binding get() = _binding!!
 
-    private val libraryViewModel: LibraryViewModel by activityViewModels()
+	private val libraryViewModel: LibraryViewModel by activityViewModels()
 
-    override fun onCreateView(
+	private val startActivityForResult =
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+		registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-    ): View? {
+			if (checkStoragePermissions()) {
-        _binding = FragmentLibraryBinding.inflate(inflater, container, false)
+				libraryViewModel.reloadGames(requireContext())
+			}
+		}
 
-        val adapter = GameAdapter(libraryViewModel)
+	private fun checkStoragePermissions(): Boolean {
-        binding.gamesList.adapter = adapter
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && !Environment.isExternalStorageManager()) {
+			MaterialAlertDialogBuilder(requireContext()).apply {
+				setTitle(R.string.file_access_required)
+				setMessage(R.string.file_access_message)
+				setPositiveButton(android.R.string.ok) { _, _ ->
+					startActivityForResult.launch(
+						Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION).setData(
+							Uri.fromParts("package", BuildConfig.APPLICATION_ID, null)
+						)
+					)
+				}
+				setCancelable(false)
+				show()
+			}
 
-        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
+			return false
+		} else {
+			return true
+		}
+	}
 
-        return binding.root
+	override fun onCreateView(
-    }
+		inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+	): View {
+		_binding = FragmentLibraryBinding.inflate(inflater, container, false)
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		val adapter = GameAdapter(libraryViewModel)
-        binding.swipeRefresh.setOnRefreshListener { libraryViewModel.reloadGames(requireContext()) }
+		binding.gamesList.adapter = adapter
 
-        libraryViewModel.isReloading.observe(viewLifecycleOwner) {
+		requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
-            binding.swipeRefresh.isRefreshing = it
-        }
 
-        libraryViewModel.installedGames.observe(viewLifecycleOwner) {
+		return binding.root
-            (binding.gamesList.adapter as GameAdapter).submitList(it)
+	}
-        }
 
-        libraryViewModel.workInfos.observe(viewLifecycleOwner) {
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-            libraryViewModel.refreshDownloads(requireContext())
+		binding.swipeRefresh.setOnRefreshListener { libraryViewModel.reloadGames(requireContext()) }
-        }
 
-        libraryViewModel.downloads.observe(viewLifecycleOwner) {
+		libraryViewModel.isReloading.observe(viewLifecycleOwner) {
-            libraryViewModel.reloadGames(requireContext())
+			binding.swipeRefresh.isRefreshing = it
-        }
+		}
-    }
 
-    override fun onDestroyView() {
+		libraryViewModel.installedGames.observe(viewLifecycleOwner) {
-        super.onDestroyView()
+			(binding.gamesList.adapter as GameAdapter).submitList(it)
-        _binding = null
+		}
-    }
 
-    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+		if (checkStoragePermissions()) {
-        menuInflater.inflate(R.menu.menu_library, menu)
+			libraryViewModel.reloadGames(requireContext())
-    }
+		}
+	}
 
-    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+	override fun onDestroyView() {
-        when (menuItem.itemId) {
+		super.onDestroyView()
-            R.id.action_browse -> {
+		_binding = null
-                startActivity(
+	}
-                    Intent(Intent.ACTION_VIEW).setDataAndType(
-                        null, "vnd.android.document/directory"
-                    )
-                )
-            }
 
-            R.id.action_install -> {
+	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                findNavController().navigate(R.id.action_libraryFragment_to_setupFragment)
+		menuInflater.inflate(R.menu.menu_library, menu)
-            }
+	}
 
-            R.id.action_settings -> {
+	override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-                findNavController().navigate(R.id.action_libraryFragment_to_appSettingsFragment)
+		when (menuItem.itemId) {
-            }
+			R.id.action_settings -> {
-        }
+				findNavController().navigate(R.id.action_libraryFragment_to_appSettingsFragment)
+			}
+		}
 
-        return false
+		return false
-    }
+	}
-}
+}

android/app/src/main/java/su/xash/engine/ui/library/LibraryViewModel.kt

@@ -3,125 +3,53 @@ package su.xash.engine.ui.library
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
-import android.net.Uri
+import android.os.Environment
-import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
-import androidx.preference.PreferenceManager
-import androidx.work.Data
-import androidx.work.OneTimeWorkRequestBuilder
-import androidx.work.OutOfQuotaPolicy
-import androidx.work.WorkInfo
-import androidx.work.WorkManager
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import su.xash.engine.model.Game
-import su.xash.engine.model.ModDatabase
+import java.io.File
-import su.xash.engine.workers.FileCopyWorker
-import su.xash.engine.workers.KEY_FILE_URI
-import java.util.Locale
-
-const val TAG_INSTALL = "TAG_INSTALL"
 
 class LibraryViewModel(application: Application) : AndroidViewModel(application) {
-    val installedGames: LiveData<List<Game>> get() = _installedGames
+	val installedGames: LiveData<List<Game>> get() = _installedGames
-    private val _installedGames = MutableLiveData(emptyList<Game>())
+	private val _installedGames = MutableLiveData(emptyList<Game>())
 
-    val downloads: LiveData<List<Game>> get() = _downloads
+	val isReloading: LiveData<Boolean> get() = _isReloading
-    private val _downloads = MutableLiveData(emptyList<Game>())
+	private val _isReloading = MutableLiveData(false)
 
-    val isReloading: LiveData<Boolean> get() = _isReloading
+	val selectedItem: LiveData<Game> get() = _selectedItem
-    private val _isReloading = MutableLiveData(false)
+	private val _selectedItem = MutableLiveData<Game>()
 
-    private val workManager = WorkManager.getInstance(application.applicationContext)
+	private val appPreferences: SharedPreferences =
-    val workInfos: LiveData<List<WorkInfo>> = workManager.getWorkInfosByTagLiveData(TAG_INSTALL)
+		application.getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
 
-    val selectedItem: LiveData<Game> get() = _selectedItem
+	fun reloadGames(ctx: Context) {
-    private val _selectedItem = MutableLiveData<Game>()
+		if (isReloading.value == true) {
+			return
+		}
+		_isReloading.value = true
 
-    val appPreferences = application.getSharedPreferences("app_preferences", Context.MODE_PRIVATE)
+		viewModelScope.launch {
-    val modDb: ModDatabase
+			withContext(Dispatchers.IO) {
+				val rootPath = appPreferences.getString("game_path", null)
+					?: (Environment.getExternalStorageDirectory().absolutePath + "/xash")
+				val root = File(rootPath)
 
-    init {
+				_installedGames.postValue(Game.getGames(ctx, root))
-        modDb = application.assets.open(ModDatabase.getFilename()).use { ModDatabase(it) }
+				_isReloading.postValue(false)
-        reloadGames(application.applicationContext)
+			}
-    }
+		}
+	}
 
-    fun reloadGames(ctx: Context) {
+	fun setSelectedGame(game: Game) {
-        if (isReloading.value == true) {
+		_selectedItem.value = game
-            return
+	}
-        }
-        _isReloading.value = true
 
-        viewModelScope.launch {
+	fun startEngine(ctx: Context, game: Game) {
-            withContext(Dispatchers.IO) {
+		game.startEngine(ctx)
-                val games = mutableListOf<Game>()
+	}
-                val root = DocumentFile.fromFile(ctx.getExternalFilesDir(null)!!)
+}
-
-                val installedGames = Game.getGames(ctx, root)
-                    .filter { p -> _downloads.value?.any { p.basedir.name == it.basedir.name } == false }
-
-                games.addAll(installedGames)
-                downloads.value?.let { games.addAll(it) }
-
-                _installedGames.postValue(games)
-                _isReloading.postValue(false)
-            }
-        }
-    }
-
-    fun refreshDownloads(ctx: Context) {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val games = mutableListOf<Game>()
-
-                workInfos.value?.filter {
-                    it.state == WorkInfo.State.RUNNING && !it.progress.getString(FileCopyWorker.Input)
-                        .isNullOrEmpty()
-                }?.forEach {
-                    val uri = Uri.parse(it.progress.getString(FileCopyWorker.Input))
-                    val file = DocumentFile.fromTreeUri(ctx, uri)
-                    games.addAll(Game.getGames(ctx, file!!))
-                    games.forEach { g -> g.installed = false }
-                }
-
-                _downloads.postValue(games)
-            }
-        }
-    }
-
-    fun installGame(uri: Uri) {
-        val data = Data.Builder().putString(KEY_FILE_URI, uri.toString()).build()
-        val request = OneTimeWorkRequestBuilder<FileCopyWorker>().run {
-            setInputData(data)
-            addTag(TAG_INSTALL)
-            build()
-        }
-        workManager.enqueue(request)
-    }
-
-    fun setSelectedGame(game: Game) {
-        _selectedItem.value = game
-    }
-
-    fun uninstallGame(game: Game) {
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                game.installed = false
-                game.basedir.delete()
-                _installedGames.postValue(_installedGames.value)
-            }
-        }
-    }
-
-    fun startEngine(ctx: Context, game: Game) {
-        game.startEngine(ctx)
-    }
-}

android/app/src/main/java/su/xash/engine/ui/settings/AppSettingsFragment.kt

@@ -8,24 +8,24 @@ import androidx.fragment.app.Fragment
 import su.xash.engine.databinding.FragmentAppSettingsBinding
 
 class AppSettingsFragment : Fragment() {
-    private var _binding: FragmentAppSettingsBinding? = null
+	private var _binding: FragmentAppSettingsBinding? = null
-    private val binding get() = _binding!!
+	private val binding get() = _binding!!
 
-    override fun onCreateView(
+	override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+		inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
+	): View {
-        _binding = FragmentAppSettingsBinding.inflate(inflater, container, false)
+		_binding = FragmentAppSettingsBinding.inflate(inflater, container, false)
-        return binding.root
+		return binding.root
-    }
+	}
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+		super.onViewCreated(view, savedInstanceState)
-        childFragmentManager.beginTransaction()
+		childFragmentManager.beginTransaction()
-            .add(binding.settingsFragment.id, AppSettingsPreferenceFragment()).commit();
+			.add(binding.settingsFragment.id, AppSettingsPreferenceFragment()).commit();
-    }
+	}
 
-    override fun onDestroyView() {
+	override fun onDestroyView() {
-        super.onDestroyView()
+		super.onDestroyView()
-        _binding = null
+		_binding = null
-    }
+	}
 }

android/app/src/main/java/su/xash/engine/ui/settings/AppSettingsPreferenceFragment.kt

@@ -5,8 +5,8 @@ import androidx.preference.PreferenceFragmentCompat
 import su.xash.engine.R
 
 class AppSettingsPreferenceFragment() : PreferenceFragmentCompat() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        preferenceManager.sharedPreferencesName = "app_preferences";
+		preferenceManager.sharedPreferencesName = "app_preferences";
-        setPreferencesFromResource(R.xml.app_preferences, rootKey);
+		setPreferencesFromResource(R.xml.app_preferences, rootKey);
-    }
+	}
 }

android/app/src/main/java/su/xash/engine/ui/settings/GameSettingsFragment.kt

@@ -6,59 +6,52 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.findNavController
-import su.xash.engine.R
 import su.xash.engine.databinding.FragmentGameSettingsBinding
 import su.xash.engine.ui.library.LibraryViewModel
 
 class GameSettingsFragment : Fragment() {
-    private var _binding: FragmentGameSettingsBinding? = null
+	private var _binding: FragmentGameSettingsBinding? = null
-    private val binding get() = _binding!!
+	private val binding get() = _binding!!
 
-    private val libraryViewModel: LibraryViewModel by activityViewModels()
+	private val libraryViewModel: LibraryViewModel by activityViewModels()
 
-    override fun onCreateView(
+	override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+		inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
+	): View {
-        _binding = FragmentGameSettingsBinding.inflate(inflater, container, false)
+		_binding = FragmentGameSettingsBinding.inflate(inflater, container, false)
-        return binding.root
+		return binding.root
-    }
+	}
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+		super.onViewCreated(view, savedInstanceState)
 
-        val game = libraryViewModel.selectedItem.value!!
+		val game = libraryViewModel.selectedItem.value!!
 
-        binding.gameCard.apply {
+		binding.gameCard.apply {
-            gameTitle.text = game.title
+			gameTitle.text = game.title
 
-            if (game.icon != null) {
+			if (game.icon != null) {
-                gameIcon.setImageBitmap(game.icon)
+				gameIcon.setImageBitmap(game.icon)
-            } else {
+			} else {
-                gameIcon.visibility = View.GONE
+				gameIcon.visibility = View.GONE
-            }
+			}
 
-            if (game.cover != null) {
+			if (game.cover != null) {
-                gameCover.setImageBitmap(game.cover)
+				gameCover.setImageBitmap(game.cover)
-            } else {
+			} else {
-                gameCover.visibility = View.GONE
+				gameCover.visibility = View.GONE
-            }
+			}
 
-            buttonsContainer.visibility = View.GONE
+			buttonsContainer.visibility = View.GONE
-        }
+		}
 
-        childFragmentManager.beginTransaction()
+		childFragmentManager.beginTransaction()
-            .add(binding.settingsFragment.id, GameSettingsPreferenceFragment(game))
+			.add(binding.settingsFragment.id, GameSettingsPreferenceFragment(game))
-            .commit();
+			.commit();
+	}
 
-        binding.bottomNavigation.menu.findItem(R.id.action_uninstall).setOnMenuItemClickListener {
+	override fun onDestroyView() {
-            libraryViewModel.uninstallGame(game)
+		super.onDestroyView()
-            findNavController().popBackStack()
+		_binding = null
-        }
+	}
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }

android/app/src/main/java/su/xash/engine/ui/settings/GameSettingsPreferenceFragment.kt

@@ -8,33 +8,33 @@ import su.xash.engine.R
 import su.xash.engine.model.Game
 
 class GameSettingsPreferenceFragment(val game: Game) : PreferenceFragmentCompat() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        preferenceManager.sharedPreferencesName = game.basedir.name;
+		preferenceManager.sharedPreferencesName = game.basedir.name;
-        setPreferencesFromResource(R.xml.game_preferences, rootKey);
+		setPreferencesFromResource(R.xml.game_preferences, rootKey);
 
-        val packageList = findPreference<ListPreference>("package_name")!!
+		val packageList = findPreference<ListPreference>("package_name")!!
-        packageList.entries = arrayOf(getString(R.string.app_name))
+		packageList.entries = arrayOf(getString(R.string.app_name))
-        packageList.entryValues = arrayOf(requireContext().packageName)
+		packageList.entryValues = arrayOf(requireContext().packageName)
 
-        if (packageList.value == null) {
+		if (packageList.value == null) {
-            packageList.setValueIndex(0);
+			packageList.setValueIndex(0);
-        }
+		}
 
-        val separatePackages = findPreference<SwitchPreferenceCompat>("separate_libraries")!!
+		val separatePackages = findPreference<SwitchPreferenceCompat>("separate_libraries")!!
-        val clientPackage = findPreference<ListPreference>("client_package")!!
+		val clientPackage = findPreference<ListPreference>("client_package")!!
-        val serverPackage = findPreference<ListPreference>("server_package")!!
+		val serverPackage = findPreference<ListPreference>("server_package")!!
-        separatePackages.setOnPreferenceChangeListener { _, newValue ->
+		separatePackages.setOnPreferenceChangeListener { _, newValue ->
-            if (newValue == true) {
+			if (newValue == true) {
-                packageList.isVisible = false
+				packageList.isVisible = false
-                clientPackage.isVisible = true
+				clientPackage.isVisible = true
-                serverPackage.isVisible = true
+				serverPackage.isVisible = true
-            } else {
+			} else {
-                packageList.isVisible = true
+				packageList.isVisible = true
-                clientPackage.isVisible = false
+				clientPackage.isVisible = false
-                serverPackage.isVisible = false
+				serverPackage.isVisible = false
-            }
+			}
 
-            true
+			true
-        }
+		}
-    }
+	}
 }

android/app/src/main/java/su/xash/engine/ui/setup/SetupFragment.kt

@@ -1,48 +0,0 @@
-package su.xash.engine.ui.setup
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import su.xash.engine.databinding.FragmentSetupBinding
-import su.xash.engine.ui.setup.pages.LocationPageFragment
-import su.xash.engine.ui.setup.pages.WelcomePageFragment
-
-class SetupFragment : Fragment() {
-    private var _binding: FragmentSetupBinding? = null
-    private val binding get() = _binding!!
-    private val setupViewModel: SetupViewModel by activityViewModels()
-
-    private lateinit var setupPageAdapter: SetupPageAdapter
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        _binding = FragmentSetupBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        setupPageAdapter = SetupPageAdapter(this)
-        binding.viewPager.isUserInputEnabled = false
-        binding.viewPager.adapter = setupPageAdapter
-
-        setupViewModel.pageNumber.observe(viewLifecycleOwner) {
-            binding.viewPager.setCurrentItem(it, true)
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
-
-class SetupPageAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
-    val pages = listOf(WelcomePageFragment(), LocationPageFragment())
-    override fun getItemCount(): Int = 2
-    override fun createFragment(position: Int): Fragment = pages[position]
-}

android/app/src/main/java/su/xash/engine/ui/setup/SetupViewModel.kt

@@ -1,25 +0,0 @@
-package su.xash.engine.ui.setup
-
-import android.app.Application
-import android.net.Uri
-import androidx.documentfile.provider.DocumentFile
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import su.xash.engine.MainApplication
-import su.xash.engine.model.Game
-
-class SetupViewModel(application: Application) : AndroidViewModel(application) {
-    val pageNumber: LiveData<Int> get() = _pageNumber
-    private val _pageNumber = MutableLiveData(0)
-
-    fun checkIfGameDir(uri: Uri): Boolean {
-        val ctx = getApplication<MainApplication>().applicationContext
-        val file = DocumentFile.fromTreeUri(ctx, uri)!!
-        return Game.checkIfGamedir(file)
-    }
-
-    fun setPageNumber(pos: Int) {
-        _pageNumber.value = pos
-    }
-}

android/app/src/main/java/su/xash/engine/ui/setup/pages/LocationPageFragment.kt

@@ -1,59 +0,0 @@
-package su.xash.engine.ui.setup.pages
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.navigation.fragment.findNavController
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import su.xash.engine.R
-import su.xash.engine.databinding.PageLocationBinding
-import su.xash.engine.ui.library.LibraryViewModel
-import su.xash.engine.ui.setup.SetupViewModel
-
-class LocationPageFragment : Fragment() {
-    private var _binding: PageLocationBinding? = null
-    private val binding get() = _binding!!
-    private val setupViewModel: SetupViewModel by activityViewModels()
-    private val libraryViewModel: LibraryViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        _binding = PageLocationBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        binding.pageButton.setOnClickListener {
-            getGamesDirectory.launch(null)
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    private val getGamesDirectory =
-        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) {
-            it?.let {
-                if (!setupViewModel.checkIfGameDir(it)) {
-                    MaterialAlertDialogBuilder(requireContext()).apply {
-                        setTitle(R.string.error)
-                        setMessage(R.string.setup_location_empty)
-                        setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
-                        show()
-                    }
-                } else {
-                    requireContext().contentResolver.takePersistableUriPermission(it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                    libraryViewModel.installGame(it)
-                    findNavController().navigate(R.id.action_setupFragment_to_libraryFragment)
-                }
-            }
-        }
-}

android/app/src/main/java/su/xash/engine/ui/setup/pages/WelcomePageFragment.kt

@@ -1,35 +0,0 @@
-package su.xash.engine.ui.setup.pages
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import su.xash.engine.databinding.PageWelcomeBinding
-import su.xash.engine.ui.setup.SetupViewModel
-
-class WelcomePageFragment : Fragment() {
-    private var _binding: PageWelcomeBinding? = null
-    private val binding get() = _binding!!
-    private val setupViewModel: SetupViewModel by activityViewModels()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
-    ): View? {
-        _binding = PageWelcomeBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        binding.pageButton.setOnClickListener {
-            setupViewModel.setPageNumber(1)
-        }
-        setupViewModel.setPageNumber(0)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}

android/app/src/main/java/su/xash/engine/util/AndroidBug5497Workaround.java

@@ -0,0 +1,49 @@
+package su.xash.engine.util;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.view.View;
+import android.widget.FrameLayout;
+
+public class AndroidBug5497Workaround {
+	// For more information, see https://code.google.com/p/android/issues/detail?id=5497
+	// To use this class, simply invoke assistActivity() on an Activity that already has its content view set.
+
+	public static void assistActivity(Activity activity) {
+		new AndroidBug5497Workaround(activity);
+	}
+
+	private View mChildOfContent;
+	private int usableHeightPrevious;
+	private FrameLayout.LayoutParams frameLayoutParams;
+
+	private AndroidBug5497Workaround(Activity activity) {
+		FrameLayout content = activity.findViewById(android.R.id.content);
+		mChildOfContent = content.getChildAt(0);
+		mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
+		frameLayoutParams = (FrameLayout.LayoutParams) mChildOfContent.getLayoutParams();
+	}
+
+	private void possiblyResizeChildOfContent() {
+		int usableHeightNow = computeUsableHeight();
+		if (usableHeightNow != usableHeightPrevious) {
+			int usableHeightSansKeyboard = mChildOfContent.getRootView().getHeight();
+			int heightDifference = usableHeightSansKeyboard - usableHeightNow;
+			if (heightDifference > (usableHeightSansKeyboard / 4)) {
+				// keyboard probably just became visible
+				frameLayoutParams.height = usableHeightSansKeyboard - heightDifference;
+			} else {
+				// keyboard probably just became hidden
+				frameLayoutParams.height = usableHeightSansKeyboard;
+			}
+			mChildOfContent.requestLayout();
+			usableHeightPrevious = usableHeightNow;
+		}
+	}
+
+	private int computeUsableHeight() {
+		Rect r = new Rect();
+		mChildOfContent.getWindowVisibleDisplayFrame(r);
+		return (r.bottom - r.top);
+	}
+}

android/app/src/main/java/su/xash/engine/workers/FileCopyWorker.kt

@@ -1,97 +0,0 @@
-package su.xash.engine.workers
-
-import android.content.Context
-import android.net.Uri
-import androidx.documentfile.provider.DocumentFile
-import androidx.work.CoroutineWorker
-import androidx.work.WorkerParameters
-import androidx.work.workDataOf
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-const val KEY_FILE_URI = "KEY_FILE_URI"
-
-class FileCopyWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(ctx, params) {
-    companion object {
-        const val Input = "Input"
-        const val Progress = "Progress"
-    }
-
-    private var fileCount = 0
-    private var fileCopied = 0
-
-    override suspend fun doWork(): Result {
-        withContext(Dispatchers.IO) {
-            val fileUri = inputData.getString(KEY_FILE_URI)
-            setProgress(workDataOf(Input to fileUri))
-
-            val uri = Uri.parse(fileUri)
-            val source = DocumentFile.fromTreeUri(applicationContext, uri)
-
-            fileCount = source?.countDirFiles() ?: return@withContext Result.failure()
-
-            setProgress(workDataOf(Progress to 0f))
-
-            val gamedir = source.name!!
-            val externalFilesDir = DocumentFile.fromFile(applicationContext.getExternalFilesDir(null)!!)
-
-            // create a directory to store staged files
-            val target = externalFilesDir.createDirectory(".$gamedir")!!
-
-            source.copyDirTo(applicationContext, this@FileCopyWorker, target)
-
-            target.renameTo(gamedir)
-
-            setProgress(workDataOf(Progress to 1f))
-        }
-        return Result.success()
-    }
-
-    suspend fun fileCopied(count: Int) {
-        if(count == 0)
-            return
-
-        fileCopied += count
-        val percentage: Float = fileCopied.toFloat() / fileCount.toFloat();
-        setProgress(workDataOf(Progress to percentage))
-    }
-}
-
-fun DocumentFile.countDirFiles(): Int {
-    var count: Int = 0
-
-    listFiles().forEach {
-        if (it.isDirectory)
-            count += it.countDirFiles()
-        else
-            count++
-    }
-
-    return count
-}
-
-fun DocumentFile.copyFileTo(ctx: Context, file: DocumentFile) {
-    val outFile = file.createFile("application", name!!)!!
-
-    ctx.contentResolver.openOutputStream(outFile.uri).use { os ->
-        ctx.contentResolver.openInputStream(uri).use {
-            it?.copyTo(os!!)
-        }
-    }
-}
-
-suspend fun DocumentFile.copyDirTo(ctx: Context, worker: FileCopyWorker, dir: DocumentFile) {
-    var count: Int = 0
-
-    listFiles().forEach {
-        if (it.isDirectory) {
-            val outDir = dir.createDirectory(it.name!!)!!
-            it.copyDirTo(ctx, worker, outDir)
-        } else {
-            it.copyFileTo(ctx, dir)
-            count++
-        }
-    }
-
-    worker.fileCopied(count)
-}

android/app/src/main/res/drawable/ic_baseline_key_24.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M21,10h-8.35C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H13l2,2l2,-2l2,2l4,-4.04L21,10zM7,15c-1.65,0 -3,-1.35 -3,-3c0,-1.65 1.35,-3 3,-3s3,1.35 3,3C10,13.65 8.65,15 7,15z"/>
-</vector>

android/app/src/main/res/drawable/ic_baseline_person_24.xml

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>

android/app/src/main/res/drawable/steam_button_gradient.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true">
-        <shape android:shape="rectangle">
-            <gradient android:endColor="#2D73FF" android:startColor="#06BFFF" />
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
-    <item android:state_enabled="false">
-        <shape android:shape="rectangle">
-            <gradient android:endColor="#6D6D6D" android:startColor="#8F8F8F" />
-            <corners android:radius="4dp" />
-        </shape>
-    </item>
-</selector>

android/app/src/main/res/drawable/steam_icon.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M12.004,2c-5.25,0 -9.556,4.05 -9.964,9.197l5.36,2.216c0.454,-0.31 1.002,-0.492 1.593,-0.492 0.053,0 0.104,0.003 0.157,0.005l2.384,-3.452v-0.049c0,-2.08 1.69,-3.77 3.77,-3.77 2.079,0 3.77,1.692 3.77,3.772s-1.692,3.771 -3.77,3.771h-0.087l-3.397,2.426c0,0.043 0.003,0.088 0.003,0.133 0,1.562 -1.262,2.83 -2.825,2.83 -1.362,0 -2.513,-0.978 -2.775,-2.273l-3.838,-1.589C3.573,18.922 7.427,22 12.005,22c5.522,0 9.998,-4.477 9.998,-10 0,-5.522 -4.477,-10 -9.999,-10zM7.078,16.667c0.218,0.452 0.595,0.832 1.094,1.041 1.081,0.45 2.328,-0.063 2.777,-1.145 0.22,-0.525 0.22,-1.1 0.004,-1.625 -0.215,-0.525 -0.625,-0.934 -1.147,-1.152 -0.52,-0.217 -1.075,-0.208 -1.565,-0.025l1.269,0.525c0.797,0.333 1.174,1.25 0.84,2.046 -0.33,0.797 -1.247,1.175 -2.044,0.843l-1.228,-0.508zM17.818,9.422c0,-1.385 -1.128,-2.512 -2.513,-2.512 -1.387,0 -2.512,1.127 -2.512,2.512 0,1.388 1.125,2.513 2.512,2.513 1.386,0 2.512,-1.125 2.512,-2.513zM15.31,7.53c1.04,0 1.888,0.845 1.888,1.888s-0.847,1.888 -1.888,1.888c-1.044,0 -1.888,-0.845 -1.888,-1.888s0.845,-1.888 1.888,-1.888z"/>
-</vector>

android/app/src/main/res/drawable/steam_logo.xml

@@ -1,33 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="295.46dp"
-    android:height="90.47dp"
-    android:viewportWidth="295.46"
-    android:viewportHeight="90.47">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m45.08,1c-23.24,0 -42.28,17.92 -44.08,40.69l23.71,9.8c2.01,-1.37 4.44,-2.18 7.05,-2.18 0.23,0 0.47,0.01 0.7,0.02l10.54,-15.28c0,-0.07 0,-0.14 0,-0.22 0,-9.2 7.48,-16.68 16.68,-16.68 9.2,0 16.68,7.48 16.68,16.68s-7.48,16.68 -16.68,16.68c-0.13,0 -0.25,0 -0.38,-0.01l-15.04,10.73c0.01,0.19 0.01,0.39 0.01,0.59 0,6.91 -5.62,12.52 -12.52,12.52 -6.06,0 -11.13,-4.33 -12.28,-10.06l-16.96,-7.01c5.25,18.57 22.31,32.18 42.56,32.18 24.43,0 44.24,-19.81 44.24,-44.24 0,-24.43 -19.81,-44.24 -44.24,-44.24"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m28.72,68.12 l-5.43,-2.24c0.96,2.01 2.63,3.68 4.84,4.61 4.78,1.99 10.3,-0.28 12.29,-5.06 0.96,-2.31 0.97,-4.87 0.01,-7.19 -0.95,-2.32 -2.76,-4.13 -5.07,-5.1 -2.3,-0.96 -4.76,-0.92 -6.93,-0.1l5.61,2.32c3.53,1.47 5.2,5.52 3.72,9.05 -1.47,3.53 -5.52,5.2 -9.05,3.72"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m70.8,33.83c0,-6.13 -4.99,-11.12 -11.12,-11.12 -6.13,0 -11.12,4.99 -11.12,11.12 0,6.13 4.99,11.11 11.12,11.11 6.13,0 11.12,-4.99 11.12,-11.11m-19.45,-0.02c0,-4.61 3.74,-8.35 8.35,-8.35s8.35,3.74 8.35,8.35 -3.74,8.35 -8.35,8.35 -8.35,-3.74 -8.35,-8.35"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m136.56,31.27 l-2.96,5.21c-2.28,-1.6 -5.38,-2.56 -8.08,-2.56 -3.09,0 -5,1.28 -5,3.57 0,2.78 3.39,3.43 8.44,5.24 5.42,1.92 8.54,4.17 8.54,9.14 0,6.79 -5.34,10.61 -13.02,10.61 -3.74,0 -8.26,-0.97 -11.73,-3.08l2.16,-5.78c2.82,1.49 6.19,2.37 9.2,2.37 4.05,0 5.98,-1.5 5.98,-3.7 0,-2.53 -2.94,-3.29 -7.68,-4.86 -5.4,-1.8 -9.15,-4.17 -9.15,-9.67 0,-6.2 4.96,-9.76 12.1,-9.76 4.98,0 8.98,1.58 11.2,3.26"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m152.76,61.9v-27.34h-10.13v-5.99h27.21v5.99h-10.1v27.34z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m197.9,42.05v5.99h-13.36v7.82h15.5v6.04h-22.47v-33.33h22.47v5.97h-15.5v7.51z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m215.62,55.43 l-2.21,6.47h-7.32l12.49,-33.33h7.03l12.85,33.32h-7.56l-2.25,-6.47h-13.03zM222.07,36.52 L217.51,49.87h9.2z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m261.22,60.93 l-8.97,-19.3v20.27h-6.68v-33.33h6.67l11.2,24.06 10.8,-24.06h6.73v33.33h-6.68v-20.44l-9.12,19.47z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="m294.46,32.78c0,2.86 -2.15,4.65 -4.61,4.65 -2.47,0 -4.62,-1.78 -4.62,-4.65 0,-2.86 2.15,-4.64 4.62,-4.64 2.46,0 4.61,1.77 4.61,4.64m-8.46,0c0,2.4 1.73,3.9 3.85,3.9 2.11,0 3.83,-1.5 3.83,-3.9 0,-2.4 -1.72,-3.88 -3.83,-3.88 -2.12,0 -3.85,1.5 -3.85,3.88m3.91,-2.37c1.2,0 1.6,0.63 1.6,1.32 0,0.63 -0.37,1.05 -0.82,1.26l1.07,2.01h-0.88l-0.9,-1.78h-0.93v1.78h-0.73v-4.58zM289.05,32.54h0.81c0.53,0 0.84,-0.33 0.84,-0.75 0,-0.42 -0.22,-0.69 -0.84,-0.69h-0.81v1.44z"/>
-</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    android:layout_width="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="match_parent"
+	android:layout_width="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true">
 
-    <com.google.android.material.appbar.AppBarLayout
+	<com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
+		android:id="@+id/appBarLayout"
-        android:layout_width="0dp"
+		android:layout_width="0dp"
-        android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
+		app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+		app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+		app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar
+		<androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
+			android:id="@+id/toolbar"
-            android:layout_width="match_parent"
+			android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+			android:layout_height="match_parent" />
 
-    </com.google.android.material.appbar.AppBarLayout>
+	</com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.fragment.app.FragmentContainerView
+	<androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragmentContainerView"
+		android:id="@+id/fragmentContainerView"
-        android:name="androidx.navigation.fragment.NavHostFragment"
+		android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="0dp"
+		android:layout_width="0dp"
-        android:layout_height="0dp"
+		android:layout_height="0dp"
-        app:defaultNavHost="true"
+		app:defaultNavHost="true"
-        app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appBarLayout"
+		app:layout_constraintTop_toBottomOf="@id/appBarLayout"
-        app:navGraph="@navigation/nav_graph"
+		app:navGraph="@navigation/nav_graph"
-        tools:layout="@layout/fragment_library"/>
+		tools:layout="@layout/fragment_library" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/card_game.xml

@@ -1,111 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView 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"
-    xmlns:tools="http://schemas.android.com/tools"
+	xmlns:tools="http://schemas.android.com/tools"
-    style="@style/Widget.Material3.CardView.Filled"
+	style="@style/Widget.Material3.CardView.Filled"
-    android:layout_width="match_parent"
+	android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+	android:layout_height="wrap_content"
-    android:layout_marginTop="8dp">
+	android:layout_marginTop="8dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+	<androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
-        android:layout_height="128dp">
+		android:layout_height="128dp">
 
-        <ImageView
+		<ImageView
-            android:id="@+id/gameCover"
+			android:id="@+id/gameCover"
-            android:layout_width="match_parent"
+			android:layout_width="match_parent"
-            android:layout_height="match_parent"
+			android:layout_height="match_parent"
-            android:adjustViewBounds="true"
+			android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
+			android:scaleType="centerCrop"
-            tools:src="@android:mipmap/sym_def_app_icon" />
+			tools:src="@android:mipmap/sym_def_app_icon" />
 
-        <com.google.android.material.card.MaterialCardView
+		<com.google.android.material.card.MaterialCardView
-            style="@style/Widget.Material3.CardView.Filled"
+			style="@style/Widget.Material3.CardView.Filled"
-            android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-            android:layout_height="48dp"
+			android:layout_height="48dp"
-            android:layout_margin="8dp"
+			android:layout_margin="8dp"
-            app:contentPadding="10dp"
+			app:contentPadding="10dp"
-            app:layout_constrainedWidth="true"
+			app:layout_constrainedWidth="true"
-            app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/buttonsContainer"
+			app:layout_constraintEnd_toStartOf="@id/buttonsContainer"
-            app:layout_constraintHorizontal_bias="0"
+			app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="parent">
+			app:layout_constraintStart_toStartOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+			<androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-                android:layout_height="match_parent">
+				android:layout_height="match_parent">
 
-                <ImageView
+				<ImageView
-                    android:id="@+id/gameIcon"
+					android:id="@+id/gameIcon"
-                    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+					android:layout_height="match_parent"
-                    android:layout_marginRight="8dp"
+					android:layout_marginRight="8dp"
-                    android:adjustViewBounds="true"
+					android:adjustViewBounds="true"
-                    app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/gameTitle"
+					app:layout_constraintEnd_toStartOf="@id/gameTitle"
-                    app:layout_constraintStart_toStartOf="parent"
+					app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@android:mipmap/sym_def_app_icon" />
+					tools:src="@android:mipmap/sym_def_app_icon" />
 
-                <com.google.android.material.textview.MaterialTextView
+				<com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/gameTitle"
+					android:id="@+id/gameTitle"
-                    style="@style/TextAppearance.Material3.TitleMedium"
+					style="@style/TextAppearance.Material3.TitleMedium"
-                    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+					android:layout_height="match_parent"
-                    android:gravity="center"
+					android:gravity="center"
-                    android:singleLine="true"
+					android:singleLine="true"
-                    app:layout_constrainedWidth="true"
+					app:layout_constrainedWidth="true"
-                    app:layout_constraintBottom_toBottomOf="parent"
+					app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
+					app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/gameIcon"
+					app:layout_constraintStart_toEndOf="@id/gameIcon"
-                    app:layout_constraintTop_toTopOf="parent"
+					app:layout_constraintTop_toTopOf="parent"
-                    tools:text="Game Title" />
+					tools:text="Game Title" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
+			</androidx.constraintlayout.widget.ConstraintLayout>
-        </com.google.android.material.card.MaterialCardView>
+		</com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.card.MaterialCardView
+		<com.google.android.material.card.MaterialCardView
-            android:id="@+id/buttonsContainer"
+			android:id="@+id/buttonsContainer"
-            style="@style/Widget.Material3.CardView.Filled"
+			style="@style/Widget.Material3.CardView.Filled"
-            android:layout_width="wrap_content"
+			android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+			android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
+			android:layout_marginBottom="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent">
+			app:layout_constraintEnd_toEndOf="parent">
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+			<androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
+				android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+				android:layout_height="wrap_content">
 
-                <com.google.android.material.progressindicator.CircularProgressIndicator
+				<com.google.android.material.button.MaterialButton
-                    android:id="@+id/progressIndicator"
+					android:id="@+id/launchButton"
-                    android:layout_width="wrap_content"
+					style="@style/Widget.Material3.Button.IconButton"
-                    android:layout_height="wrap_content"
+					android:layout_width="wrap_content"
-                    android:indeterminate="true"
+					android:layout_height="match_parent"
-                    android:padding="10dp"
+					app:icon="@drawable/ic_baseline_play_arrow_24"
-                    android:visibility="gone"
+					app:layout_constraintEnd_toStartOf="@+id/settingsButton" />
-                    app:indicatorSize="20dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
 
-                <com.google.android.material.button.MaterialButton
+				<com.google.android.material.button.MaterialButton
-                    android:id="@+id/launchButton"
+					android:id="@+id/settingsButton"
-                    style="@style/Widget.Material3.Button.IconButton"
+					style="@style/Widget.Material3.Button.IconButton"
-                    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+					android:layout_height="match_parent"
-                    app:icon="@drawable/ic_baseline_play_arrow_24"
+					app:icon="@drawable/ic_baseline_settings_24"
-                    app:layout_constraintEnd_toStartOf="@+id/settingsButton" />
+					app:layout_constraintEnd_toEndOf="parent" />
-
+			</androidx.constraintlayout.widget.ConstraintLayout>
-                <com.google.android.material.button.MaterialButton
+		</com.google.android.material.card.MaterialCardView>
-                    android:id="@+id/settingsButton"
+	</androidx.constraintlayout.widget.ConstraintLayout>
-                    style="@style/Widget.Material3.Button.IconButton"
+</com.google.android.material.card.MaterialCardView>
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    app:icon="@drawable/ic_baseline_settings_24"
-                    app:layout_constraintEnd_toEndOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </com.google.android.material.card.MaterialCardView>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>

android/app/src/main/res/layout/edit_text_preference.xml

@@ -1,30 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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"
-    android:layout_width="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="wrap_content">
+	style="@style/Widget.Material3.CardView.Filled"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginHorizontal="8dp"
+	android:layout_marginTop="8dp"
+	app:layout_constraintBottom_toBottomOf="parent"
+	app:layout_constraintTop_toTopOf="parent">
 
-<!--    <com.google.android.material.textfield.TextInputLayout-->
+	<androidx.constraintlayout.widget.ConstraintLayout
-<!--        android:layout_width="match_parent"-->
+		android:layout_width="match_parent"
-<!--        android:layout_height="wrap_content"-->
+		android:layout_height="wrap_content"
-<!--        app:layout_constraintTop_toTopOf="parent"-->
+		android:padding="10dp">
-<!--        app:layout_constraintBottom_toBottomOf="parent">-->
 
-<!--        <com.google.android.material.textfield.TextInputEditText-->
+		<TextView
-<!--            android:layout_width="match_parent"-->
+			android:id="@android:id/title"
-<!--            android:layout_height="wrap_content" />-->
+			android:layout_width="match_parent"
-<!--    </com.google.android.material.textfield.TextInputLayout>-->
+			android:layout_height="wrap_content"
-    <TextView
+			android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        android:id="@android:id/title"
+			app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="match_parent"
+			tools:text="EditText Preference" />
-        android:layout_height="wrap_content"
+
-        app:layout_constraintTop_toTopOf="parent"
+		<TextView
-        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"/>
+			android:id="@android:id/summary"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintTop_toBottomOf="@android:id/title"
+			tools:text="Summary" />
+
+		<!--		<com.google.android.material.button.MaterialButton-->
+		<!--			style="@style/Widget.Material3.Button.IconButton"-->
+		<!--			android:layout_width="wrap_content"-->
+		<!--			android:layout_height="wrap_content"-->
+		<!--			app:icon="@drawable/baseline_edit_24"-->
+		<!--			app:layout_constraintBottom_toBottomOf="parent"-->
+		<!--			app:layout_constraintEnd_toEndOf="parent"-->
+		<!--			app:layout_constraintTop_toTopOf="parent" />-->
+	</androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
 
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@android:id/title"
-        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"/>
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/fragment_app_settings.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
-    xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
-    android:layout_width="match_parent"
+	android:layout_height="match_parent">
-    android:layout_height="match_parent"
-    android:paddingHorizontal="8dp">
 
-    <androidx.fragment.app.FragmentContainerView
+	<androidx.fragment.app.FragmentContainerView
-        android:id="@+id/settingsFragment"
+		android:id="@+id/settingsFragment"
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
-        android:layout_height="match_parent"
+		android:layout_height="match_parent"
-        tools:layout="@android:layout/list_content" />
+		tools:layout="@android:layout/list_content" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/fragment_game_settings.xml

@@ -1,39 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    xmlns:tools="http://schemas.android.com/tools"
+	xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+	android:layout_width="match_parent"
-    android:layout_height="match_parent">
+	android:layout_height="match_parent">
 
-    <include
+	<include
-        android:id="@+id/gameCard"
+		android:id="@+id/gameCard"
-        layout="@layout/card_game"
+		layout="@layout/card_game"
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+		android:layout_margin="8dp"
-        app:layout_constraintTop_toTopOf="parent" />
+		app:layout_constraintTop_toTopOf="parent" />
 
-    <com.google.android.material.card.MaterialCardView
+	<androidx.fragment.app.FragmentContainerView
-        style="@style/Widget.Material3.CardView.Filled"
+		android:id="@+id/settingsFragment"
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+		app:layout_constraintTop_toBottomOf="@id/gameCard"
-        app:contentPadding="16dp"
+		tools:layout="@android:layout/list_content">
-        app:layout_constraintTop_toBottomOf="@id/gameCard">
 
-        <androidx.fragment.app.FragmentContainerView
+	</androidx.fragment.app.FragmentContainerView>
-            android:id="@+id/settingsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:layout="@android:layout/list_content" />
 
-    </com.google.android.material.card.MaterialCardView>
+	<!--    <com.google.android.material.bottomnavigation.BottomNavigationView-->
-
+	<!--        android:id="@+id/bottomNavigation"-->
-    <com.google.android.material.bottomnavigation.BottomNavigationView
+	<!--        style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"-->
-        android:id="@+id/bottomNavigation"
+	<!--        android:layout_width="match_parent"-->
-        style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
+	<!--        android:layout_height="wrap_content"-->
-        android:layout_width="match_parent"
+	<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-        android:layout_height="wrap_content"
+	<!--        app:menu="@menu/menu_game_settings" />-->
-        app:layout_constraintBottom_toBottomOf="parent"
+</androidx.constraintlayout.widget.ConstraintLayout>
-        app:menu="@menu/menu_game_settings" />
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/fragment_library.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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"
-    xmlns:tools="http://schemas.android.com/tools"
+	xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+	android:id="@+id/swipeRefresh"
-    android:layout_height="match_parent"
+	android:layout_width="match_parent"
-    android:id="@+id/swipeRefresh">
+	android:layout_height="match_parent">
 
-    <RelativeLayout
+	<RelativeLayout
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
-        android:layout_height="match_parent">
+		android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
+		<androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/gamesList"
+			android:id="@+id/gamesList"
-            android:layout_width="match_parent"
+			android:layout_width="match_parent"
-            android:layout_height="match_parent"
+			android:layout_height="match_parent"
-            app:layoutManager="LinearLayoutManager"
+			android:clipToPadding="false"
-            android:clipToPadding="false"
+			android:paddingHorizontal="8dp"
-            android:paddingHorizontal="8dp"
+			app:layoutManager="LinearLayoutManager"
-            tools:listitem="@layout/card_game" />
+			tools:listitem="@layout/card_game" />
-    </RelativeLayout>
+	</RelativeLayout>
 
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

android/app/src/main/res/layout/fragment_setup.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/fragment_steam_login.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/steam_background"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    tools:context=".fragment.SteamLoginFragment">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:src="@drawable/steam_logo"
-        app:tint="#C5C3C0" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        app:startIconDrawable="@drawable/ic_baseline_person_24">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/steamLogin"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/username"
-            android:inputType="textEmailAddress" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="320dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-
-        app:startIconDrawable="@drawable/ic_baseline_key_24">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/steamPassword"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/password"
-            android:inputType="textPassword" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <Button
-        android:id="@+id/loginButton"
-        style="@style/App.Theme.SteamButton"
-        android:layout_width="240dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:text="@string/login" />
-</LinearLayout>

android/app/src/main/res/layout/list_preference.xml

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
-    android:layout_width="match_parent"
+	android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+	android:layout_height="wrap_content">
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"/>
 
-    <TextView
+	<TextView
-        android:id="@android:id/summary"
+		android:id="@android:id/title"
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@android:id/title"
+		android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"/>
+		app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+	<TextView
+		android:id="@android:id/summary"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+		app:layout_constraintTop_toBottomOf="@android:id/title" />
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/page_location.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <ImageView
-        android:id="@+id/pagePic"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="64dp"
-        android:layout_marginBottom="32dp"
-        android:src="@drawable/ic_baseline_folder_open_24"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/pageTitle"/>
-
-    <TextView
-        android:id="@+id/pageTitle"
-        style="@style/TextAppearance.Material3.TitleLarge"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:paddingHorizontal="16dp"
-        android:text="@string/setup_location_title"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/pageMessage"
-        app:layout_constraintTop_toBottomOf="@id/pagePic" />
-
-    <TextView
-        android:id="@+id/pageMessage"
-        style="@style/TextAppearance.Material3.TitleMedium"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:paddingHorizontal="16dp"
-        android:text="@string/setup_location_message"
-        app:layout_constraintBottom_toTopOf="@id/pageButton"
-        app:layout_constraintTop_toBottomOf="@id/pageTitle" />
-
-    <Button
-        android:id="@+id/pageButton"
-        android:layout_width="240dp"
-        android:layout_marginBottom="128dp"
-        android:layout_height="wrap_content"
-        android:text="@string/ok"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/pageMessage" />
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/page_welcome.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <ImageView
-        android:id="@+id/pagePic"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="64dp"
-        android:layout_marginBottom="32dp"
-        android:src="@mipmap/ic_launcher"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/pageTitle"/>
-
-    <TextView
-        android:id="@+id/pageTitle"
-        style="@style/TextAppearance.Material3.TitleLarge"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        android:paddingHorizontal="16dp"
-        android:text="@string/setup_welcome_title"
-        app:layout_constraintBottom_toTopOf="@id/pageMessage"
-        app:layout_constraintTop_toBottomOf="@id/pagePic" />
-
-    <TextView
-        android:id="@+id/pageMessage"
-        style="@style/TextAppearance.Material3.TitleMedium"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:gravity="center"
-        android:paddingHorizontal="16dp"
-        android:text="@string/setup_welcome_message"
-        app:layout_constraintBottom_toTopOf="@id/pageButton"
-        app:layout_constraintTop_toBottomOf="@id/pageTitle" />
-
-    <Button
-        android:id="@+id/pageButton"
-        android:layout_width="240dp"
-        android:layout_marginBottom="128dp"
-        android:layout_height="wrap_content"
-        android:text="@string/next"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/pageMessage" />
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/steam_guard_dialog.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="32dp">
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/steam_guard_code"
-        android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/textInputLayout"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/steamCode"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:hint="@string/steam_guard_code" />
-    </com.google.android.material.textfield.TextInputLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/switch_preference.xml

@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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"
-    android:layout_width="match_parent"
+	xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="wrap_content">
+	style="@style/Widget.Material3.CardView.Filled"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginHorizontal="8dp"
+	android:layout_marginTop="8dp"
+	app:layout_constraintBottom_toBottomOf="parent"
+	app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
+	<androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@android:id/title"
+		android:layout_width="match_parent"
-        android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
-        android:layout_height="wrap_content"
+		android:padding="10dp">
-        app:layout_constraintStart_toStartOf="parent"
+
-        app:layout_constraintTop_toTopOf="parent"
+		<TextView
-        app:layout_constraintBottom_toBottomOf="parent"
+			android:id="@android:id/title"
-        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"/>
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="Switch preference" />
+
+		<com.google.android.material.materialswitch.MaterialSwitch
+			android:id="@+id/switchWidget"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+	</androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/switchWidget"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/menu/menu_game_settings.xml

@@ -1,14 +1,9 @@
 <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/action_dedicated"
+		android:id="@+id/action_dedicated"
-        android:icon="@drawable/ic_baseline_terminal_24"
+		android:icon="@drawable/ic_baseline_terminal_24"
-        android:title="@string/dedicated_server"
+		android:title="@string/dedicated_server"
-        app:showAsAction="always|withText"
+		android:visible="false"
-        android:visible="false"/>
+		app:showAsAction="always|withText" />
-    <item
+</menu>
-        android:id="@+id/action_uninstall"
-        android:icon="@drawable/ic_baseline_delete_24"
-        android:title="@string/uninstall"
-        app:showAsAction="always|withText" />
-</menu>

android/app/src/main/res/menu/menu_library.xml

@@ -1,19 +1,8 @@
 <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/action_browse"
+		android:id="@+id/action_settings"
-        android:icon="@drawable/ic_baseline_folder_open_24"
+		android:icon="@drawable/ic_baseline_settings_24"
-        android:title="@string/browse"
+		android:title="@string/app_settings"
-        app:showAsAction="always|withText" />
+		app:showAsAction="always|withText" />
-    <item
+</menu>
-        android:id="@+id/action_install"
-        android:icon="@drawable/ic_baseline_add_24"
-        android:title="@string/install"
-        app:showAsAction="always|withText" />
-    <item
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_baseline_settings_24"
-        android:title="@string/app_settings"
-        app:showAsAction="always|withText"
-        android:visible="false"/>
-</menu>

android/app/src/main/res/navigation/nav_graph.xml

@@ -1,38 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation 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"
-    xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/nav_graph"
-    android:id="@+id/nav_graph"
+	android:label="@string/library"
-    android:label="@string/library"
+	app:startDestination="@id/libraryFragment">
-    app:startDestination="@id/libraryFragment">
+	<fragment
-    <fragment
+		android:id="@+id/libraryFragment"
-        android:id="@+id/libraryFragment"
+		android:name="su.xash.engine.ui.library.LibraryFragment"
-        android:name="su.xash.engine.ui.library.LibraryFragment"
+		android:label="@string/library">
-        android:label="@string/library">
+		<action
-        <action
+			android:id="@+id/action_libraryFragment_to_gameSettingsFragment"
-            android:id="@+id/action_libraryFragment_to_setupFragment"
+			app:destination="@id/gameSettingsFragment" />
-            app:destination="@id/setupFragment" />
+		<action
-        <action
+			android:id="@+id/action_libraryFragment_to_appSettingsFragment"
-            android:id="@+id/action_libraryFragment_to_gameSettingsFragment"
+			app:destination="@id/appSettingsFragment" />
-            app:destination="@id/gameSettingsFragment" />
+	</fragment>
-        <action
+	<fragment
-            android:id="@+id/action_libraryFragment_to_appSettingsFragment"
+		android:id="@+id/gameSettingsFragment"
-            app:destination="@id/appSettingsFragment" />
+		android:name="su.xash.engine.ui.settings.GameSettingsFragment"
-    </fragment>
+		android:label="@string/game_settings" />
-    <fragment
+	<fragment
-        android:id="@+id/setupFragment"
+		android:id="@+id/appSettingsFragment"
-        android:name="su.xash.engine.ui.setup.SetupFragment"
+		android:name="su.xash.engine.ui.settings.AppSettingsFragment"
-        android:label="@string/setup" >
+		android:label="@string/app_settings" />
-        <action
+</navigation>
-            android:id="@+id/action_setupFragment_to_libraryFragment"
-            app:destination="@id/libraryFragment" />
-    </fragment>
-    <fragment
-        android:id="@+id/gameSettingsFragment"
-        android:name="su.xash.engine.ui.settings.GameSettingsFragment"
-        android:label="@string/game_settings" />
-    <fragment
-        android:id="@+id/appSettingsFragment"
-        android:name="su.xash.engine.ui.settings.AppSettingsFragment"
-        android:label="@string/app_settings" />
-</navigation>

android/app/src/main/res/values-es/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ok">Ok</string>
-    <string name="cancel">Cancelar</string>
-</resources>

android/app/src/main/res/values-it/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="cancel">Annulla</string>
-    <string name="ok">Ok</string>
-</resources>

android/app/src/main/res/values-pt-rBR/strings.xml

@@ -1,33 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="ok">Ok</string>
+	<string name="library">Biblioteca</string>
-    <string name="cancel">Cancelar</string>
+	<string name="dedicated_server">Dedicado</string>
-    <string name="next">Próximo</string>
+	<string name="app_settings">Configurações</string>
-    <string name="browse">Navegar</string>
+	<string name="game_settings">Configurações do jogo</string>
-    <string name="install">Instalar</string>
+	<string name="game_settings_command_line">Argumentos de linha de comando</string>
-    <string name="library">Biblioteca</string>
+	<string name="game_settings_volume_buttons">Usar botões de volume no jogo</string>
-    <string name="steam_guard_code">Código do Steam Guard</string>
+	<string name="preferences_package_name">Bibliotecas de pacotes</string>
-    <string name="steam_login">Logar com Steam</string>
+	<string name="preferences_separate_libraries">Bibliotecas de pacotes separados</string>
-    <string name="login">Logar</string>
+	<string name="preferences_client_package">Pacotes de Cliente</string>
-    <string name="username">Usuário</string>
+	<string name="preferences_server_package">Pacotes de Servidor</string>
-    <string name="password">Senha</string>
+	<string name="preferences_use_icons">Usar ícones ao inves de imagens de fundo</string>
-    <string name="uninstall">Desinstalar</string>
-    <string name="dedicated_server">Dedicado</string>
-    <string name="error">Erro!</string>
-    <string name="setup">Configurar</string>
-    <string name="app_settings">Configurações</string>
-    <string name="game_settings">Configurações do jogo</string>
-    <string name="game_settings_command_line">Argumentos de linha de comando</string>
-    <string name="game_settings_volume_buttons">Usar botões de volume no jogo</string>
-    <string name="setup_welcome_title">Bem vindo ao Xash3D FWGS!</string>
-    <string name="setup_welcome_message">Agora, nós vamos guiá-lo durante o processo de instalação.</string>
-    <string name="setup_location_title">Jogos</string>
-    <string name="setup_location_message">Selecione a pasta onde seus jogos estão localizados.</string>
-    <string name="setup_location_empty">A pasta selecionada não contem nenhum jogo.</string>
-    <string name="setup_location_invalid">A pasta selecionada é invalida.</string>
-    <string name="preferences_package_name">Bibliotecas de pacotes</string>
-    <string name="preferences_separate_libraries">Bibliotecas de pacotes separados</string>
-    <string name="preferences_client_package">Pacotes de Cliente</string>
-    <string name="preferences_server_package">Pacotes de Servidor</string>
-    <string name="preferences_use_icons">Usar ícones ao inves de imagens de fundo</string>
 </resources>

android/app/src/main/res/values-ru/strings.xml

@@ -1,33 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="cancel">Отмена</string>
+	<string name="library">Библиотека</string>
-    <string name="ok">ОК</string>
+	<string name="dedicated_server">Выделенный</string>
-    <string name="next">Далее</string>
+	<string name="app_settings">Настройки</string>
-    <string name="browse">Обзор</string>
+	<string name="game_settings">Настройки игры</string>
-    <string name="install">Установить</string>
+	<string name="game_settings_command_line">Аргументы командной строки</string>
-    <string name="library">Библиотека</string>
+	<string name="game_settings_volume_buttons">Использовать кнопки громкости</string>
-    <string name="steam_guard_code">Код Steam Guard</string>
+	<string name="preferences_package_name">Пакет библиотек</string>
-    <string name="steam_login">Логин Steam</string>
+	<string name="preferences_separate_libraries">Библиотеки из отдельных пакетов</string>
-    <string name="login">Логин</string>
+	<string name="preferences_client_package">Пакет клиента</string>
-    <string name="username">Имя пользователя</string>
+	<string name="preferences_server_package">Пакет сервера</string>
-    <string name="password">Пароль</string>
+	<string name="preferences_use_icons">Использовать иконки вместо фона</string>
-    <string name="uninstall">Удалить</string>
+</resources>
-    <string name="dedicated_server">Выделенный</string>
-    <string name="error">Ошибка!</string>
-    <string name="setup">Установка</string>
-    <string name="app_settings">Настройки</string>
-    <string name="game_settings">Настройки игры</string>
-    <string name="game_settings_command_line">Аргументы командной строки</string>
-    <string name="game_settings_volume_buttons">Использовать кнопки громкости</string>
-    <string name="setup_welcome_title">Добро пожаловать в Xash3D FWGS!</string>
-    <string name="setup_welcome_message">Теперь мы ознакомим вас с процессом установки.</string>
-    <string name="setup_location_title">Игры</string>
-    <string name="setup_location_message">Выберите папку, в которой находятся ваши игры.</string>
-    <string name="setup_location_empty">Выбранный каталог не содержит ни одной игры.</string>
-    <string name="setup_location_invalid">Выбранный каталог недопустим.</string>
-    <string name="preferences_package_name">Пакет библиотек</string>
-    <string name="preferences_separate_libraries">Библиотеки из отдельных пакетов</string>
-    <string name="preferences_client_package">Пакет клиента</string>
-    <string name="preferences_server_package">Пакет сервера</string>
-    <string name="preferences_use_icons">Использовать иконки вместо фона</string>
-</resources>

android/app/src/main/res/values-tr/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ok">Tamam</string>
-    <string name="cancel">İptal</string>
-</resources>

android/app/src/main/res/values-uk/strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ok">Ок</string>
-    <string name="cancel">Скасувати</string>
-</resources>

android/app/src/main/res/values/colors.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <color name="valve_red">#F74843</color>
+	<color name="valve_red">#F74843</color>
-   <color name="steam_grey">#C5C3C0</color>
+	<color name="hl_orange">#FB7E14</color>
-   <color name="steam_background">#181A21</color>
+	<color name="black">#000000</color>
-   <color name="steam_dark_grey">#32353C</color>
+	<color name="hl_dark_grey">#151515</color>
-   <color name="hl_orange">#FB7E14</color>
+	<color name="hl_grey">#292929</color>
-   <color name="black">#000000</color>
-   <color name="hl_dark_grey">#151515</color>
-   <color name="hl_grey">#292929</color>
 </resources>
 

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#F74843</color>
+	<color name="ic_launcher_background">#F74843</color>
-</resources>
+</resources>

android/app/src/main/res/values/strings.xml

@@ -1,36 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Xash3D FWGS</string>
+	<string name="app_name" translatable="false">Xash3D FWGS</string>
-    <string name="authority" translatable="false">su.xash.engine.documents</string>
+	<string name="library">Library</string>
-    <string name="cancel">Cancel</string>
+	<string name="dedicated_server">Dedicated</string>
-    <string name="ok">OK</string>
+	<string name="app_settings">Settings</string>
-    <string name="next">Next</string>
+	<string name="game_settings">Game Settings</string>
-    <string name="browse">Browse</string>
+	<string name="game_settings_command_line">Command-line arguments</string>
-    <string name="install">Install</string>
+	<string name="game_settings_volume_buttons">Use volume buttons in-game</string>
-    <string name="library">Library</string>
+	<string name="preferences_package_name">Libraries package</string>
-    <string name="steam_guard_code">Steam Guard Code</string>
+	<string name="preferences_separate_libraries">Libraries from separate packages</string>
-    <string name="steam_login">Steam Login</string>
+	<string name="preferences_client_package">Client package</string>
-    <string name="login">Login</string>
+	<string name="preferences_server_package">Server package</string>
-    <string name="username">Username</string>
+	<string name="preferences_use_icons">Use icons instead of backgrounds</string>
-    <string name="password">Password</string>
+	<string name="game_data_location">Game data location</string>
-    <string name="steam" translatable="false">Steam</string>
+	<string name="file_access_required">All-files access required</string>
-    <string name="uninstall">Uninstall</string>
+	<string name="file_access_message">All-files access is required for the app to function properly.</string>
-    <string name="dedicated_server">Dedicated</string>
+	<string name="select_current_directory">Select current directory</string>
-    <string name="error">Error!</string>
+</resources>
-    <string name="setup">Setup</string>
-    <string name="app_settings">Settings</string>
-    <string name="game_settings">Game Settings</string>
-    <string name="game_settings_command_line">Command-line arguments</string>
-    <string name="game_settings_volume_buttons">Use volume buttons in-game</string>
-    <string name="setup_welcome_title">Welcome to Xash3D FWGS!</string>
-    <string name="setup_welcome_message">Now, we will guide you through the installation process.</string>
-    <string name="setup_location_title">Games</string>
-    <string name="setup_location_message">Select the folder, where your games are located.</string>
-    <string name="setup_location_empty">Selected directory doesn\'t contain any games.</string>
-    <string name="setup_location_invalid">Selected directory is invalid.</string>
-    <string name="preferences_package_name">Libraries package</string>
-    <string name="preferences_separate_libraries">Libraries from separate packages</string>
-    <string name="preferences_client_package">Client package</string>
-    <string name="preferences_server_package">Server package</string>
-    <string name="preferences_use_icons">Use icons instead of backgrounds</string>
-</resources>

android/app/src/main/res/values/styles.xml

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="App.Theme.SteamButton" parent="@style/Widget.Material3.Button">
+	<style name="ShapeAppearance.App.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
-        <item name="android:background">@drawable/steam_button_gradient</item>
+		<item name="cornerSize">4dp</item>
-        <item name="backgroundTint">@null</item>
+	</style>
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
-
-    <style name="ShapeAppearance.App.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
-        <item name="cornerSize">4dp</item>
-    </style>
-
 </resources>

android/app/src/main/res/values/themes.xml

@@ -1,17 +1,18 @@
 <resources>
-    <style name="Theme.App" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="colorPrimary">@color/hl_orange</item>
-        <item name="colorPrimaryDark">@color/hl_dark_grey</item>
-<!--        <item name="colorPrimaryContainer">@color/valve_red</item>-->
-        <item name="colorSurface">@color/hl_grey</item>
-        <item name="colorSurfaceVariant">@color/hl_grey</item>
-        <item name="android:colorBackground">@color/hl_dark_grey</item>
-        <item name="colorControlNormal">@color/hl_orange</item>
-        <item name="colorOnPrimary">@color/hl_dark_grey</item>
-<!--        <item name="colorOnPrimaryContainer">@android:color/white</item>-->
-<!--        <item name="colorOnSurface">@android:color/white</item>-->
-<!--        <item name="colorOnSurfaceVariant">@android:color/white</item>-->
 
-<!--        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>-->
+	<style name="Theme.App" parent="Theme.Material3.Dark.NoActionBar">
-    </style>
+		<item name="colorPrimary">@color/hl_orange</item>
-</resources>
+		<item name="colorPrimaryDark">@color/hl_dark_grey</item>
+		<!--        <item name="colorPrimaryContainer">@color/valve_red</item>-->
+		<item name="colorSurface">@color/hl_grey</item>
+		<item name="colorSurfaceVariant">@color/hl_grey</item>
+		<item name="android:colorBackground">@color/hl_dark_grey</item>
+		<item name="colorControlNormal">@color/hl_orange</item>
+		<item name="colorOnPrimary">@color/hl_dark_grey</item>
+		<!--        <item name="colorOnPrimaryContainer">@android:color/white</item>-->
+		<!--        <item name="colorOnSurface">@android:color/white</item>-->
+		<!--        <item name="colorOnSurfaceVariant">@android:color/white</item>-->
+
+		<!--        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>-->
+	</style>
+</resources>

android/app/src/main/res/xml/app_preferences.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen 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">
-    <SwitchPreferenceCompat
+	<Preference
-        app:key="use_icons"
+		app:key="game_path"
-        app:layout="@layout/switch_preference"
+		app:layout="@layout/edit_text_preference"
-        app:title="@string/preferences_use_icons" />
+		app:title="@string/game_data_location"
-</PreferenceScreen>
+		android:summary="/storage/emulated/0/xash" />
+
+	<SwitchPreferenceCompat
+		app:key="use_icons"
+		app:layout="@layout/switch_preference"
+		app:title="@string/preferences_use_icons" />
+</PreferenceScreen>

android/app/src/main/res/xml/game_preferences.xml

@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+	<EditTextPreference
-    <EditTextPreference
+		app:defaultValue="-console -log"
-        app:defaultValue="-console -log"
+		app:key="arguments"
-        app:key="arguments"
+		app:layout="@layout/edit_text_preference"
-        app:layout="@layout/edit_text_preference"
+		app:title="@string/game_settings_command_line"
-        app:title="@string/game_settings_command_line"
+		app:useSimpleSummaryProvider="true" />
-        app:useSimpleSummaryProvider="true" />
 
-    <SwitchPreferenceCompat
+	<SwitchPreferenceCompat
-        app:key="use_volume_buttons"
+		app:key="use_volume_buttons"
-        app:layout="@layout/switch_preference"
+		app:layout="@layout/switch_preference"
-        app:title="@string/game_settings_volume_buttons" />
+		app:title="@string/game_settings_volume_buttons" />
 
-    <SwitchPreferenceCompat
+	<SwitchPreferenceCompat
-        app:key="separate_libraries"
+		app:key="separate_libraries"
-        app:layout="@layout/switch_preference"
+		app:layout="@layout/switch_preference"
-        app:title="@string/preferences_separate_libraries"
+		app:title="@string/preferences_separate_libraries"
-        app:isPreferenceVisible="false"/>
+		app:isPreferenceVisible="false" />
 
-    <ListPreference
+	<ListPreference
-        app:key="package_name"
+		app:key="package_name"
-        app:layout="@layout/list_preference"
+		app:layout="@layout/list_preference"
-        app:title="@string/preferences_package_name"
+		app:title="@string/preferences_package_name"
-        app:useSimpleSummaryProvider="true"
+		app:useSimpleSummaryProvider="true"
-        app:isPreferenceVisible="false"/>
+		app:isPreferenceVisible="false" />
 
-    <ListPreference
+	<ListPreference
-        app:key="client_package"
+		app:key="client_package"
-        app:layout="@layout/list_preference"
+		app:layout="@layout/list_preference"
-        app:title="@string/preferences_client_package"
+		app:title="@string/preferences_client_package"
-        app:useSimpleSummaryProvider="true"
+		app:useSimpleSummaryProvider="true"
-        app:isPreferenceVisible="false"/>
+		app:isPreferenceVisible="false" />
 
-    <ListPreference
+	<ListPreference
-        app:key="server_package"
+		app:key="server_package"
-        app:layout="@layout/list_preference"
+		app:layout="@layout/list_preference"
-        app:title="@string/preferences_server_package"
+		app:title="@string/preferences_server_package"
-        app:useSimpleSummaryProvider="true"
+		app:useSimpleSummaryProvider="true"
-        app:isPreferenceVisible="false"/>
+		app:isPreferenceVisible="false" />
 </PreferenceScreen>

android/build.gradle.kts

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-	id("com.android.application") version "8.5.0" apply false
+	alias(libs.plugins.android.application) apply false
-	id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+	alias(libs.plugins.kotlin.android) apply false
-}
+}

android/gradle.properties

@@ -8,8 +8,8 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
+# This option should only be used with decoupled projects. For more details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
@@ -22,5 +22,6 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 
+
 # Enable verbose output for CMake
 android.native.buildOutput=verbose

android/gradle/libs.versions.toml

@@ -0,0 +1,23 @@
+[versions]
+acraHttp = "5.12.0"
+agp = "8.11.1"
+appcompat = "1.7.1"
+kotlin = "2.2.0"
+material = "1.12.0"
+navigationRuntimeKtx = "2.9.1"
+preferenceKtx = "1.2.1"
+swiperefreshlayout = "1.1.0"
+
+[libraries]
+acra-http = { module = "ch.acra:acra-http", version.ref = "acraHttp" }
+appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
+navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationRuntimeKtx" }
+navigation-runtime-ktx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigationRuntimeKtx" }
+navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationRuntimeKtx" }
+preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Sep 22 13:23:17 EEST 2023
+#Tue Jul 01 19:51:06 EEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists