From afd08c4ab4c6c5c45dbfb638336b620db9682265 Mon Sep 17 00:00:00 2001 From: MUQING <1966944300@qq.com> Date: Fri, 1 Dec 2023 18:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.0/fileHashes/fileHashes.bin | Bin 131833 -> 132933 bytes .gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../muqingedit/activity/ActivityFragment.java | 5 +- .../java/com/muqingedit/activity/Edit.java | 69 ++++-- app/src/main/java/com/muqingedit/fanjian.java | 218 ++++++++++-------- .../java/com/muqingedit/list_AlertDialog.java | 88 +++++++ app/src/main/res/layout/edit.xml | 10 +- app/src/main/res/layout/list_fangjian.xml | 17 ++ app/src/main/res/menu/bottom_app_bar.xml | 26 +-- app/src/main/res/menu/edit_toolbar.xml | 8 + 12 files changed, 299 insertions(+), 142 deletions(-) create mode 100644 app/src/main/java/com/muqingedit/list_AlertDialog.java create mode 100644 app/src/main/res/layout/list_fangjian.xml create mode 100644 app/src/main/res/menu/edit_toolbar.xml diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index a5cc10d329a4973bbe2c2054fe35d38e0eb3de84..3fc2f3e0dc5c2bf5696df529c044b2a092d4c2dd 100644 GIT binary patch literal 17 VcmZR6yJ^m`1vkAnF@OO-8vsT>1&{y$ literal 17 VcmZR6yJ^m`1vkAnF@OQjLI6h81}Fdk diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index 4cc16ed6fac3fe26ff22255500f83a8a89feab15..5e86e7e8c7bb400b7bb277b53780e140b0882190 100644 GIT binary patch delta 2966 zcma)82~ZSg7M{Q7K*G_$fZ*sr&oYik6i-Byk$|Ac%|rueIFvCif&$7SVi37pK;&wz zMg;{6gNTaK$e1i|7>sU$M^KT97b7ddaJc{U-&!T4DtT4YGxgs0y{q5*|9O`_ z;d0J|GxN>BO4`=U3BxBf90;rpTFcQ0Ca5AeiR|$xli6oI?Y1Bt_KqwTCF9d2BU@EB z`jL(sM4L=jW4Kwqb&GDL3@Le2=@Ic+F21GRG_6^^nML-~$0YV#e7*az=mS?bAtgVR zz9aS1#+y4E6TE%dIQ(<8*v3lBs=?W}aA;BMJ=W>V_pCH(1vCuI5T&#FOj>TMg8?-y zS=eMq^q90qxl}w3Gcq*Ln)mkM3l0ZlOT82p444CUk*+>g^kN@pj12eeS|U|Cx+06= zTlj4=4?d>Dk3{n^2rT&5g&Nn^$Xw~NMbh&>o?v__9WOv56utY@92+1bE4+M(bNsSZ z_(V={K}*spGh02HMK&R%aWI)&AtYybU-`S~IdF-=lKID+R$Xg*9b#`HM z1f4XcNHHbyX7nD_@k;w*rdW&YZ&!&}R3<{1=93=YGBRYNIUzn&*YfE1TDypy5i>ob zBUGOP^>Mm*V~;8EGJ3FhM@fY8XvY2v_6rMPrLcQS$7;r%D0e0m9s(*cd|)nZ)66ly2Bc&jb&VMW6;$Qn_B_y;ZvdUlSib1%1nY77Jo)Ph7eeLSRk;KaU z!iv0$oBPlj)N~g!V2+sqby-i7_Cg+ydaVaUiqW}`pE^8?wNal~Uu;5bab!(f<%tG|ui*Kj zS*#^rF)$7nzOk{D-o?HR+0}f?Du7ZRo_{qW4l$PAMGSr)DL*+)6>SJif#TZ@d`pjY z*1CPBBefwbUaUq?m&FJwC>!tmm36iCKK|0|NtgYDn+vzj{E_G22V!y<5qrXo6`G!%WM_~7f&PlR@9If zOj8+1Knqv^=T~z_K;i1b$C$&YH!@Sc{_cx6^qtLy4o&UoOtNK zcT&L_-n3Z_k-0|&|3Ee^;fFhVyJz={f`d1@Sk5ylMjP1Uc?Z{=F24xxQ79O%o+{M_ zgsMFQJm!J}XC?7QRBi{*C(joctA0KLjsxJNN-YIyE`D)EQ;iJtvpj!Q#4%7JH0W<0 zG_K)UE=Ou^E-7C6PgTTukcr_Z@_!vHG+u!$0uOSptDnlD0Z6!*`Si1rUPBcOw0h1G zsbn~X!EpG0a;+5V>`K*blBi|ZIwn`;l)=Lh4!u~n5;3rENT3k<#oeh&D| z_Mt@vgOT(-K^SH*$IQpy@_KNK`{)rxT1L!v)rySO(}C=IEM2?_<0U7gZ*N z@%bHLrEQ~ASFKJ*j1L!vVGK3r9bC|DPcuYaH{(ajdP*{7+dV%8@pQ(!r3bV&hG*HO zaQoc-`-x)rPZ?S%8n^I3mkg&-QKN7cH_oywb-)CYl{=#v?6Ypb34@74D{6;v0+l%O z0e|rwu+cF0QR)8J1I zH+gscn^DmZHG7t(JgnQ+`t(xm>^84=PrshfbnL$j<9JONL~5p9 zE0nF%Yh4|xGx^TGI9r|5BoAMJnO}8A=OMJRb*^LU)ZkH_Uh7`4b$W#vQy=Rzka~s1 NG9(ZPZyAow{{a_SW)=Vd delta 1701 zcmZvc3s4hR6ozvWB0)()2#IkKSOfxAp-_S1_$nx^fby_dV-$jj6sSCWF+p2U1o072 zyOpabQlN^@8Dyy|nChUVKBkpq##aG5f(`{4s+2*+YVA#S9Y^V%*}c1azWg_*1tDJ)P>@%coOaj|ph?B!2;&sF6|i-~NNR(aC5&Mm)q3)K_u2q#+~rL-Uq6!qA@H zlu*W)IVh2Z)-$s?MI^Al6{*ZdWHmeUrnS~yOlMTO(Zoom+& zyetgVyd0Zbz2TlBh^3Zxu#~czii%cKx(rvcF=gKBA;!yWj{m4Spwsk}1AACdtfwn8 zdd8FJK%6$xBzjtzF|+B}%v~}rXrPrM%4n3X12uK6un}!Y!i6jG-h@h%z>mJXm9Hl4 zF6F<*?3_Myq;10W z)^W}$1h*s)Os4aAf?4xMOPUSKBuhdU@2o3GG}aBra&_mHCCvU{wBqoU5;k&P37=aES}>?k2_WD525tl&WJJe-`%ldTKgnNNOupb1hnG_ zpAVDK-CW3|C;hY4k*o-7?u=Pw^iAB*ZIZ{lO5>buW1T5`QLESz+ih($dMpNFk*2b= zq(LH!47l0Var-rK-@;4wEc?{T+a`aF=l43}`K0Fe$OTufUoAX-f6BhZqg;f2Y=o&l zQ)|-YC`$t2xc#~o1dnl)i$>HM^owTU^M9i@iRT!KIZZRG;b)JIviZj1^#RYz7x~1+ z*{O_Ll2f!;6+mX8%*UWc5mIm^^Xi-CUocMMGy0J2wk7ek@1Q!tb!5gUb6N_KfWmvh z$;PInrXD5q0)cA#@T+8xW<5IJhtGtVQwkcY&>#vrNM;_|Lcgfj6lgJenIWH0GxKhLIW$3w5Ya0A`~ z*-B6_hY2`nL-tg==I{Tm=wWPLPTw89L1>NQu{)KO+ICPYj>_HAdYMw$14*FVr)`-o zzKL6jl4ZvFptgzN%`~{-B*;TfpT*t#!(U*YMwF*{r%;j%{RF2X|Vh zI=&##=N_PE_h6d`5UQ*f?b>x;F3yWbEARCg_xZo^j=&RJM_j@R_Ey&pIJW19{Z_N3 zh_h~Erg?%s3WAtZ*$^s0!hBHuxDi5t$t-{*0h3{4d3Gs+dK$Cw5Z)+$tSu+0*KH>U! diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index 45dcd58443a76d553789f3548f5152e54a213825..967eb5d271689ca2705d66c8f38f01a821625941 100644 GIT binary patch literal 17 VcmZSX2>ZE?wbpt&0~jcr0su3l1m^$% literal 17 VcmZSX2>ZE?wbpt&0~pA70su1`1Y!UH diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 3d428fbbffb85db39a9b45e9055ef1558b8210a5..24d7933a38b35cbebf133a263d54934e66497447 100644 GIT binary patch literal 17 UcmZQR{+!=6w@BEC0SuHJ04tUQi~s-t literal 17 UcmZQR{+!=6w@BEC0Sx5%0V`hvSO5S3 diff --git a/app/src/main/java/com/muqingedit/activity/ActivityFragment.java b/app/src/main/java/com/muqingedit/activity/ActivityFragment.java index 84b9022..176e210 100644 --- a/app/src/main/java/com/muqingedit/activity/ActivityFragment.java +++ b/app/src/main/java/com/muqingedit/activity/ActivityFragment.java @@ -4,6 +4,9 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import com.muqingedit.R; + +import java.util.Objects; + public class ActivityFragment extends AppCompatActivity { @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { @@ -14,7 +17,7 @@ public class ActivityFragment extends AppCompatActivity { } public void setToolbar() { setSupportActionBar(findViewById(R.id.toolbar)); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); } @Override diff --git a/app/src/main/java/com/muqingedit/activity/Edit.java b/app/src/main/java/com/muqingedit/activity/Edit.java index 09a5fa3..055b4b9 100644 --- a/app/src/main/java/com/muqingedit/activity/Edit.java +++ b/app/src/main/java/com/muqingedit/activity/Edit.java @@ -2,48 +2,71 @@ package com.muqingedit.activity; import android.annotation.SuppressLint; import android.os.Bundle; -import android.view.ViewTreeObserver; +import android.view.Menu; +import android.view.MenuItem; import android.widget.FrameLayout; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; -import com.muqingedit.ConnectionManager; +import com.google.android.material.bottomappbar.BottomAppBar; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.muqingedit.R; import com.muqingedit.fanjian; -import com.muqingedit.gj; import java.util.ArrayList; import java.util.List; public class Edit extends ActivityFragment { public FrameLayout frameLayout;//后续需要添加fragment的移动和缩放 - public static List list_fanjian = new ArrayList<>(); + //收集所有的房间 + public static List list_fanjian; + public static BottomAppBar bottomAppBar; + + @SuppressLint("StaticFieldLeak") + public static fanjian fanjian;//选中的房间 + @SuppressLint("ClickableViewAccessibility") @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.edit); + list_fanjian = new ArrayList<>(); frameLayout = findViewById(R.id.view); //绘制一个房间 findViewById(R.id.button).setOnClickListener(view -> new fanjian(frameLayout)); - frameLayout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - // 在布局完成之后获取 FrameLayout 的高度 - int height = frameLayout.getHeight(); - int width = frameLayout.getWidth(); - - fanjian main = new fanjian(frameLayout, "main");//设置主房间 - int viewWidth = main.getMeasuredWidth(); - int viewHeight = main.getMeasuredHeight(); - float x = (width - viewWidth) / 2.0f; - float y = (height - viewHeight) / 2.0f; - gj.sc(height + ":" + y); - main.setXY((int) x, (int) y); - frameLayout.addView(main); - // 如果只需要获取一次高度，可以在获取之后移除监听器 - frameLayout.getViewTreeObserver().removeOnGlobalLayoutListener(this); - } - }); + Connection(); + fanjian main = new fanjian(frameLayout, "main");//设置主房间 } + + private void Connection() { + bottomAppBar = findViewById(R.id.bottomAppBar); + bottomAppBar.setOnMenuItemClickListener(item -> { + int id = item.getItemId(); + if (id == R.id.Connection) { + if (fanjian != null) { + new com.muqingedit.list_AlertDialog(this); + } + } + return false; + }); + bottomAppBar.performHide(false); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.edit_toolbar,menu); + return super.onCreateOptionsMenu(menu); + } + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + int itemId = item.getItemId(); + if (itemId == R.id.Save) { + //保存 + } + return super.onOptionsItemSelected(item); + } + + } \ No newline at end of file diff --git a/app/src/main/java/com/muqingedit/fanjian.java b/app/src/main/java/com/muqingedit/fanjian.java index a30f967..23f8534 100644 --- a/app/src/main/java/com/muqingedit/fanjian.java +++ b/app/src/main/java/com/muqingedit/fanjian.java @@ -1,13 +1,10 @@ package com.muqingedit; import android.annotation.SuppressLint; -import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; -import android.graphics.Paint; import android.text.TextUtils; import android.view.GestureDetector; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -15,6 +12,8 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; import android.widget.FrameLayout; +import android.widget.TextView; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; @@ -30,9 +29,7 @@ public class fanjian extends FrameLayout { public fanjian(FrameLayout context, String id) { super(context.getContext()); this.frameLayout = context; - init(); - setId(id.hashCode()); - setLayoutParams(300, 300); + init(id); } public fanjian(FrameLayout context) { @@ -49,20 +46,131 @@ public class fanjian extends FrameLayout { end.setOnClickListener(view -> show.dismiss()); start.setOnClickListener(view -> { String id = edit_id.getText().toString(); + for (int i = 0; i < Edit.list_fanjian.size(); i++) { + if (Edit.list_fanjian.get(i).Id().equals(id)) { + Toast.makeText(this.getContext(), "已经存在该房间", Toast.LENGTH_SHORT).show(); + return; + } + } if (TextUtils.isEmpty(id)) { return; } - fanjian.this.id = id; - setId(id.hashCode()); - Edit.list_fanjian.add(fanjian.this); - setLayoutParams(300, 300); - setXY(0, 0); - frameLayout.addView(fanjian.this); + init(id); show.dismiss(); }); - init(); } + + private GestureDetector gestureDetector; + private boolean Long = false; + + public TextView textView; + private void init(String id) { + // 设置背景颜色为红色 + setBackgroundColor(Color.RED); + // 设置视图的尺寸为100x100像素 + setLayoutParams(300, 300); + Id(id); + frameLayout.addView(this); + Edit.list_fanjian.add(this); + // 进行初始化操作，例如设置背景颜色、文字等 + gestureDetector = new GestureDetector(getContext(), + new GestureDetector.SimpleOnGestureListener() { + @Override + public boolean onDoubleTap(@NonNull MotionEvent e) { + if (Edit.fanjian != null) { + Edit.fanjian.setBackgroundColor(Color.RED); + } + if (Edit.fanjian == fanjian.this) { + Edit.fanjian = null; + Edit.bottomAppBar.performHide(); + return super.onDoubleTap(e); + } + Edit.bottomAppBar.performShow(); + Edit.fanjian = fanjian.this; + fanjian.this.setBackgroundColor(Color.MAGENTA); + return super.onDoubleTap(e); + } + + @Override + public void onLongPress(@NonNull MotionEvent e) { + Long = !Long; + // 处理长按事件 + } + + @Override + public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) { + Y = (int) (e2.getY() - e1.getY()); + X = (int) (e2.getX() - e1.getX()); + animate().xBy(X).yBy(Y).setDuration(0).start(); + return true; + } + }); + + textView = new TextView(this.getContext()); + textView.setText(id); + addView(textView); + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + gestureDetector.onTouchEvent(event); + return true; + } + + @SuppressLint("DrawAllocation") + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + } + + public fanjian setLayoutParams(int a, int b) { + setLayoutParams(new ViewGroup.LayoutParams(a, b)); + return this; + } + + /* + @Override + public float getX() { + return this.X; + } + + @Override + public float getY() { + return this.Y; + } + */ + public String Id() { + return id; + } + + public String getXY() { + return X + ":" + Y; + } + + public fanjian setXY(int a, int b) { + setX(a); + setY(b); + return this; + } + + @Override + public void setX(float x) { + super.setX(x); + X = (int) x; + } + + @Override + public void setY(float y) { + super.setY(y); + Y = (int) y; + } + + public void Id(String id) { + this.id = id; + setId(id.hashCode()); + } + /*暂时弃用的一个自定义控件 private class dian extends View { xian xian; @@ -139,87 +247,5 @@ public class fanjian extends FrameLayout { } } - - private GestureDetector gestureDetector; - private boolean Long = false; - - private void init() { - // 设置背景颜色为红色 - setBackgroundColor(Color.RED); - // 设置视图的尺寸为100x100像素 - setLayoutParams(new ViewGroup.LayoutParams(0, 0)); - // 进行初始化操作，例如设置背景颜色、文字等 - gestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() { - @Override - public void onLongPress(@NonNull MotionEvent e) { - Long = !Long; - // 处理长按事件 - } - - @Override - public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2, float distanceX, float distanceY) { - Y = (int) (e2.getY() - e1.getY()); - X = (int) (e2.getX() - e1.getX()); - animate().xBy(X).yBy(Y).setDuration(0).start(); - return true; - } - }); - } - - @Override - public boolean onTouchEvent(MotionEvent event) { - gestureDetector.onTouchEvent(event); - return true; - } - - @SuppressLint("DrawAllocation") - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - // 在此处进行自定义的绘制操作，例如绘制图形、文本等 - } - - public fanjian setLayoutParams(int a, int b) { - setLayoutParams(new ViewGroup.LayoutParams(a, b)); - return this; - } - - /* - @Override - public float getX() { - return this.X; - } - - @Override - public float getY() { - return this.Y; - } - */ - public String Id() { - return id; - } - - public String getXY() { - return X + ":" + Y; - } - - public fanjian setXY(int a, int b) { - setX(a); - setY(b); - addView(new dian(getContext())); - return this; - } - - @Override - public void setX(float x) { - super.setX(x); - X = (int) x; - } - - @Override - public void setY(float y) { - super.setY(y); - Y = (int) y; - } - +*/ } diff --git a/app/src/main/java/com/muqingedit/list_AlertDialog.java b/app/src/main/java/com/muqingedit/list_AlertDialog.java new file mode 100644 index 0000000..07fd34c --- /dev/null +++ b/app/src/main/java/com/muqingedit/list_AlertDialog.java @@ -0,0 +1,88 @@ +package com.muqingedit; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.muqingedit.activity.Edit; + +import java.util.ArrayList; +import java.util.List; + +public class list_AlertDialog extends MaterialAlertDialogBuilder { + RecyclerView list; + AlertDialog alertDialog; + public list_AlertDialog(@NonNull Context context) { + super(context); + list = new RecyclerView(context); + LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context); + list.setLayoutManager(linearLayoutManager); + list.setAdapter(new adapter(Edit.list_fanjian)); + setView(list); + show(); + } + + @Override + public AlertDialog show() { + this.alertDialog = super.show(); + return alertDialog; + } + public void dismiss() { + alertDialog.dismiss(); + } + + class adapter extends RecyclerView.Adapter { + + private final List list=new ArrayList<>(); + + public adapter(List list) { + this.list.addAll(list); + this.list.remove(Edit.fanjian); + } + @NonNull + @Override + public Vh onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View inflate = View.inflate(list_AlertDialog.this.getContext(), + R.layout.list_fangjian, null); + ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + inflate.setLayoutParams(lp); + return new Vh(inflate); + } + + @Override + public void onBindViewHolder(@NonNull Vh holder, int position) { + fanjian fanjian = list.get(position); + holder.textView.setText(fanjian.Id()); + holder.itemView.setOnClickListener(view -> { + fanjian.textView.setText(fanjian.Id() + "已经连接了" + Edit.fanjian.Id()); + Edit.fanjian.textView.setText(Edit.fanjian.Id()+"已经连接了"+ + fanjian.Id()); +/* xian xian = new xian(fanjian.frameLayout); + xian.createNewLine(Edit.fanjian.getX(), Edit.fanjian.getY()); + xian.updateCurrentLine(fanjian.getX(), fanjian.getY());*/ + list_AlertDialog.this.dismiss(); + }); + } + + @Override + public int getItemCount() { + return list.size(); + } + } + + class Vh extends RecyclerView.ViewHolder { + public TextView textView; + public Vh(@NonNull View itemView) { + super(itemView); + textView = itemView.findViewById(R.id.text); + } + } +} diff --git a/app/src/main/res/layout/edit.xml b/app/src/main/res/layout/edit.xml index ee0b893..8f98444 100644 --- a/app/src/main/res/layout/edit.xml +++ b/app/src/main/res/layout/edit.xml @@ -1,6 +1,7 @@ @@ -25,13 +26,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - app:menu="@menu/bottom_app_bar" /> + app:menu="@menu/bottom_app_bar" + app:navigationContentDescription="@string/app_name" + app:fabAlignmentMode="center" + tools:ignore="VisualLintBottomAppBar" /> + app:srcCompat="@drawable/baseline_add_24" + tools:ignore="ImageContrastCheck" + android:contentDescription="@string/app_name" /> \ No newline at end of file diff --git a/app/src/main/res/layout/list_fangjian.xml b/app/src/main/res/layout/list_fangjian.xml new file mode 100644 index 0000000..bb6bae9 --- /dev/null +++ b/app/src/main/res/layout/list_fangjian.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_app_bar.xml b/app/src/main/res/menu/bottom_app_bar.xml index 458c7e8..be95496 100644 --- a/app/src/main/res/menu/bottom_app_bar.xml +++ b/app/src/main/res/menu/bottom_app_bar.xml @@ -1,24 +1,10 @@ - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/menu/edit_toolbar.xml b/app/src/main/res/menu/edit_toolbar.xml new file mode 100644 index 0000000..27fe96e --- /dev/null +++ b/app/src/main/res/menu/edit_toolbar.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file