Skip to content

Commit

Permalink
Merge branch 'master' into configurable-network-binding
Browse files Browse the repository at this point in the history
  • Loading branch information
@elluisian
elluisian authored Aug 27, 2024
2 parents 4710b51 + f42a5cb commit 819734e
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 62 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: CI

on:
pull_request:
branches: [ "master" ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: set up JDK 11
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
cache: gradle
- name: Assemble Release Build
run: ./gradlew assembleRelease
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId "net.christianbeier.droidvnc_ng"
minSdkVersion 24
targetSdkVersion 34
versionCode 35
versionName "2.6.0"
versionCode 36
versionName "2.7.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down
101 changes: 44 additions & 57 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,38 +30,9 @@
android:layout_height="match_parent">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:padding="10dp"
android:text="@string/main_activity_settings_listening_address" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:padding="10dp"
android:text="@string/main_activity_colon" />

<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="2"
android:padding="10dp"
android:hint="@string/settings_listen_interface_hint"
android:layout_weight="1"
android:inputType="textUri"
android:maxLines="1"
android:id="@+id/settings_listen_interface"/>
</TableRow>

<TableRow
android:layout_width="match_parent"
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:text="@string/main_activity_settings_port" />
Expand All @@ -74,11 +45,11 @@
android:text="@string/main_activity_colon" />

<EditText
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:padding="10dp"
android:layout_weight="1"
android:layout_weight="3"
android:inputType="number"
android:id="@+id/settings_port"/>
</TableRow>
Expand All @@ -88,10 +59,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_settings_password" />

<TextView
Expand All @@ -102,11 +75,11 @@
android:text="@string/main_activity_colon" />

<EditText
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:padding="10dp"
android:layout_weight="1"
android:layout_weight="3"
android:inputType="textPassword"
android:id="@+id/settings_password"/>

Expand All @@ -117,10 +90,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_settings_access_key" />

<TextView
Expand All @@ -131,11 +106,11 @@
android:text="@string/main_activity_colon" />

<EditText
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:padding="10dp"
android:layout_weight="1"
android:layout_weight="3"
android:inputType="textPassword"
android:id="@+id/settings_access_key"/>

Expand All @@ -146,10 +121,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_settings_start_on_boot" />

<TextView
Expand All @@ -161,10 +138,10 @@

<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/settings_start_on_boot"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_weight="1"
android:layout_weight="3"
android:nextFocusDown="@id/settings_start_on_boot_delay"
android:text="" />

Expand All @@ -175,10 +152,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_settings_start_on_boot_delay" />

<TextView
Expand All @@ -189,11 +168,11 @@
android:text="@string/main_activity_colon" />

<EditText
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:padding="10dp"
android:layout_weight="1"
android:layout_weight="3"
android:inputType="number"
android:id="@+id/settings_start_on_boot_delay"/>

Expand All @@ -205,10 +184,12 @@
android:id="@+id/settings_row_file_transfer">

<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_settings_file_transfer" />

<TextView
Expand All @@ -220,10 +201,10 @@

<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/settings_file_transfer"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_weight="1"
android:layout_weight="3"
android:nextFocusUp="@id/settings_start_on_boot_delay"
android:text="" />

Expand All @@ -235,10 +216,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_settings_scaling" />

<TextView
Expand All @@ -250,10 +233,10 @@

<com.google.android.material.slider.Slider
android:id="@+id/settings_scaling"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_weight="1"
android:layout_weight="3"
android:layout_gravity="center"
android:stepSize="5"
android:value="100"
Expand All @@ -268,10 +251,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_settings_view_only" />

<TextView
Expand All @@ -283,10 +268,10 @@

<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/settings_view_only"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_weight="1"
android:layout_weight="3"
android:text="" />

</TableRow>
Expand All @@ -296,10 +281,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_settings_show_pointers" />

<TextView
Expand All @@ -311,10 +298,10 @@

<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/settings_show_pointers"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_column="2"
android:layout_weight="1"
android:layout_weight="3"
android:text="" />

</TableRow>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<resources>
<string name="main_activity_title">Administración de droidVNC-NG</string>
<string name="main_activity_settings">Configuración</string>
<string name="main_activity_settings_listening_address">Dirección de escucha</string>
<string name="main_activity_settings_port">Puerto</string>
<string name="main_activity_settings_port_not_listening">Conexiones entrantes deshabilitadas</string>
<string name="main_activity_settings_password">Contraseña</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<resources>
<string name="main_activity_title">Administration de droidVNC-NG</string>
<string name="main_activity_settings">Paramètres</string>
<string name="main_activity_settings_listening_address">Adresse d\'écoute</string>
<string name="main_activity_settings_port">Port</string>
<string name="main_activity_settings_port_not_listening">Connexions d\'entrée désactivées</string>
<string name="main_activity_settings_password">Mot de passe</string>
Expand Down
2 changes: 1 addition & 1 deletion libvncserver
Submodule libvncserver updated 1 files
+2 −2 src/libvncserver/main.c

0 comments on commit 819734e

Please sign in to comment.