From 7e415a62c7594e53b3658a54786df5d6173a843f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 29 Apr 2018 10:41:08 +0530 Subject: [PATCH] wg: Break out crossport dependency Replace all crossport uses with upstream design support library components. Signed-off-by: Harsh Shandilya --- app/build.gradle | 9 +-------- .../com/wireguard/android/fragment/TunnelController.java | 2 +- .../wireguard/android/fragment/TunnelEditorFragment.java | 4 ++-- .../wireguard/android/fragment/TunnelListFragment.java | 4 ++-- .../android/preference/ZipExporterPreference.java | 2 +- .../java/com/wireguard/android/util/ClipboardUtils.java | 3 +-- app/src/main/res/layout/tunnel_editor_fragment.xml | 4 ++-- app/src/main/res/layout/tunnel_list_fragment.xml | 4 ++-- 8 files changed, 12 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 65bb0468..8a157f06 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,7 +33,6 @@ ext { databindingVersion = '3.1.2' supportLibsVersion = '27.1.1' daggerVersion = '2.14.1' - crossportVersion = '0.2.1' fabLibVersion = '1.10.1' streamsupportVersion = '1.6.0' } @@ -44,15 +43,9 @@ dependencies { implementation "com.android.databinding:library:$databindingVersion" implementation "com.android.support:support-annotations:$supportLibsVersion" implementation "com.android.support:appcompat-v7:$supportLibsVersion" + implementation "com.android.support:design:$supportLibsVersion" implementation "com.android.support:preference-v7:$supportLibsVersion" - implementation "com.commonsware.cwac:crossport:$crossportVersion" implementation "com.getbase:floatingactionbutton:$fabLibVersion" implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion" implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion" } - -repositories { - maven { - url "https://s3.amazonaws.com/repo.commonsware.com" - } -} diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java index 990509e0..a5b147e7 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelController.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelController.java @@ -3,10 +3,10 @@ package com.wireguard.android.fragment; import android.content.Context; import android.databinding.DataBindingUtil; import android.databinding.ViewDataBinding; +import android.support.design.widget.Snackbar; import android.util.Log; import android.view.View; -import com.commonsware.cwac.crossport.design.widget.Snackbar; import com.wireguard.android.R; import com.wireguard.android.databinding.TunnelDetailFragmentBinding; import com.wireguard.android.databinding.TunnelListItemBinding; diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java index e4555512..b7467b14 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java @@ -6,6 +6,8 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; +import android.support.design.widget.CoordinatorLayout; +import android.support.design.widget.Snackbar; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -15,8 +17,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import com.commonsware.cwac.crossport.design.widget.CoordinatorLayout; -import com.commonsware.cwac.crossport.design.widget.Snackbar; import com.wireguard.android.Application; import com.wireguard.android.R; import com.wireguard.android.databinding.TunnelEditorFragmentBinding; diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java index 05eaccf1..128ee89b 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java @@ -10,6 +10,8 @@ import android.net.Uri; import android.os.Bundle; import android.provider.OpenableColumns; import android.support.annotation.NonNull; +import android.support.design.widget.CoordinatorLayout; +import android.support.design.widget.Snackbar; import android.util.Log; import android.util.SparseBooleanArray; import android.view.ActionMode; @@ -27,8 +29,6 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemLongClickListener; import android.widget.TextView; -import com.commonsware.cwac.crossport.design.widget.CoordinatorLayout; -import com.commonsware.cwac.crossport.design.widget.Snackbar; import com.wireguard.android.Application; import com.wireguard.android.Application.ApplicationComponent; import com.wireguard.android.R; diff --git a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java index c6d7187a..3fd8f7db 100644 --- a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java @@ -4,11 +4,11 @@ import android.Manifest; import android.content.Context; import android.content.pm.PackageManager; import android.os.Environment; +import android.support.design.widget.Snackbar; import android.support.v7.preference.Preference; import android.util.AttributeSet; import android.util.Log; -import com.commonsware.cwac.crossport.design.widget.Snackbar; import com.wireguard.android.Application; import com.wireguard.android.Application.ApplicationComponent; import com.wireguard.android.R; diff --git a/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java b/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java index ea0001e4..5cc32c5c 100644 --- a/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java +++ b/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java @@ -3,11 +3,10 @@ package com.wireguard.android.util; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; +import android.support.design.widget.Snackbar; import android.view.View; import android.widget.TextView; -import com.commonsware.cwac.crossport.design.widget.Snackbar; - /** * Standalone utilities for interacting with the system clipboard. */ diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml index 4d56ee3e..964aff5c 100644 --- a/app/src/main/res/layout/tunnel_editor_fragment.xml +++ b/app/src/main/res/layout/tunnel_editor_fragment.xml @@ -18,7 +18,7 @@ type="com.wireguard.config.Config.Observable" /> - - + diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml index ba3728a3..5d6a5ce9 100644 --- a/app/src/main/res/layout/tunnel_list_fragment.xml +++ b/app/src/main/res/layout/tunnel_list_fragment.xml @@ -15,7 +15,7 @@ type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" /> - - +