diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java index aa5237dc2..99caf6076 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java @@ -34,7 +34,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ViewAnimator; -import com.pchmn.materialchips.ChipsInput.SimpleChipsListener; +import org.sufficientlysecure.materialchips.ChipsInput.SimpleChipsListener; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.daos.KeyRepository; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java index 1ed4fb178..929200dad 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java @@ -7,12 +7,12 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; -import com.pchmn.materialchips.ChipView; -import com.pchmn.materialchips.ChipsInput; -import com.pchmn.materialchips.adapter.ChipsAdapter; -import com.pchmn.materialchips.simple.SimpleChip; -import com.pchmn.materialchips.util.ViewUtil; -import com.pchmn.materialchips.views.DetailedChipView; +import org.sufficientlysecure.materialchips.ChipView; +import org.sufficientlysecure.materialchips.ChipsInput; +import org.sufficientlysecure.materialchips.adapter.ChipsAdapter; +import org.sufficientlysecure.materialchips.simple.SimpleChip; +import org.sufficientlysecure.materialchips.util.ViewUtil; +import org.sufficientlysecure.materialchips.views.DetailedChipView; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.model.SubKey; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java index 9ee636e2a..475366a33 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java @@ -8,8 +8,8 @@ import java.util.List; import android.content.Context; import android.util.AttributeSet; -import com.pchmn.materialchips.ChipsInput; -import com.pchmn.materialchips.adapter.FilterableAdapter.FilterableItem; +import org.sufficientlysecure.materialchips.ChipsInput; +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter.FilterableItem; import org.sufficientlysecure.keychain.model.SubKey.UnifiedKeyInfo; import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput.EncryptRecipientChip; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java index 9d8609dca..069019c80 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java @@ -12,7 +12,7 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.pchmn.materialchips.ChipsInput; +import org.sufficientlysecure.materialchips.ChipsInput; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput.EncryptRecipientChip; import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientDropdownAdapter.ItemViewHolder; diff --git a/extern/MaterialChipsInput/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java b/extern/MaterialChipsInput/src/androidTest/java/org/sufficientlysecure/materialchips/ExampleInstrumentedTest.java similarity index 82% rename from extern/MaterialChipsInput/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java rename to extern/MaterialChipsInput/src/androidTest/java/org/sufficientlysecure/materialchips/ExampleInstrumentedTest.java index a28c3f326..005243292 100644 --- a/extern/MaterialChipsInput/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java +++ b/extern/MaterialChipsInput/src/androidTest/java/org/sufficientlysecure/materialchips/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips; +package org.sufficientlysecure.materialchips; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.pchmn.library.test", appContext.getPackageName()); + assertEquals("org.sufficientlysecure.library.test", appContext.getPackageName()); } } diff --git a/extern/MaterialChipsInput/src/main/AndroidManifest.xml b/extern/MaterialChipsInput/src/main/AndroidManifest.xml index ce7e64f72..1bcab1dfc 100644 --- a/extern/MaterialChipsInput/src/main/AndroidManifest.xml +++ b/extern/MaterialChipsInput/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="org.sufficientlysecure.materialchips"> diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/model/ChipInterface.java b/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/model/ChipInterface.java deleted file mode 100644 index 928e07085..000000000 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/model/ChipInterface.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.pchmn.materialchips.model; - - -import com.pchmn.materialchips.adapter.FilterableAdapter.FilterableItem; - - -public interface ChipInterface extends FilterableItem { - String getLabel(); - String getInfo(); -} diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipView.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipView.java similarity index 97% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipView.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipView.java index 7b57353e2..f20c523c9 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipView.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipView.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips; +package org.sufficientlysecure.materialchips; import android.content.Context; @@ -15,9 +15,9 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.pchmn.materialchips.model.ChipInterface; -import com.pchmn.materialchips.util.LetterTileProvider; -import com.pchmn.materialchips.util.ViewUtil; +import org.sufficientlysecure.materialchips.model.ChipInterface; +import org.sufficientlysecure.materialchips.util.LetterTileProvider; +import org.sufficientlysecure.materialchips.util.ViewUtil; public class ChipView extends RelativeLayout { diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipsInput.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipsInput.java similarity index 93% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipsInput.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipsInput.java index 0abff6721..bc0c83e13 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipsInput.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipsInput.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips; +package org.sufficientlysecure.materialchips; import java.util.ArrayList; @@ -23,16 +23,16 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.beloo.widget.chipslayoutmanager.ChipsLayoutManager; -import com.pchmn.materialchips.RecyclerItemClickListener.OnItemClickListener; -import com.pchmn.materialchips.adapter.ChipsAdapter; -import com.pchmn.materialchips.adapter.FilterableAdapter; -import com.pchmn.materialchips.adapter.FilterableAdapter.FilterableItem; -import com.pchmn.materialchips.util.ActivityUtil; -import com.pchmn.materialchips.util.ClickOutsideCallback; -import com.pchmn.materialchips.util.ViewUtil; -import com.pchmn.materialchips.views.ChipsInputEditText; -import com.pchmn.materialchips.views.DropdownListView; -import com.pchmn.materialchips.views.ScrollViewMaxHeight; +import org.sufficientlysecure.materialchips.RecyclerItemClickListener.OnItemClickListener; +import org.sufficientlysecure.materialchips.adapter.ChipsAdapter; +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter; +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter.FilterableItem; +import org.sufficientlysecure.materialchips.util.ActivityUtil; +import org.sufficientlysecure.materialchips.util.ClickOutsideCallback; +import org.sufficientlysecure.materialchips.util.ViewUtil; +import org.sufficientlysecure.materialchips.views.ChipsInputEditText; +import org.sufficientlysecure.materialchips.views.DropdownListView; +import org.sufficientlysecure.materialchips.views.ScrollViewMaxHeight; public abstract class ChipsInput extends ScrollViewMaxHeight { private Context mContext; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/RecyclerItemClickListener.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/RecyclerItemClickListener.java similarity index 97% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/RecyclerItemClickListener.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/RecyclerItemClickListener.java index 2854f9ebf..0e5f13b0a 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/RecyclerItemClickListener.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/RecyclerItemClickListener.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips; +package org.sufficientlysecure.materialchips; import android.content.Context; import android.support.v7.widget.RecyclerView; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/ChipsAdapter.java similarity index 95% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/ChipsAdapter.java index 38b717403..095fdcb85 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/ChipsAdapter.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.adapter; +package org.sufficientlysecure.materialchips.adapter; import java.util.ArrayList; @@ -15,12 +15,12 @@ import android.view.ViewTreeObserver; import android.widget.EditText; import android.widget.RelativeLayout; -import com.pchmn.materialchips.ChipView; -import com.pchmn.materialchips.ChipsInput; -import com.pchmn.materialchips.adapter.FilterableAdapter.FilterableItem; -import com.pchmn.materialchips.util.ViewUtil; -import com.pchmn.materialchips.views.ChipsInputEditText; -import com.pchmn.materialchips.views.DetailedChipView; +import org.sufficientlysecure.materialchips.ChipView; +import org.sufficientlysecure.materialchips.ChipsInput; +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter.FilterableItem; +import org.sufficientlysecure.materialchips.util.ViewUtil; +import org.sufficientlysecure.materialchips.views.ChipsInputEditText; +import org.sufficientlysecure.materialchips.views.DetailedChipView; public abstract class ChipsAdapter diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/FilterableAdapter.java similarity index 95% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/FilterableAdapter.java index 0d420e35e..2731768ad 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/FilterableAdapter.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.adapter; +package org.sufficientlysecure.materialchips.adapter; import java.util.ArrayList; @@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView; import android.widget.Filter; import android.widget.Filterable; -import com.pchmn.materialchips.adapter.FilterableAdapter.FilterableItem; +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter.FilterableItem; public abstract class FilterableAdapter extends RecyclerView.Adapter implements Filterable { diff --git a/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/model/ChipInterface.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/model/ChipInterface.java new file mode 100644 index 000000000..7c0ac7d91 --- /dev/null +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/model/ChipInterface.java @@ -0,0 +1,10 @@ +package org.sufficientlysecure.materialchips.model; + + +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter.FilterableItem; + + +public interface ChipInterface extends FilterableItem { + String getLabel(); + String getInfo(); +} diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChip.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChip.java similarity index 90% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChip.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChip.java index 608460d52..eb4d3e5c9 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChip.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChip.java @@ -1,10 +1,10 @@ -package com.pchmn.materialchips.simple; +package org.sufficientlysecure.materialchips.simple; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.pchmn.materialchips.model.ChipInterface; +import org.sufficientlysecure.materialchips.model.ChipInterface; public class SimpleChip implements ChipInterface { diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipDropdownAdapter.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipDropdownAdapter.java similarity index 76% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipDropdownAdapter.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipDropdownAdapter.java index 7601d4fe2..4595a1b97 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipDropdownAdapter.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipDropdownAdapter.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.simple; +package org.sufficientlysecure.materialchips.simple; import java.util.List; @@ -11,9 +11,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.pchmn.materialchips.ChipsInput.ChipDropdownAdapter; -import com.pchmn.materialchips.R; -import com.pchmn.materialchips.simple.SimpleChipDropdownAdapter.ItemViewHolder; +import org.sufficientlysecure.materialchips.ChipsInput.ChipDropdownAdapter; +import org.sufficientlysecure.materialchips.R; +import org.sufficientlysecure.materialchips.simple.SimpleChipDropdownAdapter.ItemViewHolder; public class SimpleChipDropdownAdapter extends ChipDropdownAdapter { @@ -31,8 +31,8 @@ public class SimpleChipDropdownAdapter extends ChipDropdownAdapter { diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipsInput.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipsInput.java similarity index 87% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipsInput.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipsInput.java index 735636ee5..46f997b2b 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipsInput.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipsInput.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.simple; +package org.sufficientlysecure.materialchips.simple; import java.util.List; @@ -6,7 +6,7 @@ import java.util.List; import android.content.Context; import android.util.AttributeSet; -import com.pchmn.materialchips.ChipsInput; +import org.sufficientlysecure.materialchips.ChipsInput; public class SimpleChipsInput extends ChipsInput { diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ActivityUtil.java similarity index 90% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ActivityUtil.java index c119fad07..6eacc3243 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ActivityUtil.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.util; +package org.sufficientlysecure.materialchips.util; import android.app.Activity; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ClickOutsideCallback.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ClickOutsideCallback.java similarity index 90% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ClickOutsideCallback.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ClickOutsideCallback.java index 367e57d57..e66f60433 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ClickOutsideCallback.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ClickOutsideCallback.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.util; +package org.sufficientlysecure.materialchips.util; import android.app.Activity; import android.content.Context; @@ -8,8 +8,8 @@ import android.view.View; import android.view.Window; import android.view.inputmethod.InputMethodManager; -import com.pchmn.materialchips.views.ChipsInputEditText; -import com.pchmn.materialchips.views.DetailedChipView; +import org.sufficientlysecure.materialchips.views.ChipsInputEditText; +import org.sufficientlysecure.materialchips.views.DetailedChipView; public class ClickOutsideCallback extends DelegateWindowCallback { private Activity activity; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ColorUtil.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ColorUtil.java similarity index 92% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ColorUtil.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ColorUtil.java index c1b118c1c..4ced65b84 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ColorUtil.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ColorUtil.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.util; +package org.sufficientlysecure.materialchips.util; import android.content.Context; @@ -6,7 +6,7 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.util.TypedValue; -import com.pchmn.materialchips.R; +import org.sufficientlysecure.materialchips.R; public class ColorUtil { diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/DelegateWindowCallback.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/DelegateWindowCallback.java similarity index 98% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/DelegateWindowCallback.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/DelegateWindowCallback.java index 3dad594c3..1f553143c 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/DelegateWindowCallback.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/DelegateWindowCallback.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.util; +package org.sufficientlysecure.materialchips.util; import android.os.Build; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/LetterTileProvider.java similarity index 98% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/LetterTileProvider.java index 9028a5286..48e64c848 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/LetterTileProvider.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.util; +package org.sufficientlysecure.materialchips.util; import android.content.Context; import android.content.res.Resources; @@ -18,7 +18,7 @@ import android.support.v4.content.ContextCompat; import android.text.TextPaint; import android.util.Log; -import com.pchmn.materialchips.R; +import org.sufficientlysecure.materialchips.R; /** * Used to create a {@link Bitmap} that contains a letter used in the English diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ViewUtil.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ViewUtil.java similarity index 98% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ViewUtil.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ViewUtil.java index 1cae87da7..dbde7fdf7 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ViewUtil.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ViewUtil.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.util; +package org.sufficientlysecure.materialchips.util; import android.content.Context; import android.content.res.Configuration; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ChipsInputEditText.java similarity index 93% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ChipsInputEditText.java index 9c2b108c5..07b910490 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ChipsInputEditText.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.views; +package org.sufficientlysecure.materialchips.views; import android.content.Context; diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DetailedChipView.java similarity index 94% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DetailedChipView.java index b5a7f6eb3..cd140e11a 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DetailedChipView.java @@ -1,25 +1,22 @@ -package com.pchmn.materialchips.views; +package org.sufficientlysecure.materialchips.views; + import android.content.Context; import android.content.res.ColorStateList; -import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; -import android.net.Uri; import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.View; import android.view.animation.AlphaAnimation; import android.widget.ImageButton; import android.widget.LinearLayout; -import android.widget.LinearLayout; import android.widget.TextView; -import com.pchmn.materialchips.R; -import com.pchmn.materialchips.model.ChipInterface; -import com.pchmn.materialchips.util.ColorUtil; -import com.pchmn.materialchips.util.LetterTileProvider; +import org.sufficientlysecure.materialchips.R; +import org.sufficientlysecure.materialchips.model.ChipInterface; +import org.sufficientlysecure.materialchips.util.ColorUtil; +import org.sufficientlysecure.materialchips.util.LetterTileProvider; public class DetailedChipView extends LinearLayout { @@ -132,7 +129,7 @@ public class DetailedChipView extends LinearLayout { } public int getBackgroundColor() { - return mBackgroundColor == null ? ContextCompat.getColor(mContext, R.color.colorAccent) : mBackgroundColor.getDefaultColor(); + return mBackgroundColor == null ? ContextCompat.getColor(mContext, R.color.chips_opened_bg) : mBackgroundColor.getDefaultColor(); } public void setDeleteIconColor(ColorStateList color) { diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DropdownListView.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DropdownListView.java similarity index 93% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DropdownListView.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DropdownListView.java index d44019dac..c36c061fd 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DropdownListView.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DropdownListView.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.views; +package org.sufficientlysecure.materialchips.views; import android.annotation.SuppressLint; @@ -13,9 +13,9 @@ import android.view.ViewTreeObserver; import android.view.animation.AlphaAnimation; import android.widget.RelativeLayout; -import com.pchmn.materialchips.R; -import com.pchmn.materialchips.adapter.FilterableAdapter; -import com.pchmn.materialchips.util.ViewUtil; +import org.sufficientlysecure.materialchips.R; +import org.sufficientlysecure.materialchips.adapter.FilterableAdapter; +import org.sufficientlysecure.materialchips.util.ViewUtil; @SuppressLint("ViewConstructor") // this is a dropdown view, it doesn't come up in preview diff --git a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ScrollViewMaxHeight.java similarity index 89% rename from extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java rename to extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ScrollViewMaxHeight.java index db212ff65..92fbfb131 100644 --- a/extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java +++ b/extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ScrollViewMaxHeight.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips.views; +package org.sufficientlysecure.materialchips.views; import android.content.Context; @@ -6,8 +6,8 @@ import android.content.res.TypedArray; import android.support.v4.widget.NestedScrollView; import android.util.AttributeSet; -import com.pchmn.materialchips.R; -import com.pchmn.materialchips.util.ViewUtil; +import org.sufficientlysecure.materialchips.R; +import org.sufficientlysecure.materialchips.util.ViewUtil; public class ScrollViewMaxHeight extends NestedScrollView { diff --git a/extern/MaterialChipsInput/src/main/res/layout/chips_input.xml b/extern/MaterialChipsInput/src/main/res/layout/chips_input.xml index f39d6fc70..87f8786c2 100644 --- a/extern/MaterialChipsInput/src/main/res/layout/chips_input.xml +++ b/extern/MaterialChipsInput/src/main/res/layout/chips_input.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/extern/MaterialChipsInput/src/main/res/values/colors.xml b/extern/MaterialChipsInput/src/main/res/values/colors.xml index 9f540beb8..da3e72dcb 100644 --- a/extern/MaterialChipsInput/src/main/res/values/colors.xml +++ b/extern/MaterialChipsInput/src/main/res/values/colors.xml @@ -5,6 +5,5 @@ #009688 #ababab #b9ffffff - ?attr/colorAccent \ No newline at end of file diff --git a/extern/MaterialChipsInput/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java b/extern/MaterialChipsInput/src/test/java/org/sufficientlysecure/materialchips/ExampleUnitTest.java similarity index 88% rename from extern/MaterialChipsInput/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java rename to extern/MaterialChipsInput/src/test/java/org/sufficientlysecure/materialchips/ExampleUnitTest.java index b68d97902..f5a54cacb 100644 --- a/extern/MaterialChipsInput/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java +++ b/extern/MaterialChipsInput/src/test/java/org/sufficientlysecure/materialchips/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.pchmn.materialchips; +package org.sufficientlysecure.materialchips; import org.junit.Test;