Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
appt2 committed Apr 3, 2024
1 parent 8ec77ae commit 992682a
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 103 deletions.
42 changes: 6 additions & 36 deletions .androidide/editor/openedFiles.json
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,20 @@
{
"allFiles": [
{
"file": "/storage/emulated/0/AndroidIDEProjects/ListSheet/library/src/main/java/widget/ItemRuner.java",
"file": "/storage/emulated/0/AndroidIDEProjects/ListSheet/library/build.gradle",
"selection": {
"end": {
"column": 29,
"index": 3779,
"line": 138
},
"start": {
"column": 14,
"index": 3764,
"line": 138
}
}
},
{
"file": "/storage/emulated/0/AndroidIDEProjects/ListSheet/app/src/main/java/com/ninjacoder/listshset/MainActivity.java",
"selection": {
"end": {
"column": 17,
"index": 1404,
"line": 44
},
"start": {
"column": 4,
"index": 624,
"line": 19
}
}
},
{
"file": "/storage/emulated/0/AndroidIDEProjects/ListSheet/README.md",
"selection": {
"end": {
"column": 17,
"index": 932,
"column": 23,
"index": 843,
"line": 34
},
"start": {
"column": 17,
"index": 932,
"column": 23,
"index": 843,
"line": 34
}
}
}
],
"selectedFile": "/storage/emulated/0/AndroidIDEProjects/ListSheet/library/src/main/java/widget/ItemRuner.java"
"selectedFile": "/storage/emulated/0/AndroidIDEProjects/ListSheet/library/build.gradle"
}
1 change: 1 addition & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ dependencies {
implementation("com.google.android.material:material:1.9.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
}

4 changes: 2 additions & 2 deletions app/src/main/java/com/ninjacoder/listshset/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void onClickItem(int pos) {}
@Override
public void onLongItem(int pos) {
runer.removed(pos);
runer.DataRomved(pos);
runer.DataRomved(pos);
}
});
runer.setTextColors(Color.CYAN);
Expand All @@ -41,7 +41,7 @@ public void onLongItem(int pos) {
runer.setTitle("Hello");
runer.setAnimator(true);
runer.setSheetBackground(Color.BLACK);
runer.setLayoutChange(true);
runer.setLayoutChange(false);
runer.show();
}
}
2 changes: 0 additions & 2 deletions library/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ publishing {
groupId = 'com.ninjacoder.listshset.library'
artifactId = 'ListSheet'
version = '1.0.3'

from components.java
}
}
}
41 changes: 23 additions & 18 deletions library/src/main/java/adapter/ListAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class ListAdapter extends RecyclerView.Adapter<ListAdapter.VH> {
protected OnItemClickEvent ev;
protected boolean isAnim = false;
protected boolean isLayout2 = false;


public ListAdapter(List<SheetModel> model, OnItemClickEvent ev) {
this.model = model;
Expand All @@ -36,14 +35,16 @@ public ListAdapter(List<SheetModel> model, OnItemClickEvent ev) {

@Override
public VH onCreateViewHolder(ViewGroup parent, int viewType) {
var view = LayoutInflater.from(parent.getContext()).inflate(isLayout2 ? R.layout.layout_adapter2 : R.layout.layout_adapter, parent, false);
var view =
LayoutInflater.from(parent.getContext())
.inflate(isLayout2 ? R.layout.layout_adapter2 : R.layout.layout_adapter, parent, false);
return new VH(view);
}

@Override
public void onBindViewHolder(VH holder, int position) {
SheetModel sheet = model.get(position);

if (sheet.getIcon() == 0) {
holder.img.setVisibility(View.GONE);
} else {
Expand All @@ -56,21 +57,22 @@ public void onBindViewHolder(VH holder, int position) {
holder.root.setAlpha(sheet.getIsItem() ? 1f : 0.4f);
holder.tv.setTextColor(colorText);
holder.img.setColorFilter(colorFilter, PorterDuff.Mode.SRC_IN);
if(ev != null ) {
holder.root.setOnClickListener(c ->{
if(sheet.getIsItem()){
ev.onClickItem(holder.getAdapterPosition());
if(isAnim) AnimatorUtils.ClickAnimation(holder.root);
}
holder.root.setOnLongClickListener(___ ->{
if(sheet.getIsItem()) {
ev.onClickItem(holder.getAdapterPosition());
if(isAnim)
ev.onLongItem(holder.getAdapterPosition());
if (ev != null) {
holder.root.setOnClickListener(
c -> {
if (sheet.getIsItem()) {
ev.onClickItem(holder.getAdapterPosition());
if (isAnim) AnimatorUtils.ClickAnimation(holder.root);
}
return true;
holder.root.setOnLongClickListener(
___ -> {
if (sheet.getIsItem()) {
ev.onClickItem(holder.getAdapterPosition());
if (isAnim) ev.onLongItem(holder.getAdapterPosition());
}
return true;
});
});
});
}
}

Expand All @@ -86,13 +88,16 @@ public void setTextColor(int color) {
public void setColorFilter(int colorFilter) {
this.colorFilter = colorFilter;
}
public void setAnimatorItem(boolean is){

public void setAnimatorItem(boolean is) {
this.isAnim = is;
}
public void setLayoutChange(boolean isLayout2){

public void setLayoutChange(boolean isLayout2) {
this.isLayout2 = isLayout2;
}


static class VH extends RecyclerView.ViewHolder {
private LinearLayout root;
private ImageView img;
Expand Down
Binary file added library/src/main/res/drawable/icon_res.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 25 additions & 22 deletions library/src/main/res/layout/layout_adapter.xml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:id="@+id/root">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:id="@+id/root">

<ImageView
android:layout_height="60dp"
android:layout_width="60dp"
android:scaleType="centerInside"
android:id="@+id/icon" />
<ImageView
android:layout_height="60dp"
android:layout_width="60dp"
android:scaleType="centerInside"
android:id="@+id/icon"
android:src="@drawable/icon_res"/>

<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_marginRight="4dp"
android:textColor="#ffffffff"
android:id="@+id/name"
android:text="TextView" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_marginRight="4dp"
android:textColor="#ffffffff"
android:id="@+id/name"
android:text="TextView"
android:layout_marginLeft="7dp"/>

</LinearLayout>

</LinearLayout>
49 changes: 26 additions & 23 deletions library/src/main/res/layout/layout_adapter2.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:id="@+id/root">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
android:id="@+id/root">

<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_marginRight="4dp"
android:textColor="#ffffffff"
android:layout_weight="1"
android:id="@+id/name"
android:text="TextView" />
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_marginRight="3dp"
android:textColor="#ffffffff"
android:layout_weight="1"
android:id="@+id/name"
android:text="Hello"
android:layout_marginStart="6dp"/>

<ImageView
android:layout_height="60dp"
android:layout_width="60dp"
android:scaleType="centerInside"
android:id="@+id/icon" />
<ImageView
android:layout_height="60dp"
android:layout_width="60dp"
android:scaleType="centerInside"
android:id="@+id/icon"
android:src="@drawable/icon_res"/>

</LinearLayout>

</LinearLayout>

0 comments on commit 992682a

Please sign in to comment.