Merge branch 'bk138:master' into configurable-network-binding

bk138 · Sep 1, 2024 · 5cfc4d8 · 5cfc4d8
2 parents 9232ebc + e8877a3
commit 5cfc4d8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,10 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: set up JDK 11
+      with:
+        submodules: 'true'
+    - name: set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
     - name: Assemble Release Build

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "net.christianbeier.droidvnc_ng"
         minSdkVersion 24
         targetSdkVersion 34
-        versionCode 36
-        versionName "2.7.0"
+        versionCode 37
+        versionName "2.7.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -383,10 +383,12 @@
                 android:layout_height="match_parent">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="2"
                     android:layout_column="0"
                     android:padding="10dp"
+                    android:hyphenationFrequency="full"
                     android:text="@string/main_activity_screen_capturing" />
 
                 <TextView
@@ -397,8 +399,9 @@
                     android:text="@string/main_activity_colon" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="3"
                     android:layout_column="2"
                     android:padding="10dp"
                     android:text="@string/main_activity_fallback"
@@ -411,10 +414,12 @@
                 android:layout_height="match_parent">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="2"
                     android:layout_column="0"
                     android:padding="10dp"
+                    android:hyphenationFrequency="full"
                     android:text="@string/main_activity_input" />
 
                 <TextView
@@ -425,8 +430,9 @@
                     android:text="@string/main_activity_colon" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="3"
                     android:layout_column="2"
                     android:padding="10dp"
                     android:text="@string/main_activity_fallback"
@@ -441,10 +447,12 @@
                 android:id="@+id/permission_row_file_access">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="2"
                     android:layout_column="0"
                     android:padding="10dp"
+                    android:hyphenationFrequency="full"
                     android:text="@string/main_activity_file_access" />
 
                 <TextView
@@ -455,8 +463,9 @@
                     android:text="@string/main_activity_colon" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="3"
                     android:layout_column="2"
                     android:padding="10dp"
                     android:text="@string/main_activity_fallback"
@@ -471,10 +480,12 @@
                 android:id="@+id/permission_row_notification">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="2"
                     android:layout_column="0"
                     android:padding="10dp"
+                    android:hyphenationFrequency="full"
                     android:text="@string/main_activity_notifications" />
 
                 <TextView
@@ -485,8 +496,9 @@
                     android:text="@string/main_activity_colon" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="3"
                     android:layout_column="2"
                     android:padding="10dp"
                     android:text="@string/main_activity_fallback"
@@ -501,10 +513,12 @@
                 android:id="@+id/permission_row_start_on_boot">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="2"
                     android:layout_column="0"
                     android:padding="10dp"
+                    android:hyphenationFrequency="full"
                     android:text="@string/main_activity_start_on_boot" />
 
                 <TextView
@@ -515,8 +529,9 @@
                     android:text="@string/main_activity_colon" />
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_weight="3"
                     android:layout_column="2"
                     android:padding="10dp"
                     android:text="@string/main_activity_fallback"

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/libvncserver b/libvncserver