Replace all crossport uses with upstream design support library components. Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>master
@@ -33,7 +33,6 @@ ext { | |||||
databindingVersion = '3.1.2' | databindingVersion = '3.1.2' | ||||
supportLibsVersion = '27.1.1' | supportLibsVersion = '27.1.1' | ||||
daggerVersion = '2.14.1' | daggerVersion = '2.14.1' | ||||
crossportVersion = '0.2.1' | |||||
fabLibVersion = '1.10.1' | fabLibVersion = '1.10.1' | ||||
streamsupportVersion = '1.6.0' | streamsupportVersion = '1.6.0' | ||||
} | } | ||||
@@ -44,15 +43,9 @@ dependencies { | |||||
implementation "com.android.databinding:library:$databindingVersion" | implementation "com.android.databinding:library:$databindingVersion" | ||||
implementation "com.android.support:support-annotations:$supportLibsVersion" | implementation "com.android.support:support-annotations:$supportLibsVersion" | ||||
implementation "com.android.support:appcompat-v7:$supportLibsVersion" | implementation "com.android.support:appcompat-v7:$supportLibsVersion" | ||||
implementation "com.android.support:design:$supportLibsVersion" | |||||
implementation "com.android.support:preference-v7:$supportLibsVersion" | implementation "com.android.support:preference-v7:$supportLibsVersion" | ||||
implementation "com.commonsware.cwac:crossport:$crossportVersion" | |||||
implementation "com.getbase:floatingactionbutton:$fabLibVersion" | implementation "com.getbase:floatingactionbutton:$fabLibVersion" | ||||
implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion" | implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion" | ||||
implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion" | implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion" | ||||
} | } | ||||
repositories { | |||||
maven { | |||||
url "https://s3.amazonaws.com/repo.commonsware.com" | |||||
} | |||||
} |
@@ -3,10 +3,10 @@ package com.wireguard.android.fragment; | |||||
import android.content.Context; | import android.content.Context; | ||||
import android.databinding.DataBindingUtil; | import android.databinding.DataBindingUtil; | ||||
import android.databinding.ViewDataBinding; | import android.databinding.ViewDataBinding; | ||||
import android.support.design.widget.Snackbar; | |||||
import android.util.Log; | import android.util.Log; | ||||
import android.view.View; | import android.view.View; | ||||
import com.commonsware.cwac.crossport.design.widget.Snackbar; | |||||
import com.wireguard.android.R; | import com.wireguard.android.R; | ||||
import com.wireguard.android.databinding.TunnelDetailFragmentBinding; | import com.wireguard.android.databinding.TunnelDetailFragmentBinding; | ||||
import com.wireguard.android.databinding.TunnelListItemBinding; | import com.wireguard.android.databinding.TunnelListItemBinding; | ||||
@@ -6,6 +6,8 @@ import android.os.Bundle; | |||||
import android.os.Parcel; | import android.os.Parcel; | ||||
import android.os.Parcelable; | import android.os.Parcelable; | ||||
import android.support.annotation.NonNull; | import android.support.annotation.NonNull; | ||||
import android.support.design.widget.CoordinatorLayout; | |||||
import android.support.design.widget.Snackbar; | |||||
import android.util.Log; | import android.util.Log; | ||||
import android.view.LayoutInflater; | import android.view.LayoutInflater; | ||||
import android.view.Menu; | import android.view.Menu; | ||||
@@ -15,8 +17,6 @@ import android.view.View; | |||||
import android.view.ViewGroup; | import android.view.ViewGroup; | ||||
import android.view.inputmethod.InputMethodManager; | 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.Application; | ||||
import com.wireguard.android.R; | import com.wireguard.android.R; | ||||
import com.wireguard.android.databinding.TunnelEditorFragmentBinding; | import com.wireguard.android.databinding.TunnelEditorFragmentBinding; | ||||
@@ -10,6 +10,8 @@ import android.net.Uri; | |||||
import android.os.Bundle; | import android.os.Bundle; | ||||
import android.provider.OpenableColumns; | import android.provider.OpenableColumns; | ||||
import android.support.annotation.NonNull; | import android.support.annotation.NonNull; | ||||
import android.support.design.widget.CoordinatorLayout; | |||||
import android.support.design.widget.Snackbar; | |||||
import android.util.Log; | import android.util.Log; | ||||
import android.util.SparseBooleanArray; | import android.util.SparseBooleanArray; | ||||
import android.view.ActionMode; | import android.view.ActionMode; | ||||
@@ -27,8 +29,6 @@ import android.widget.AdapterView.OnItemClickListener; | |||||
import android.widget.AdapterView.OnItemLongClickListener; | import android.widget.AdapterView.OnItemLongClickListener; | ||||
import android.widget.TextView; | 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; | ||||
import com.wireguard.android.Application.ApplicationComponent; | import com.wireguard.android.Application.ApplicationComponent; | ||||
import com.wireguard.android.R; | import com.wireguard.android.R; | ||||
@@ -4,11 +4,11 @@ import android.Manifest; | |||||
import android.content.Context; | import android.content.Context; | ||||
import android.content.pm.PackageManager; | import android.content.pm.PackageManager; | ||||
import android.os.Environment; | import android.os.Environment; | ||||
import android.support.design.widget.Snackbar; | |||||
import android.support.v7.preference.Preference; | import android.support.v7.preference.Preference; | ||||
import android.util.AttributeSet; | import android.util.AttributeSet; | ||||
import android.util.Log; | import android.util.Log; | ||||
import com.commonsware.cwac.crossport.design.widget.Snackbar; | |||||
import com.wireguard.android.Application; | import com.wireguard.android.Application; | ||||
import com.wireguard.android.Application.ApplicationComponent; | import com.wireguard.android.Application.ApplicationComponent; | ||||
import com.wireguard.android.R; | import com.wireguard.android.R; | ||||
@@ -3,11 +3,10 @@ package com.wireguard.android.util; | |||||
import android.content.ClipData; | import android.content.ClipData; | ||||
import android.content.ClipboardManager; | import android.content.ClipboardManager; | ||||
import android.content.Context; | import android.content.Context; | ||||
import android.support.design.widget.Snackbar; | |||||
import android.view.View; | import android.view.View; | ||||
import android.widget.TextView; | import android.widget.TextView; | ||||
import com.commonsware.cwac.crossport.design.widget.Snackbar; | |||||
/** | /** | ||||
* Standalone utilities for interacting with the system clipboard. | * Standalone utilities for interacting with the system clipboard. | ||||
*/ | */ | ||||
@@ -18,7 +18,7 @@ | |||||
type="com.wireguard.config.Config.Observable" /> | type="com.wireguard.config.Config.Observable" /> | ||||
</data> | </data> | ||||
<com.commonsware.cwac.crossport.design.widget.CoordinatorLayout | |||||
<android.support.design.widget.CoordinatorLayout | |||||
android:id="@+id/main_container" | android:id="@+id/main_container" | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | android:layout_height="match_parent" | ||||
@@ -226,5 +226,5 @@ | |||||
android:text="@string/add_peer" /> | android:text="@string/add_peer" /> | ||||
</LinearLayout> | </LinearLayout> | ||||
</ScrollView> | </ScrollView> | ||||
</com.commonsware.cwac.crossport.design.widget.CoordinatorLayout> | |||||
</android.support.design.widget.CoordinatorLayout> | |||||
</layout> | </layout> |
@@ -15,7 +15,7 @@ | |||||
type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" /> | type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" /> | ||||
</data> | </data> | ||||
<com.commonsware.cwac.crossport.design.widget.CoordinatorLayout | |||||
<android.support.design.widget.CoordinatorLayout | |||||
android:id="@+id/main_container" | android:id="@+id/main_container" | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | android:layout_height="match_parent" | ||||
@@ -57,5 +57,5 @@ | |||||
app:fab_size="mini" | app:fab_size="mini" | ||||
app:fab_title="@string/create_from_file" /> | app:fab_title="@string/create_from_file" /> | ||||
</com.getbase.floatingactionbutton.FloatingActionsMenu> | </com.getbase.floatingactionbutton.FloatingActionsMenu> | ||||
</com.commonsware.cwac.crossport.design.widget.CoordinatorLayout> | |||||
</android.support.design.widget.CoordinatorLayout> | |||||
</layout> | </layout> |