Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wg: Break out crossport dependency

Browse Source 
Replace all crossport uses with upstream design
support library components.

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2018-04-29 10:41:08 +05:30
parent 431b75be15
commit 7e415a62c7
8 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/build.gradle
View File

@ -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"
}
}

2
app/src/main/java/com/wireguard/android/fragment/TunnelController.java
View File

@ -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;

4
app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
View File

@ -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;

4
app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
View File

@ -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;

2
app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java
View File

@ -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;

3
app/src/main/java/com/wireguard/android/util/ClipboardUtils.java
View File

@ -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.
*/

4
app/src/main/res/layout/tunnel_editor_fragment.xml
View File

@ -18,7 +18,7 @@
type="com.wireguard.config.Config.Observable" />
</data>
<com.commonsware.cwac.crossport.design.widget.CoordinatorLayout
<android.support.design.widget.CoordinatorLayout
android:id="@+id/main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -226,5 +226,5 @@
android:text="@string/add_peer" />
</LinearLayout>
</ScrollView>
</com.commonsware.cwac.crossport.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>
</layout>

4
app/src/main/res/layout/tunnel_list_fragment.xml
View File

@ -15,7 +15,7 @@
type="com.wireguard.android.util.ObservableKeyedList&lt;String, Tunnel&gt;" />
</data>
<com.commonsware.cwac.crossport.design.widget.CoordinatorLayout
<android.support.design.widget.CoordinatorLayout
android:id="@+id/main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -57,5 +57,5 @@
app:fab_size="mini"
app:fab_title="@string/create_from_file" />
</com.getbase.floatingactionbutton.FloatingActionsMenu>
</com.commonsware.cwac.crossport.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>
</layout>