From b7196e328a25a28078906d8afa50ba9636ae7bcb Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Tue, 26 Dec 2017 14:12:37 -0600 Subject: [PATCH] Rename package bindings -> databinding Signed-off-by: Samuel Holland --- .../main/java/com/wireguard/android/ConfigListFragment.java | 2 +- .../main/java/com/wireguard/android/backends/VpnService.java | 4 ++-- .../android/{bindings => databinding}/BindingAdapters.java | 2 +- .../android/{bindings => databinding}/ItemChangeListener.java | 2 +- .../{bindings => databinding}/ObservableListAdapter.java | 2 +- .../{bindings => databinding}/ObservableMapAdapter.java | 2 +- .../{bindings => databinding}/ObservableSortedMap.java | 2 +- .../android/{bindings => databinding}/ObservableTreeMap.java | 2 +- app/src/main/res/layout/config_list_fragment.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) rename app/src/main/java/com/wireguard/android/{bindings => databinding}/BindingAdapters.java (99%) rename app/src/main/java/com/wireguard/android/{bindings => databinding}/ItemChangeListener.java (99%) rename app/src/main/java/com/wireguard/android/{bindings => databinding}/ObservableListAdapter.java (98%) rename app/src/main/java/com/wireguard/android/{bindings => databinding}/ObservableMapAdapter.java (98%) rename app/src/main/java/com/wireguard/android/{bindings => databinding}/ObservableSortedMap.java (85%) rename app/src/main/java/com/wireguard/android/{bindings => databinding}/ObservableTreeMap.java (97%) diff --git a/app/src/main/java/com/wireguard/android/ConfigListFragment.java b/app/src/main/java/com/wireguard/android/ConfigListFragment.java index a8c8bcd..b746013 100644 --- a/app/src/main/java/com/wireguard/android/ConfigListFragment.java +++ b/app/src/main/java/com/wireguard/android/ConfigListFragment.java @@ -16,7 +16,7 @@ import android.widget.AbsListView; import android.widget.AdapterView; import com.wireguard.android.backends.VpnService; -import com.wireguard.android.bindings.ObservableMapAdapter; +import com.wireguard.android.databinding.ObservableMapAdapter; import com.wireguard.android.databinding.ConfigListFragmentBinding; import com.wireguard.config.Config; diff --git a/app/src/main/java/com/wireguard/android/backends/VpnService.java b/app/src/main/java/com/wireguard/android/backends/VpnService.java index 1659672..5002a83 100644 --- a/app/src/main/java/com/wireguard/android/backends/VpnService.java +++ b/app/src/main/java/com/wireguard/android/backends/VpnService.java @@ -21,8 +21,8 @@ import android.widget.Toast; import com.wireguard.android.NotSupportedActivity; import com.wireguard.android.QuickTileService; import com.wireguard.android.R; -import com.wireguard.android.bindings.ObservableSortedMap; -import com.wireguard.android.bindings.ObservableTreeMap; +import com.wireguard.android.databinding.ObservableSortedMap; +import com.wireguard.android.databinding.ObservableTreeMap; import com.wireguard.config.Config; import com.wireguard.config.Peer; diff --git a/app/src/main/java/com/wireguard/android/bindings/BindingAdapters.java b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java similarity index 99% rename from app/src/main/java/com/wireguard/android/bindings/BindingAdapters.java rename to app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java index fffe191..3e7a927 100644 --- a/app/src/main/java/com/wireguard/android/bindings/BindingAdapters.java +++ b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java @@ -1,4 +1,4 @@ -package com.wireguard.android.bindings; +package com.wireguard.android.databinding; import android.databinding.BindingAdapter; import android.databinding.ObservableList; diff --git a/app/src/main/java/com/wireguard/android/bindings/ItemChangeListener.java b/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java similarity index 99% rename from app/src/main/java/com/wireguard/android/bindings/ItemChangeListener.java rename to app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java index 1ee37a8..6d8debf 100644 --- a/app/src/main/java/com/wireguard/android/bindings/ItemChangeListener.java +++ b/app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java @@ -1,4 +1,4 @@ -package com.wireguard.android.bindings; +package com.wireguard.android.databinding; import android.databinding.DataBindingUtil; import android.databinding.ObservableList; diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableListAdapter.java b/app/src/main/java/com/wireguard/android/databinding/ObservableListAdapter.java similarity index 98% rename from app/src/main/java/com/wireguard/android/bindings/ObservableListAdapter.java rename to app/src/main/java/com/wireguard/android/databinding/ObservableListAdapter.java index 7938a2a..5727900 100644 --- a/app/src/main/java/com/wireguard/android/bindings/ObservableListAdapter.java +++ b/app/src/main/java/com/wireguard/android/databinding/ObservableListAdapter.java @@ -1,4 +1,4 @@ -package com.wireguard.android.bindings; +package com.wireguard.android.databinding; import android.content.Context; import android.databinding.DataBindingUtil; diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableMapAdapter.java b/app/src/main/java/com/wireguard/android/databinding/ObservableMapAdapter.java similarity index 98% rename from app/src/main/java/com/wireguard/android/bindings/ObservableMapAdapter.java rename to app/src/main/java/com/wireguard/android/databinding/ObservableMapAdapter.java index 8e474e4..7018072 100644 --- a/app/src/main/java/com/wireguard/android/bindings/ObservableMapAdapter.java +++ b/app/src/main/java/com/wireguard/android/databinding/ObservableMapAdapter.java @@ -1,4 +1,4 @@ -package com.wireguard.android.bindings; +package com.wireguard.android.databinding; import android.content.Context; import android.databinding.DataBindingUtil; diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableSortedMap.java b/app/src/main/java/com/wireguard/android/databinding/ObservableSortedMap.java similarity index 85% rename from app/src/main/java/com/wireguard/android/bindings/ObservableSortedMap.java rename to app/src/main/java/com/wireguard/android/databinding/ObservableSortedMap.java index 3317c6a..1cbfeb6 100644 --- a/app/src/main/java/com/wireguard/android/bindings/ObservableSortedMap.java +++ b/app/src/main/java/com/wireguard/android/databinding/ObservableSortedMap.java @@ -1,4 +1,4 @@ -package com.wireguard.android.bindings; +package com.wireguard.android.databinding; import android.databinding.ObservableMap; diff --git a/app/src/main/java/com/wireguard/android/bindings/ObservableTreeMap.java b/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java similarity index 97% rename from app/src/main/java/com/wireguard/android/bindings/ObservableTreeMap.java rename to app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java index 34fcab6..dc5f705 100644 --- a/app/src/main/java/com/wireguard/android/bindings/ObservableTreeMap.java +++ b/app/src/main/java/com/wireguard/android/databinding/ObservableTreeMap.java @@ -1,4 +1,4 @@ -package com.wireguard.android.bindings; +package com.wireguard.android.databinding; import android.databinding.MapChangeRegistry; import android.databinding.ObservableMap; diff --git a/app/src/main/res/layout/config_list_fragment.xml b/app/src/main/res/layout/config_list_fragment.xml index d4c5903..627ecb8 100644 --- a/app/src/main/res/layout/config_list_fragment.xml +++ b/app/src/main/res/layout/config_list_fragment.xml @@ -7,7 +7,7 @@ + type="com.wireguard.android.databinding.ObservableSortedMap<String, com.wireguard.config.Config>" />