Commit a9ac8f3
committed
Fix: Resolve critical build and runtime errors
This commit addresses a series of cascading errors that prevented the Android client from compiling and running correctly.
Build & Configuration:
- Corrected the `namespace` in `build.gradle` to match the project's package structure, resolving all `Unresolved reference: R` and data binding errors.
- Wrapped layouts (`activity_connect`, `servers_fragment`, etc.) in `<layout>` tags to enable data binding class generation.
View Logic & Rendering:
- Updated `onScroll`/`onFling` signatures in `WorkspaceView` to handle nullable MotionEvent parameters.
- Fixed a Kotlin smart cast error in `ServerDetailsFragment` by caching a mutable property in a local variable before use.
- Replaced a direct call to an internal color in `ServerDetailsAdapter` with a safer, theme-aware attribute lookup using `MaterialColors`.
On branch master
Your branch is up to date with 'origin/master'.
Changes to be committed:
modified: 3rdparty/grafika/build.gradle
modified: 3rdparty/grafika/src/main/AndroidManifest.xml
modified: gradle.properties
modified: gradle/wrapper/gradle-wrapper.jar
modified: gradle/wrapper/gradle-wrapper.properties
modified: gradlew
modified: gradlew.bat
new file: keystore.properties
new file: libs/bee-encode-0.3-SNAPSHOT.jar
new file: libs/rencode4j-1.2.0.jar
modified: xpra-client-android/build.gradle
modified: xpra-client-android/src/main/AndroidManifest.xml
modified: xpra-client-android/src/main/java/com/github/jksiezni/xpra/config/ServerDetailsAdapter.kt
modified: xpra-client-android/src/main/java/com/github/jksiezni/xpra/config/ServerDetailsFragment.kt
modified: xpra-client-android/src/main/java/com/github/jksiezni/xpra/view/ProxyView.kt
modified: xpra-client-android/src/main/java/com/github/jksiezni/xpra/view/WorkspaceView.kt
modified: xpra-client-android/src/main/res/layout/active_connection_fragment.xml
modified: xpra-client-android/src/main/res/layout/activity_connect.xml
modified: xpra-client-android/src/main/res/layout/activity_xpra.xml
modified: xpra-client-android/src/main/res/layout/servers_fragment.xml
modified: xpra-common/build.gradle1 parent 6b56a5f commit a9ac8f3
File tree
21 files changed
+537
-464
lines changed- 3rdparty/grafika
- src/main
- gradle/wrapper
- libs
- xpra-client-android
- src/main
- java/com/github/jksiezni/xpra
- config
- view
- res/layout
- xpra-common
21 files changed
+537
-464
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
52 | | - | |
| 51 | + | |
| 52 | + | |
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | 1 | | |
21 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
22 | 6 | | |
23 | 7 | | |
24 | | - | |
0 commit comments