diff --git a/Amicool/app/build.gradle b/Amicool/app/build.gradle
index acc3c2d..5f74f88 100644
--- a/Amicool/app/build.gradle
+++ b/Amicool/app/build.gradle
@@ -5,7 +5,7 @@ android {
buildToolsVersion "30.0.3"
defaultConfig {
applicationId "com.example.amicool"
- minSdkVersion 15
+ minSdkVersion 16
targetSdkVersion 30
versionCode 1
versionName "1.0"
@@ -25,6 +25,7 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
+ implementation 'com.google.android.material:material:1.2.1'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
diff --git a/Amicool/app/src/androidTest/java/com/example/amicool/ExampleInstrumentedTest.java b/Amicool/app/src/androidTest/java/com/example/amicool/ExampleInstrumentedTest.java
index da13fe5..913efbc 100644
--- a/Amicool/app/src/androidTest/java/com/example/amicool/ExampleInstrumentedTest.java
+++ b/Amicool/app/src/androidTest/java/com/example/amicool/ExampleInstrumentedTest.java
@@ -2,8 +2,8 @@ package com.example.amicool;
import android.content.Context;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/Amicool/app/src/main/AndroidManifest.xml b/Amicool/app/src/main/AndroidManifest.xml
index 03d668b..f0738d5 100644
--- a/Amicool/app/src/main/AndroidManifest.xml
+++ b/Amicool/app/src/main/AndroidManifest.xml
@@ -8,8 +8,9 @@
android:label=""
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme"
- >
+ android:theme="@style/AppTheme">
+
+
@@ -17,7 +18,7 @@
-
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/AddActivity.java b/Amicool/app/src/main/java/com/example/amicool/AddActivity.java
new file mode 100644
index 0000000..e87959f
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/AddActivity.java
@@ -0,0 +1,74 @@
+package com.example.amicool;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class AddActivity extends AppCompatActivity {
+
+ TextView note_time; //便签修改时间
+ ImageView note_back; //返回首页
+ EditText note_content; //便签正文
+ EditText note_title;
+ Button issue;
+ SQLiteHelper mSQLiteHelper;
+ String id;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_add);
+ note_time = (TextView) findViewById(R.id.tv_time);
+ note_back = (ImageView) findViewById(R.id.note_back);
+ note_content = (EditText) findViewById(R.id.note_content);
+ note_title = (EditText) findViewById(R.id.note_title);
+ issue = (Button) findViewById(R.id.issue);
+ initData();//根据来源决定顶部显示"添加便签"还是"修改便签"
+ /*issue.setOnClickListener(this); //返回首页*/
+ }
+ protected void initData() {
+ mSQLiteHelper = new SQLiteHelper(this); //这一句很关键
+ Intent intent = getIntent();
+ if(intent!= null){
+ id = intent.getStringExtra("id");
+ if (id != null){ //"修改便签",显示原便签内容
+ note_content.setText(intent.getStringExtra("note_content"));
+ note_title.setText(intent.getStringExtra("note_title"));
+ note_time.setText(intent.getStringExtra("time"));
+ note_time.setVisibility(View.VISIBLE);
+ }
+ }
+ }
+ public void onClick(View v) {
+ switch (v.getId()) {
+ case R.id.note_back: //返回键功能，关闭当前页面
+ finish();
+ break;
+ /*case R.id.issue:
+ String note_content=note_content.getText().toString().trim();
+ String note_title=note_title.getText().toString().trim();
+ //向数据库中添加数据
+ if (note_content.length()>0){
+ if (mSQLiteHelper.insertData(note_content, SQLiteHelper.getTime())){
+ showToast("保存成功");
+ setResult(2); //便于刷新显示
+ finish();
+ }else {
+ showToast("保存失败");
+ }
+ }else {
+ showToast("内容不能为空!");
+ }
+ break;*/
+ }
+ }
+ public void showToast(String message){
+ Toast.makeText(AddActivity.this,message, Toast.LENGTH_SHORT).show();
+ }
+}
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/AddFragment.java b/Amicool/app/src/main/java/com/example/amicool/AddFragment.java
deleted file mode 100644
index ca49823..0000000
--- a/Amicool/app/src/main/java/com/example/amicool/AddFragment.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.example.amicool;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.fragment.app.Fragment;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link AddFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class AddFragment extends Fragment {
-
- // TODO: Rename parameter arguments, choose names that match
- // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
- private static final String ARG_PARAM1 = "param1";
- private static final String ARG_PARAM2 = "param2";
-
- // TODO: Rename and change types of parameters
- private String mParam1;
- private String mParam2;
-
- public AddFragment() {
- // Required empty public constructor
- }
-
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment AddFragment.
- */
- // TODO: Rename and change types and number of parameters
- public static AddFragment newInstance(String param1, String param2) {
- AddFragment fragment = new AddFragment();
- Bundle args = new Bundle();
- args.putString(ARG_PARAM1, param1);
- args.putString(ARG_PARAM2, param2);
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- mParam1 = getArguments().getString(ARG_PARAM1);
- mParam2 = getArguments().getString(ARG_PARAM2);
- }
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- // Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_add, container, false);
- }
-}
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/AlbumAdapter.java b/Amicool/app/src/main/java/com/example/amicool/AlbumAdapter.java
new file mode 100644
index 0000000..aa3c23c
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/AlbumAdapter.java
@@ -0,0 +1,151 @@
+package com.example.amicool;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+public class AlbumAdapter extends RecyclerView.Adapter {
+ private List albumInfoList;
+ private Context context;
+ static class ViewHolder extends RecyclerView.ViewHolder{
+ TextView title;
+ TextView sort0;
+ TextView sort1;
+ TextView sort2;
+ TextView sort3;
+ TextView sort4;
+ TextView sort5;
+ TextView sort6;
+ TextView sort7;
+ TextView sort8;
+ TextView sort9;
+
+ public ViewHolder(@NonNull View itemView) {
+ super(itemView);
+ this.title = (TextView)itemView.findViewById(R.id.title);
+ this.sort0 = (TextView) itemView.findViewById(R.id.sort0);
+ this.sort1 = (TextView) itemView.findViewById(R.id.sort1);
+ this.sort2 = (TextView) itemView.findViewById(R.id.sort2);
+ this.sort3 = (TextView) itemView.findViewById(R.id.sort3);
+ this.sort4 = (TextView) itemView.findViewById(R.id.sort4);
+ this.sort5 = (TextView) itemView.findViewById(R.id.sort5);
+ this.sort6 = (TextView) itemView.findViewById(R.id.sort6);
+ this.sort7 = (TextView) itemView.findViewById(R.id.sort7);
+ this.sort8 = (TextView) itemView.findViewById(R.id.sort8);
+ this.sort9 = (TextView) itemView.findViewById(R.id.sort9);
+ }
+ }
+ public AlbumAdapter(List albumInfoList) {
+ this.albumInfoList = albumInfoList;
+ }
+ @Override
+ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+ AlbumInfo album = albumInfoList.get(position);
+ holder.title.setText(album.getTitle());
+ holder.sort0.setText(album.getSort0());
+ holder.sort1.setText(album.getSort1());
+ holder.sort2.setText(album.getSort2());
+ holder.sort3.setText(album.getSort3());
+ holder.sort4.setText(album.getSort4());
+ holder.sort5.setText(album.getSort5());
+ holder.sort6.setText(album.getSort6());
+ holder.sort7.setText(album.getSort7());
+ holder.sort8.setText(album.getSort8());
+ holder.sort9.setText(album.getSort9());
+ Log.e("AlbumAdapter","onBindViewHolder"+position);
+ }
+ @NonNull
+ @Override
+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.cardview,parent,false);
+ final ViewHolder holder = new ViewHolder(view);
+ Log.e("AlbumAdapter","onCreateViewHolder");
+ holder.sort0.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort4.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort5.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort6.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort7.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort8.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ holder.sort9.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int position = holder.getAdapterPosition();
+ showInfo(position, v.getContext(), holder);
+ }
+ });
+ return holder;
+ }
+ private void showInfo(int position, Context context,final ViewHolder holder)
+ {
+ final AlbumInfo data = albumInfoList.get(position);
+ }
+ @Override
+ public int getItemCount() {
+ return albumInfoList.size();
+ }
+}
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/AlbumInfo.java b/Amicool/app/src/main/java/com/example/amicool/AlbumInfo.java
new file mode 100644
index 0000000..2f6ad00
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/AlbumInfo.java
@@ -0,0 +1,96 @@
+package com.example.amicool;
+
+public class AlbumInfo {
+ private String title;
+ private String sort0;
+ private String sort1;
+ private String sort2;
+ private String sort3;
+ private String sort4;
+ private String sort5;
+ private String sort6;
+ private String sort7;
+ private String sort8;
+ private String sort9;
+
+ public AlbumInfo(String title,String sort0, String sort1,String sort2,String sort3,String sort4,
+ String sort5,String sort6,String sort7,String sort8,String sort9){
+ this.title = title;
+ this.sort0=sort0;
+ this.sort1=sort1;
+ this.sort2=sort2;
+ this.sort3=sort3;
+ this.sort4=sort4;
+ this.sort5=sort5;
+ this.sort6=sort6;
+ this.sort7=sort7;
+ this.sort8=sort8;
+ this.sort9=sort9;
+ }
+
+ public String getTitle() { return title; }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getSort0() { return sort0; }
+
+ public void setSort0(String sort0) {
+ this.sort0 = sort0;
+ }
+
+ public String getSort1() { return sort1; }
+
+ public void setSort1(String sort1) {
+ this.sort1 = sort1;
+ }
+
+ public String getSort2() { return sort2; }
+
+ public void setSort2(String sort2) {
+ this.sort2 = sort2;
+ }
+
+ public String getSort3() { return sort3; }
+
+ public void setSort3(String sort3) {
+ this.sort3 = sort3;
+ }
+
+ public String getSort4() { return sort4; }
+
+ public void setSort4(String sort4) {
+ this.sort4 = sort4;
+ }
+
+ public String getSort5() { return sort5; }
+
+ public void setSort5(String sort5) {
+ this.sort5 = sort5;
+ }
+
+ public String getSort6() { return sort6; }
+
+ public void setSort6(String sort6) {
+ this.sort6 = sort6;
+ }
+
+ public String getSort7() { return sort7; }
+
+ public void setSort7(String sort7) {
+ this.sort7 = sort7;
+ }
+
+ public String getSort8() { return sort8; }
+
+ public void setSort8(String sort8) {
+ this.sort8 = sort8;
+ }
+
+ public String getSort9() { return sort9; }
+
+ public void setSort9(String sort9) {
+ this.sort9 = sort9;
+ }
+}
diff --git a/Amicool/app/src/main/java/com/example/amicool/ClassifyFragment.java b/Amicool/app/src/main/java/com/example/amicool/ClassifyFragment.java
index 8bbc765..52b76f0 100644
--- a/Amicool/app/src/main/java/com/example/amicool/ClassifyFragment.java
+++ b/Amicool/app/src/main/java/com/example/amicool/ClassifyFragment.java
@@ -1,67 +1,60 @@
package com.example.amicool;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.EditText;
import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* A simple {@link Fragment} subclass.
* Activities that contain this fragment must implement the
* to handle interaction events.
- * Use the {@link ClassifyFragment#newInstance} factory method to
+ * Use the {@link ClassifyFragment} factory method to
* create an instance of this fragment.
*/
public class ClassifyFragment extends Fragment {
- // TODO: Rename parameter arguments, choose names that match
- // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
- private static final String ARG_PARAM1 = "param1";
- private static final String ARG_PARAM2 = "param2";
-
- // TODO: Rename and change types of parameters
- private String mParam1;
- private String mParam2;
-
-
- public ClassifyFragment() {
- // Required empty public constructor
- }
-
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment ContactFragment.
- */
- // TODO: Rename and change types and number of parameters
- public static ClassifyFragment newInstance(String param1, String param2) {
- ClassifyFragment fragment = new ClassifyFragment();
- Bundle args = new Bundle();
- args.putString(ARG_PARAM1, param1);
- args.putString(ARG_PARAM2, param2);
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- mParam1 = getArguments().getString(ARG_PARAM1);
- mParam2 = getArguments().getString(ARG_PARAM2);
- }
- }
+ private List mData = new ArrayList<>();
+ private View view;
+ public RecyclerView recycleView;
+ private AlbumAdapter adapter;
+ public ClassifyFragment(){}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_classify, container, false);
+ view = inflater.inflate(R.layout.fragment_classify, container, false);
+ recycleView = (RecyclerView)view.findViewById(R.id.babyAlbumlist);
+ EditText Search = (EditText)view.findViewById(R.id.search_content);
+ Drawable drawable = getResources().getDrawable(R.drawable.search);
+ drawable .setBounds(0, 0, 70, 70);//第一个 0 是距左边距离，第二个 0 是距上边距离，40 分别是长宽
+ Search.setCompoundDrawables(drawable , null, null, null);//只放左边
+ getData();
+ LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
+ recycleView.setLayoutManager(layoutManager);
+ adapter = new AlbumAdapter(mData);
+ recycleView.setAdapter(adapter);
+ return view;
+ }
+
+ private void getData()
+ {
+ AlbumInfo albumInfo = new AlbumInfo("知识"," 历史"," 科学"," 军事"," 宗教"," 地理"," 财经"," LGBTQ"," 文学"," 哲学"," 诗歌");
+ mData.add(albumInfo);
+ AlbumInfo albumInfo2 = new AlbumInfo("娱乐明星"," 饭圈"," 男团"," 女团"," cp"," 八卦"," 选秀"," 相声"," 小品"," 演员"," 声优");
+ mData.add(albumInfo2);
+ AlbumInfo albumInfo3 = new AlbumInfo("生活" ," 校园"," 情感"," 帅哥"," 美女"," 动物"," 美食"," 职场"," 新闻"," 网站"," 文化");
+ mData.add(albumInfo3);
}
}
diff --git a/Amicool/app/src/main/java/com/example/amicool/HomepageFragment.java b/Amicool/app/src/main/java/com/example/amicool/HomepageFragment.java
index 0d4db36..aa11990 100644
--- a/Amicool/app/src/main/java/com/example/amicool/HomepageFragment.java
+++ b/Amicool/app/src/main/java/com/example/amicool/HomepageFragment.java
@@ -1,10 +1,12 @@
package com.example.amicool;
+import android.content.Intent;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.HorizontalScrollView;
import android.widget.RadioButton;
import android.widget.RadioGroup;
@@ -17,6 +19,7 @@ public class HomepageFragment extends Fragment implements ViewPager.OnPageChange
private static final String ARG_CHANNEL_LIST = "channel_list";
private String TAG = "WechatFragment";
+ private Button search;
//以下声明 fragment_wechat.xml 对应的控件实例
private View view=null; // 碎片的布局实例
@@ -52,6 +55,7 @@ public class HomepageFragment extends Fragment implements ViewPager.OnPageChange
}
});
}
+ setdrop(view);
return view;
}
@@ -108,7 +112,18 @@ public class HomepageFragment extends Fragment implements ViewPager.OnPageChange
}
@Override
public void onPageScrollStateChanged(int i) {
-
}
-
+ public void setdrop(View view) {
+ this.view = view;
+ search = view.findViewById(R.id.searchfor);
+ search.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ //getActivity() 用来获取当前Activity
+ intent.setClass(getActivity(), SearchActivity.class);
+ startActivity(intent);
+ }
+ });
+ }
}
diff --git a/Amicool/app/src/main/java/com/example/amicool/MainActivity.java b/Amicool/app/src/main/java/com/example/amicool/MainActivity.java
index c9cdd52..76da1f7 100644
--- a/Amicool/app/src/main/java/com/example/amicool/MainActivity.java
+++ b/Amicool/app/src/main/java/com/example/amicool/MainActivity.java
@@ -1,8 +1,10 @@
package com.example.amicool;
+import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
+import android.widget.Button;
import android.widget.ImageButton;
import android.widget.LinearLayout;
@@ -23,13 +25,12 @@ public class MainActivity extends AppCompatActivity {
//四个 Tab 对应的布局去
private LinearLayout mTabHomepage;
private LinearLayout mTabClassify;
- private LinearLayout mTabAdd;
private LinearLayout mTabNews;
private LinearLayout mTabSetting;
+ private Button mImgAdd;
//四个 Tab 对应的 ImageButton
private ImageButton mImgHomepage;
private ImageButton mImgClassify;
- private ImageButton mImgAdd;
private ImageButton mImgNews;
private ImageButton mImgSetting;
@@ -48,7 +49,6 @@ public class MainActivity extends AppCompatActivity {
//将四个 Fragment 加入集合中
mFragments.add(new HomepageFragment());
mFragments.add(new ClassifyFragment());
- mFragments.add(new AddFragment());
mFragments.add(new NewsFragment());
mFragments.add(new SettingFragment());
}
@@ -57,14 +57,20 @@ public class MainActivity extends AppCompatActivity {
private void initViews() {
mTabHomepage = (LinearLayout) findViewById(R.id.id_tab_homepage);
mTabClassify = (LinearLayout) findViewById(R.id.id_tab_classify);
- mTabAdd = (LinearLayout) findViewById(R.id.id_tab_add);
mTabNews = (LinearLayout) findViewById(R.id.id_tab_news);
mTabSetting = (LinearLayout) findViewById(R.id.id_tab_setting);
mImgHomepage = (ImageButton) findViewById(R.id.id_tab_homepage_img);
mImgClassify = (ImageButton) findViewById(R.id.id_tab_classify_img);
- mImgAdd = (ImageButton) findViewById(R.id.id_tab_add_img);
+ mImgAdd = (Button) findViewById(R.id.id_tab_add_img);
mImgNews = (ImageButton) findViewById(R.id.id_tab_news_img);
mImgSetting = (ImageButton) findViewById(R.id.id_tab_setting_img);
+ mImgAdd.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent=new Intent(MainActivity.this,AddActivity.class);
+ startActivityForResult(intent, 1);
+ }
+ });
}
//初始化事件
@@ -72,11 +78,11 @@ public class MainActivity extends AppCompatActivity {
//设置四个 Tab 的点击事件
mTabHomepage.setOnClickListener(onClickListener);
mTabClassify.setOnClickListener(onClickListener);
- mTabAdd.setOnClickListener(onClickListener);
mTabNews.setOnClickListener(onClickListener);
mTabSetting.setOnClickListener(onClickListener);
}
+
View.OnClickListener onClickListener = new View.OnClickListener() {
public void onClick(View v) {
//先将四个 ImageButton 置为灰色
@@ -85,9 +91,8 @@ public class MainActivity extends AppCompatActivity {
switch (v.getId()) {
case R.id.id_tab_homepage: selectTab(0); break;
case R.id.id_tab_classify: selectTab(1); break;
- case R.id.id_tab_add: selectTab(2); break;
- case R.id.id_tab_news: selectTab(3); break;
- case R.id.id_tab_setting: selectTab(4); break;
+ case R.id.id_tab_news: selectTab(2); break;
+ case R.id.id_tab_setting: selectTab(3); break;
}
}};
@@ -95,7 +100,6 @@ public class MainActivity extends AppCompatActivity {
private void resetImgs() {
mImgHomepage.setImageResource(R.drawable.tab_homepage_normal);
mImgClassify.setImageResource(R.drawable.tab_classify_normal);
- mImgAdd.setImageResource(R.drawable.tab_add);
mImgNews.setImageResource(R.drawable.tab_news_normal);
mImgSetting.setImageResource(R.drawable.tab_setting_normal);
}
@@ -105,9 +109,8 @@ public class MainActivity extends AppCompatActivity {
switch (i) {
case 0: mImgHomepage.setImageResource(R.drawable.tab_homepage_pressed);break;
case 1: mImgClassify.setImageResource(R.drawable.tab_classify_pressed);break;
- case 2: mImgAdd.setImageResource(R.drawable.tab_add);break;
- case 3: mImgNews.setImageResource(R.drawable.tab_news_pressed);break;
- case 4: mImgSetting.setImageResource(R.drawable.tab_setting_pressed);break;
+ case 2: mImgNews.setImageResource(R.drawable.tab_news_pressed);break;
+ case 3: mImgSetting.setImageResource(R.drawable.tab_setting_pressed);break;
}
//设置当前点击的 Tab 所对应的页面
diff --git a/Amicool/app/src/main/java/com/example/amicool/NewsChannelFragment.java b/Amicool/app/src/main/java/com/example/amicool/NewsChannelFragment.java
index d19f0ff..8faa6fd 100644
--- a/Amicool/app/src/main/java/com/example/amicool/NewsChannelFragment.java
+++ b/Amicool/app/src/main/java/com/example/amicool/NewsChannelFragment.java
@@ -1,5 +1,7 @@
package com.example.amicool;
+import android.content.Context;
+import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/Amicool/app/src/main/java/com/example/amicool/NewsPageFragmentAdapter.java b/Amicool/app/src/main/java/com/example/amicool/NewsPageFragmentAdapter.java
index d16790e..7b999a8 100644
--- a/Amicool/app/src/main/java/com/example/amicool/NewsPageFragmentAdapter.java
+++ b/Amicool/app/src/main/java/com/example/amicool/NewsPageFragmentAdapter.java
@@ -1,8 +1,8 @@
package com.example.amicool;
+import androidx.fragment.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
public class NewsPageFragmentAdapter extends FragmentPagerAdapter {
private String[] channelList; private FragmentManager fm;
diff --git a/Amicool/app/src/main/java/com/example/amicool/NoteAdapter.java b/Amicool/app/src/main/java/com/example/amicool/NoteAdapter.java
new file mode 100644
index 0000000..ae79380
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/NoteAdapter.java
@@ -0,0 +1,60 @@
+package com.example.amicool;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+public class NoteAdapter extends BaseAdapter {
+ private LayoutInflater layoutInflater;
+ private List list;//ListView显示的备忘录数据
+
+ public NoteAdapter(Context context, List list){
+ this.layoutInflater=LayoutInflater.from(context);
+ this.list=list;
+ }
+ @Override
+ public int getCount() {
+ return list==null ? 0 : list.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+ return list.get(position);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ ViewHolder viewHolder;
+ if (convertView==null){
+ convertView=layoutInflater.inflate(R.layout.note_item_layout,null);
+ viewHolder=new ViewHolder(convertView);
+ convertView.setTag(viewHolder);
+ }else {
+ viewHolder=(ViewHolder) convertView.getTag();
+ }
+ NoteBean noteInfo=(NoteBean) getItem(position);
+ viewHolder.tvNoteoadContent.setText(noteInfo.getNotecontent());
+ viewHolder.tvNotepadTime.setText(noteInfo.getNotepadTime());
+ return convertView;
+ }
+
+ class ViewHolder{
+ TextView tvNoteoadContent;;
+ TextView tvNotepadTime;
+ public ViewHolder(View view){
+ tvNoteoadContent=(TextView) view.findViewById(R.id.item_content);
+ tvNotepadTime=(TextView) view.findViewById(R.id.item_time);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/NoteBean.java b/Amicool/app/src/main/java/com/example/amicool/NoteBean.java
new file mode 100644
index 0000000..ef82907
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/NoteBean.java
@@ -0,0 +1,31 @@
+package com.example.amicool;
+public class NoteBean {
+ private String id; //记录的id
+ private String notetitle;
+ private String notecontent; //记录的内容
+ private String notepadTime; //保存记录的时间
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getNotetitle() {
+ return notetitle;
+ }
+ public void setNotetitle(String notecontitle) {
+ this.notetitle = notetitle;
+ }
+ public String getNotecontent() {
+ return notecontent;
+ }
+ public void setNotecontent(String notecontent) {
+ this.notecontent = notecontent;
+ }
+ public String getNotepadTime() {
+ return notepadTime;
+ }
+ public void setNotepadTime(String notepadTime) {
+ this.notepadTime = notepadTime;
+ }
+}
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/SQLiteHelper.java b/Amicool/app/src/main/java/com/example/amicool/SQLiteHelper.java
new file mode 100644
index 0000000..323a480
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/SQLiteHelper.java
@@ -0,0 +1,101 @@
+package com.example.amicool;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.widget.Toast;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+class SQLiteHelper extends SQLiteOpenHelper {
+
+ public static final String DATABASE_NAME = "Notepad";//数据库名
+ public static final int DATABASE_VERION = 1; //数据库版本
+ public static final String DATABASE_NOTEPADTB = "Note"; //记事本数据表名
+
+ public static final String NOTEPAD_ID = "id"; //id字段名
+ public static final String NOTEPAD_CONTENT = "content"; //内容字段名
+ public static final String NOTEPAD_NOTETIME = "notetime"; //时间字段名
+
+ //获取当前日期
+ public static final String getTime(){
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
+ Date date = new Date(System.currentTimeMillis());
+ return simpleDateFormat.format(date);
+ }
+ public static final String CREATE_NOTE = "create table " + DATABASE_NOTEPADTB+" ("
+ + NOTEPAD_ID+" integer primary key autoincrement, "
+ + NOTEPAD_CONTENT+" text, "
+ + NOTEPAD_NOTETIME+" text)";
+
+ private SQLiteDatabase sqLiteDatabase;
+ private Context mContext;
+
+ public SQLiteHelper(Context context){
+ super(context, DATABASE_NAME, null, DATABASE_VERION);
+ mContext = context;
+ sqLiteDatabase = this.getWritableDatabase(); //创建数据库
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ db.execSQL(CREATE_NOTE);
+ Toast.makeText(mContext, "Create succeeded", Toast.LENGTH_SHORT).show();
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+
+ }
+
+ //添加数据
+ public boolean insertData(String userContent,String userTime){
+ ContentValues contentValues=new ContentValues();
+ contentValues.put(NOTEPAD_CONTENT,userContent);
+ contentValues.put(NOTEPAD_NOTETIME,userTime);
+ return
+ sqLiteDatabase.insert(DATABASE_NOTEPADTB,null,contentValues)>0;
+ }
+ //删除数据
+ public boolean deleteData(String id){
+ String whereClause = NOTEPAD_ID + "=?";
+ String[] whereArgs = new String[]{String.valueOf(id)};
+ return
+ sqLiteDatabase.delete(DATABASE_NOTEPADTB,whereClause,whereArgs)>0;
+ }
+ //修改数据
+ public boolean updateData(String id,String content,String time){
+ ContentValues contentValues = new ContentValues();
+ contentValues.put(NOTEPAD_CONTENT,content);
+ contentValues.put(NOTEPAD_NOTETIME,time);
+ String whereClause = NOTEPAD_ID + "=?";
+ String[] whereArgs = new String[]{String.valueOf(id)};
+ return
+ sqLiteDatabase.update(DATABASE_NOTEPADTB,contentValues,whereClause,whereArgs)>0;
+ }
+ //查询数据
+ public List query(){
+ List list = new ArrayList();
+ Cursor cursor = sqLiteDatabase.query(DATABASE_NOTEPADTB,null,null,null,
+ null,null,NOTEPAD_ID+" desc");//按id降序排序
+ if (cursor.moveToFirst()){
+ do{
+ NoteBean noteInfo=new NoteBean();
+ String id = String.valueOf(cursor.getInt(cursor.getColumnIndex(NOTEPAD_ID)));
+ String content = cursor.getString(cursor.getColumnIndex(NOTEPAD_CONTENT));
+ String time = cursor.getString(cursor.getColumnIndex(NOTEPAD_NOTETIME));
+ noteInfo.setId(id);
+ noteInfo.setNotecontent(content);
+ noteInfo.setNotepadTime(time);
+ list.add(noteInfo);
+ }while(cursor.moveToNext());
+ cursor.close();
+ }
+ return list;
+ }
+}
diff --git a/Amicool/app/src/main/java/com/example/amicool/SearchActivity.java b/Amicool/app/src/main/java/com/example/amicool/SearchActivity.java
new file mode 100644
index 0000000..af2c3a4
--- /dev/null
+++ b/Amicool/app/src/main/java/com/example/amicool/SearchActivity.java
@@ -0,0 +1,36 @@
+package com.example.amicool;
+
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SearchActivity extends AppCompatActivity {
+
+ private EditText search_content;
+ private Button clear;
+ private Button exit;
+ private Button first,second,third,forth;
+ private Button searrch_more;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_search);
+ search_content=(EditText) findViewById(R.id.search_content);
+ clear = (Button)findViewById(R.id.clear);
+ exit = (Button) findViewById(R.id.edit);
+ first = (Button) findViewById(R.id.first);
+ second = (Button) findViewById(R.id.second);
+ third = (Button) findViewById(R.id.third);
+ forth = (Button) findViewById(R.id.forth);
+ searrch_more = (Button) findViewById(R.id.search_more);
+ EditText ImageView = (EditText) findViewById(R.id.search_content);
+ Drawable drawable = getResources().getDrawable(R.drawable.search);
+ drawable .setBounds(0, 0, 70, 70);//第一个 0 是距左边距离，第二个 0 是距上边距离，40 分别是长宽
+ ImageView.setCompoundDrawables(drawable , null, null, null);//只放左边
+
+ }
+}
\ No newline at end of file
diff --git a/Amicool/app/src/main/java/com/example/amicool/SettingFragment.java b/Amicool/app/src/main/java/com/example/amicool/SettingFragment.java
index 6904c54..fed45ef 100644
--- a/Amicool/app/src/main/java/com/example/amicool/SettingFragment.java
+++ b/Amicool/app/src/main/java/com/example/amicool/SettingFragment.java
@@ -1,9 +1,12 @@
package com.example.amicool;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
import androidx.fragment.app.Fragment;
@@ -18,12 +21,9 @@ import androidx.fragment.app.Fragment;
public class SettingFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
- private static final String ARG_PARAM1 = "param1";
- private static final String ARG_PARAM2 = "param2";
// TODO: Rename and change types of parameters
- private String mParam1;
- private String mParam2;
+ public Button share,edit,con,more;
public SettingFragment() {
@@ -42,8 +42,6 @@ public class SettingFragment extends Fragment {
public static SettingFragment newInstance(String param1, String param2) {
SettingFragment fragment = new SettingFragment();
Bundle args = new Bundle();
- args.putString(ARG_PARAM1, param1);
- args.putString(ARG_PARAM2, param2);
fragment.setArguments(args);
return fragment;
}
@@ -51,16 +49,21 @@ public class SettingFragment extends Fragment {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (getArguments() != null) {
- mParam1 = getArguments().getString(ARG_PARAM1);
- mParam2 = getArguments().getString(ARG_PARAM2);
- }
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_setting, container, false);
+ View view=inflater.inflate(R.layout.fragment_setting,container,false);
+ edit = view.findViewById(R.id.edit);
+ con = view.findViewById(R.id.con);
+ more = view.findViewById(R.id.more);
+ share = view.findViewById(R.id.share);
+ EditText ImageView =view.findViewById(R.id.search);
+ Drawable drawable = getResources().getDrawable(R.drawable.search);
+ drawable .setBounds(0, 0, 70, 70);//第一个 0 是距左边距离，第二个 0 是距上边距离，40 分别是长宽
+ ImageView.setCompoundDrawables(drawable , null, null, null);//只放左边
+ return view;
}
}
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/drawable/back.png b/Amicool/app/src/main/res/drawable/back.png
new file mode 100644
index 0000000..35bc7b0
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/back.png differ
diff --git a/Amicool/app/src/main/res/drawable/beijin.png b/Amicool/app/src/main/res/drawable/beijin.png
deleted file mode 100644
index e552c8e..0000000
Binary files a/Amicool/app/src/main/res/drawable/beijin.png and /dev/null differ
diff --git a/Amicool/app/src/main/res/drawable/button_normal.png b/Amicool/app/src/main/res/drawable/button_normal.png
new file mode 100644
index 0000000..cdb5c05
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/button_normal.png differ
diff --git a/Amicool/app/src/main/res/drawable/button_pressed.png b/Amicool/app/src/main/res/drawable/button_pressed.png
new file mode 100644
index 0000000..a780cbb
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/button_pressed.png differ
diff --git a/Amicool/app/src/main/res/drawable/button_selector.xml b/Amicool/app/src/main/res/drawable/button_selector.xml
new file mode 100644
index 0000000..139d2fe
--- /dev/null
+++ b/Amicool/app/src/main/res/drawable/button_selector.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/drawable/p1.png b/Amicool/app/src/main/res/drawable/p1.png
new file mode 100644
index 0000000..c0dd3df
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/p1.png differ
diff --git a/Amicool/app/src/main/res/drawable/p2.png b/Amicool/app/src/main/res/drawable/p2.png
new file mode 100644
index 0000000..304ce85
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/p2.png differ
diff --git a/Amicool/app/src/main/res/drawable/p3.png b/Amicool/app/src/main/res/drawable/p3.png
new file mode 100644
index 0000000..99e4be4
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/p3.png differ
diff --git a/Amicool/app/src/main/res/drawable/search.png b/Amicool/app/src/main/res/drawable/search.png
index b613fa9..6f48249 100644
Binary files a/Amicool/app/src/main/res/drawable/search.png and b/Amicool/app/src/main/res/drawable/search.png differ
diff --git a/Amicool/app/src/main/res/drawable/setting.png b/Amicool/app/src/main/res/drawable/setting.png
new file mode 100644
index 0000000..58ddf48
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/setting.png differ
diff --git a/Amicool/app/src/main/res/drawable/shape.xml b/Amicool/app/src/main/res/drawable/shape.xml
new file mode 100644
index 0000000..3fd29a3
--- /dev/null
+++ b/Amicool/app/src/main/res/drawable/shape.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Amicool/app/src/main/res/drawable/share.png b/Amicool/app/src/main/res/drawable/share.png
new file mode 100644
index 0000000..c9044cc
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/share.png differ
diff --git a/Amicool/app/src/main/res/drawable/tab_homepage_normal.png b/Amicool/app/src/main/res/drawable/tab_homepage_normal.png
index 40cbf2f..695aa4c 100644
Binary files a/Amicool/app/src/main/res/drawable/tab_homepage_normal.png and b/Amicool/app/src/main/res/drawable/tab_homepage_normal.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang.png b/Amicool/app/src/main/res/drawable/touxiang.png
index c6dee3c..a381db7 100644
Binary files a/Amicool/app/src/main/res/drawable/touxiang.png and b/Amicool/app/src/main/res/drawable/touxiang.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang1.png b/Amicool/app/src/main/res/drawable/touxiang1.png
new file mode 100644
index 0000000..b646d60
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang1.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang2.png b/Amicool/app/src/main/res/drawable/touxiang2.png
new file mode 100644
index 0000000..02877f0
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang2.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang3.png b/Amicool/app/src/main/res/drawable/touxiang3.png
new file mode 100644
index 0000000..a115672
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang3.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang4.png b/Amicool/app/src/main/res/drawable/touxiang4.png
new file mode 100644
index 0000000..ffc19a6
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang4.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang5.png b/Amicool/app/src/main/res/drawable/touxiang5.png
new file mode 100644
index 0000000..ce992e2
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang5.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang6.png b/Amicool/app/src/main/res/drawable/touxiang6.png
new file mode 100644
index 0000000..af1a6da
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang6.png differ
diff --git a/Amicool/app/src/main/res/drawable/touxiang7.png b/Amicool/app/src/main/res/drawable/touxiang7.png
new file mode 100644
index 0000000..9e8b6ed
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/touxiang7.png differ
diff --git a/Amicool/app/src/main/res/drawable/tupian.png b/Amicool/app/src/main/res/drawable/tupian.png
new file mode 100644
index 0000000..71360e9
Binary files /dev/null and b/Amicool/app/src/main/res/drawable/tupian.png differ
diff --git a/Amicool/app/src/main/res/layout/activity_add.xml b/Amicool/app/src/main/res/layout/activity_add.xml
new file mode 100644
index 0000000..6a812ba
--- /dev/null
+++ b/Amicool/app/src/main/res/layout/activity_add.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/activity_search.xml b/Amicool/app/src/main/res/layout/activity_search.xml
new file mode 100644
index 0000000..450bda8
--- /dev/null
+++ b/Amicool/app/src/main/res/layout/activity_search.xml
@@ -0,0 +1,205 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/bottom.xml b/Amicool/app/src/main/res/layout/bottom.xml
index cdcb757..f07dad1 100644
--- a/Amicool/app/src/main/res/layout/bottom.xml
+++ b/Amicool/app/src/main/res/layout/bottom.xml
@@ -59,13 +59,12 @@
android:gravity="center"
android:orientation="vertical">
-
+ android:background="@drawable/tab_add" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/fragment_add.xml b/Amicool/app/src/main/res/layout/fragment_add.xml
index c417246..c4f819e 100644
--- a/Amicool/app/src/main/res/layout/fragment_add.xml
+++ b/Amicool/app/src/main/res/layout/fragment_add.xml
@@ -5,10 +5,65 @@
android:layout_height="match_parent"
tools:context=".AddFragment">
-
+
+
+
+
+
+ android:layout_height="wrap_content"
+ android:textSize="15sp"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:gravity="center"
+ android:visibility="gone"
+ android:textColor="#fb7a6a"/>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/fragment_classify.xml b/Amicool/app/src/main/res/layout/fragment_classify.xml
index 44e7ab6..122bee7 100644
--- a/Amicool/app/src/main/res/layout/fragment_classify.xml
+++ b/Amicool/app/src/main/res/layout/fragment_classify.xml
@@ -8,6 +8,21 @@
tools:context=".ClassifyFragment">
+
+
+
+
diff --git a/Amicool/app/src/main/res/layout/fragment_homepage.xml b/Amicool/app/src/main/res/layout/fragment_homepage.xml
index 8e364c8..6e40603 100644
--- a/Amicool/app/src/main/res/layout/fragment_homepage.xml
+++ b/Amicool/app/src/main/res/layout/fragment_homepage.xml
@@ -15,7 +15,6 @@
android:id="@+id/hvChannel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_toLeftOf="@+id/ivShowChannel"
android:scrollbars="none">
-
@@ -43,4 +42,42 @@
android:layout_height="0dp"
android:layout_weight="1"/>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/fragment_news.xml b/Amicool/app/src/main/res/layout/fragment_news.xml
index cdeb3d1..1368341 100644
--- a/Amicool/app/src/main/res/layout/fragment_news.xml
+++ b/Amicool/app/src/main/res/layout/fragment_news.xml
@@ -3,12 +3,320 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginLeft="35dp"
+ android:layout_marginTop="20dp"
+ android:background="#ffffff"
tools:context=".NewsFragment">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/fragment_setting.xml b/Amicool/app/src/main/res/layout/fragment_setting.xml
index 212d7e0..1a3d181 100644
--- a/Amicool/app/src/main/res/layout/fragment_setting.xml
+++ b/Amicool/app/src/main/res/layout/fragment_setting.xml
@@ -7,11 +7,25 @@
tools:context=".SettingFragment">
+
+
+
+
+
+
@@ -46,13 +60,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Amicool/app/src/main/res/layout/note_item_layout.xml b/Amicool/app/src/main/res/layout/note_item_layout.xml
new file mode 100644
index 0000000..10da6ed
--- /dev/null
+++ b/Amicool/app/src/main/res/layout/note_item_layout.xml
@@ -0,0 +1,24 @@
+
+
+
+
+