Skip to content

Commit a9ac8f3

Browse files
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.gradle
1 parent 6b56a5f commit a9ac8f3

21 files changed

+537
-464
lines changed

3rdparty/grafika/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ repositories {
4848

4949
dependencies {
5050
implementation fileTree(dir: "libs", include: ["*.jar"])
51-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22'
52-
implementation 'com.jakewharton.timber:timber:4.7.1'
51+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0'
52+
implementation 'com.jakewharton.timber:timber:5.0.1'
5353

5454
// Uncomment if you want to include locally published artifacts
5555
// implementation 'com.github.GhettiGuru:bee-encode:0.3'

3rdparty/grafika/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
-->
1818

1919
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
20-
package="com.android.grafika">
20+
>
2121

2222
</manifest>

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
org.gradle.jvmargs=-Xmx1536M
2121

2222
android.useAndroidX=true
23+
LOCAL_BUILD=true
24+
android.suppressUnsupportedCompileSdk=34

gradle/wrapper/gradle-wrapper.jar

12.1 KB
Binary file not shown.
Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
1-
#
2-
# Copyright (C) 2020 Jakub Ksiezniak
3-
#
4-
# This program is free software; you can redistribute it and/or modify
5-
# it under the terms of the GNU General Public License as published by
6-
# the Free Software Foundation; either version 2 of the License, or
7-
# (at your option) any later version.
8-
#
9-
# This program is distributed in the hope that it will be useful,
10-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
# GNU General Public License for more details.
13-
#
14-
# You should have received a copy of the GNU General Public License along
15-
# with this program; if not, write to the Free Software Foundation, Inc.,
16-
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17-
#
18-
19-
#Tue Oct 20 21:24:01 CEST 2020
201
distributionBase=GRADLE_USER_HOME
212
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
226
zipStoreBase=GRADLE_USER_HOME
237
zipStorePath=wrapper/dists
24-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip

0 commit comments

Comments
 (0)