PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

move MaterialChipsInput to org.sufficientlysecure namespace

Browse source
This commit is contained in:
Vincent Breitmoser 2018-07-04 16:46:34 +02:00
parent a218a10880
commit a975586086
30 changed files with 93 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
View file

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

12
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipAdapter.java
View file

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

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientChipsInput.java
View file

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

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/chips/EncryptRecipientDropdownAdapter.java
View file

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

4
extern/MaterialChipsInput/src/androidTest/java/com/pchmn/materialchips/ExampleInstrumentedTest.java → extern/MaterialChipsInput/src/androidTest/java/org/sufficientlysecure/materialchips/ExampleInstrumentedTest.java vendored
View file

@ -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());
}
}

2
extern/MaterialChipsInput/src/main/AndroidManifest.xml vendored
View file

@ -1,4 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.pchmn.materialchips">
package="org.sufficientlysecure.materialchips">
</manifest>

10
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/model/ChipInterface.java vendored
View file

@ -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();
}

8
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipView.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipView.java vendored
View file

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

22
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/ChipsInput.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/ChipsInput.java vendored
View file

@ -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<T extends FilterableItem> extends ScrollViewMaxHeight {
private Context mContext;

2
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/RecyclerItemClickListener.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/RecyclerItemClickListener.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips;
package org.sufficientlysecure.materialchips;
import android.content.Context;
import android.support.v7.widget.RecyclerView;

14
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/ChipsAdapter.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/ChipsAdapter.java vendored
View file

@ -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<T extends FilterableItem, VH extends RecyclerView.ViewHolder>

4
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/adapter/FilterableAdapter.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/adapter/FilterableAdapter.java vendored
View file

@ -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<T extends FilterableItem, VH extends RecyclerView.ViewHolder>
extends RecyclerView.Adapter<VH> implements Filterable {

10
extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/model/ChipInterface.java vendored Normal file
View file

@ -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();
}

4
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChip.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChip.java vendored
View file

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

12
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipDropdownAdapter.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipDropdownAdapter.java vendored
View file

@ -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<SimpleChip, ItemViewHolder> {
@ -31,8 +31,8 @@ public class SimpleChipDropdownAdapter extends ChipDropdownAdapter<SimpleChip, I
ItemViewHolder(View view) {
super(view);
mLabel = view.findViewById(com.pchmn.materialchips.R.id.label);
mInfo = view.findViewById(com.pchmn.materialchips.R.id.info);
mLabel = view.findViewById(org.sufficientlysecure.materialchips.R.id.label);
mInfo = view.findViewById(org.sufficientlysecure.materialchips.R.id.info);
}
}

14
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipsAdapter.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipsAdapter.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips.simple;
package org.sufficientlysecure.materialchips.simple;
import android.content.Context;
@ -6,12 +6,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.SimpleChipsAdapter.ItemViewHolder;
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.SimpleChipsAdapter.ItemViewHolder;
import org.sufficientlysecure.materialchips.util.ViewUtil;
import org.sufficientlysecure.materialchips.views.DetailedChipView;
public class SimpleChipsAdapter extends ChipsAdapter<SimpleChip, ItemViewHolder> {

4
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/simple/SimpleChipsInput.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/simple/SimpleChipsInput.java vendored
View file

@ -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<SimpleChip> {

2
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ActivityUtil.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ActivityUtil.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips.util;
package org.sufficientlysecure.materialchips.util;
import android.app.Activity;

6
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ClickOutsideCallback.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ClickOutsideCallback.java vendored
View file

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

4
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ColorUtil.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ColorUtil.java vendored
View file

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

2
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/DelegateWindowCallback.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/DelegateWindowCallback.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips.util;
package org.sufficientlysecure.materialchips.util;
import android.os.Build;

4
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/LetterTileProvider.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/LetterTileProvider.java vendored
View file

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

2
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/util/ViewUtil.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/util/ViewUtil.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips.util;
package org.sufficientlysecure.materialchips.util;
import android.content.Context;
import android.content.res.Configuration;

2
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ChipsInputEditText.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ChipsInputEditText.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips.views;
package org.sufficientlysecure.materialchips.views;
import android.content.Context;

17
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DetailedChipView.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DetailedChipView.java vendored
View file

@ -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) {

8
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/DropdownListView.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/DropdownListView.java vendored
View file

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

6
extern/MaterialChipsInput/src/main/java/com/pchmn/materialchips/views/ScrollViewMaxHeight.java → extern/MaterialChipsInput/src/main/java/org/sufficientlysecure/materialchips/views/ScrollViewMaxHeight.java vendored
View file

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

4
extern/MaterialChipsInput/src/main/res/layout/chips_input.xml vendored
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.pchmn.materialchips.views.ScrollViewMaxHeight xmlns:android="http://schemas.android.com/apk/res/android"
<org.sufficientlysecure.materialchips.views.ScrollViewMaxHeight xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
@ -14,4 +14,4 @@
android:paddingTop="8dp"
android:paddingBottom="8dp" />
</com.pchmn.materialchips.views.ScrollViewMaxHeight>
</org.sufficientlysecure.materialchips.views.ScrollViewMaxHeight>

1
extern/MaterialChipsInput/src/main/res/values/colors.xml vendored
View file

@ -5,6 +5,5 @@
<color name="chips_opened_bg">#009688</color>
<color name="colorCloseChip">#ababab</color>
<color name="white_transparency">#b9ffffff</color>
<color name="colorAccent">?attr/colorAccent</color>
</resources>

2
extern/MaterialChipsInput/src/test/java/com/pchmn/materialchips/ExampleUnitTest.java → extern/MaterialChipsInput/src/test/java/org/sufficientlysecure/materialchips/ExampleUnitTest.java vendored
View file

@ -1,4 +1,4 @@
package com.pchmn.materialchips;
package org.sufficientlysecure.materialchips;
import org.junit.Test;