Merge remote-tracking branch 'origin/master' into new/http-proxy

7 files changed, 23 insertions, 57 deletions

diff --git a/build.gradle b/build.gradle
index 9333da35..faa30833 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,22 @@
 buildscript {
     ext {
-        activityVersion = '1.4.0'
-        annotationsVersion = '1.3.0'
-        appcompatVersion = '1.4.1'
+        activityVersion = '1.5.1'
+        annotationsVersion = '1.4.0'
+        appcompatVersion = '1.4.2'
         biometricVersion = '1.1.0'
         collectionVersion = '1.2.0'
         constraintLayoutVersion = '2.1.4'
         coordinatorLayoutVersion = '1.2.0'
-        coreKtxVersion = '1.7.0'
-        coroutinesVersion = '1.6.1'
+        coreKtxVersion = '1.8.0'
+        coroutinesVersion = '1.6.4'
         datastoreVersion = '1.0.0'
         desugarVersion = '1.1.5'
-        fragmentVersion = '1.4.1'
+        fragmentVersion = '1.5.1'
         grpcVersion = '1.46.0'
         jsr305Version = '3.0.2'
         junitVersion = '4.13.2'
-        lifecycleRuntimeKtxVersion = '2.4.1'
-        materialComponentsVersion = '1.6.0'
+        lifecycleRuntimeKtxVersion = '2.5.1'
+        materialComponentsVersion = '1.6.1'
         preferenceVersion = '1.2.0'
         protobufGradleVersion = '0.8.18'
         protocVersion = '3.20.1'
@@ -33,47 +33,14 @@ buildscript {
     }
 }
 
-plugins {
-    id "de.undercouch.download" version "5.0.4"
-}
-
-task downloadCrowdin(type: Download) {
-	src 'https://crowdin.com/backend/download/project/wireguard.zip'
-	dest file('build/translations.zip')
-	overwrite true
-}
-
-task cleanCrowdin(type: Delete) {
-	delete 'ui/src/main/res/values-*/strings.xml'
-}
-
-task extractCrowdin(type: Copy, dependsOn: ['downloadCrowdin', 'cleanCrowdin']) {
-	mustRunAfter 'downloadCrowdin'
-	from zipTree(file('build/translations.zip'))
-	into file('build/translations')
-	doFirst {
-		delete 'build/translations'
-	}
-}
-
-task crowdin(type: Copy, dependsOn: ['extractCrowdin']) {
-    mustRunAfter 'extractCrowdin'
-    from 'build/translations/wireguard-android/ui/src/main/res'
-    into 'ui/src/main/res/'
-    doLast {
-        delete 'build/translations'
-        delete 'build/translations.zip'
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
 tasks {
     wrapper {
-        gradleVersion = "7.4.2"
-        distributionSha256Sum = "29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda"
+        gradleVersion = "7.5"
+        distributionSha256Sum = "cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index b91f5409..3efc9b38 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,9 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
 # Turn off AP discovery in compile path to enable compile avoidance
 kapt.include.compile.classpath=false
 
-# Enable AndroidX
-android.useAndroidX=true
-
 # Enable non-transitive R class namespacing where each library only contains
 # references to the resources it declares instead of declarations plus all
 # transitive dependency references.
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a..249e5832 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c51a4ac..012d6d90 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=cb87f222c5585bd46838ad4db78463a5c5f3d336e5e2b98dc7c0c586527351c2
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 9430d416..e61ef5a0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
-    def agpVersion = "7.2.1"
-    def kotlinVersion = "1.6.21"
+    def agpVersion = "7.2.2"
+    def kotlinVersion = "1.7.10"
     repositories {
         gradlePluginPortal()
         google()
diff --git a/ui/build.gradle b/ui/build.gradle
index 2bbbe539..b48f0121 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -90,6 +90,5 @@ tasks.withType(JavaCompile) {
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8
-        useIR = true
     }
 }
diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index efdd448b..b4f88308 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -223,7 +223,6 @@
                         style="@style/DetailText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
                         android:contentDescription="@string/listen_port"
                         android:nextFocusRight="@id/mtu_text"
                         android:nextFocusUp="@id/dns_search_domains_text"
@@ -232,7 +231,6 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.listenPort}"
                         android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/http_proxy_label"
                         app:layout_constraintEnd_toStartOf="@id/mtu_label"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toStartOf="parent"
@@ -258,7 +256,6 @@
                         style="@style/DetailText"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
                         android:contentDescription="@string/mtu"
                         android:nextFocusLeft="@id/listen_port_text"
                         android:nextFocusUp="@id/dns_servers_text"
@@ -266,7 +263,6 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.mtu}"
                         android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/http_proxy_label"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toEndOf="@id/listen_port_label"
@@ -274,6 +270,13 @@
                         app:layout_constraintTop_toBottomOf="@+id/mtu_label"
                         tools:text="1500" />
 
+                    <androidx.constraintlayout.widget.Barrier
+                        android:id="@+id/listen_port_mtu_barrier"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:barrierDirection="bottom"
+                        app:constraint_referenced_ids="listen_port_text,mtu_text" />
+
                     <TextView
                         android:id="@+id/http_proxy_label"
                         android:layout_width="0dp"
@@ -309,7 +312,7 @@
                         android:labelFor="@+id/applications_text"
                         android:text="@string/applications"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/applications_text"
+                        app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier"
                         app:layout_constraintStart_toStartOf="parent" />
 
                     <TextView
@@ -324,7 +327,7 @@
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/applications_label"
                         app:layout_constraintStart_toStartOf="parent"
                         tools:text="8 excluded" />
                 </androidx.constraintlayout.widget.ConstraintLayout>