diff --git a/app/app.iml b/app/app.iml index f061dc3..b03022d 100644 --- a/app/app.iml +++ b/app/app.iml @@ -160,5 +160,6 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7a4feab..cd05a60 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,4 +55,5 @@ dependencies { implementation 'com.github.florent37:materialviewpager:1.2.3' implementation 'com.ramotion.foldingcell:folding-cell:1.2.3' implementation 'de.hdodenhof:circleimageview:2.2.0' + implementation 'com.github.ybq:Android-SpinKit:1.4.0' } diff --git a/app/src/main/java/com/example/PersonalCenter/MyPersonCenter.java b/app/src/main/java/com/example/PersonalCenter/MyPersonCenter.java index 6bcf455..b971e7d 100644 --- a/app/src/main/java/com/example/PersonalCenter/MyPersonCenter.java +++ b/app/src/main/java/com/example/PersonalCenter/MyPersonCenter.java @@ -72,17 +72,17 @@ public class MyPersonCenter extends Fragment { case 0: return HeaderDesign.fromColorResAndDrawable( R.color.blue, - getResources().getDrawable(R.drawable.home_back) + getResources().getDrawable(R.drawable.xiha1) ); case 1: return HeaderDesign.fromColorResAndDrawable( R.color.green, - getResources().getDrawable(R.drawable.home_back) + getResources().getDrawable(R.drawable.xiha2) ); case 2: return HeaderDesign.fromColorResAndDrawable( R.color.cyan, - getResources().getDrawable(R.drawable.home_back) + getResources().getDrawable(R.drawable.xiha3) ); } @@ -110,7 +110,7 @@ public class MyPersonCenter extends Fragment { case 0: return RecyclerViewFragment.newInstance(0,mainActivity); case 1: - return RecyclerViewFragment.newInstance(1,mainActivity); + return RecyclerViewFragmentINFO.newInstance(1,mainActivity); case 2: return RecyclerViewFragment.newInstance(1,mainActivity); default: @@ -129,9 +129,9 @@ public class MyPersonCenter extends Fragment { public CharSequence getPageTitle(int position) { switch (position % 3){ case 0: - return "jil"; + return "DYNAMIC"; case 1: - return "drug"; + return "INFO"; case 2: return "药友"; default: diff --git a/app/src/main/java/com/example/PersonalCenter/RecyclerViewFragmentINFO.java b/app/src/main/java/com/example/PersonalCenter/RecyclerViewFragmentINFO.java new file mode 100644 index 0000000..ed4ce51 --- /dev/null +++ b/app/src/main/java/com/example/PersonalCenter/RecyclerViewFragmentINFO.java @@ -0,0 +1,81 @@ +package com.example.PersonalCenter; + +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.cardview.widget.CardView; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.example.cmknowledgegraph.R; +import com.github.florent37.materialviewpager.header.MaterialViewPagerHeaderDecorator; + +import java.util.ArrayList; +import java.util.List; + +public class RecyclerViewFragmentINFO extends Fragment{ + + int flag; + AppCompatActivity appCompatActivity; + + public void setAppCompatActivity(AppCompatActivity appCompatActivity) { + this.appCompatActivity = appCompatActivity; + } + + public void setFlag(int flag) { + this.flag = flag; + } + + public static Fragment newInstance(int flag, AppCompatActivity appCompatActivity){ + RecyclerViewFragmentINFO recyclerViewFragmentinfo = new RecyclerViewFragmentINFO(); + recyclerViewFragmentinfo.setFlag(flag); + recyclerViewFragmentinfo.setAppCompatActivity(appCompatActivity); + return recyclerViewFragmentinfo; + } + final List items = new ArrayList<>(); + static final int ITEMS = 1; + + RecyclerView mRecyclerView; + CardView mCardView; + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_recyclerview, container, false); + } + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + mRecyclerView=view.findViewById(R.id.recyclerView); +// mCardView = view.findViewById(); + //需要根据网路请求发送数据,来请求一个页可以有多少文章条目,而且针对每一个tab,都要有不同的显示方式 + for (int i=0;i + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/cell_content_listview.xml b/app/src/main/res/layout/cell_content_listview.xml new file mode 100644 index 0000000..085ba53 --- /dev/null +++ b/app/src/main/res/layout/cell_content_listview.xml @@ -0,0 +1,429 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/cell_title_listview.xml b/app/src/main/res/layout/cell_title_listview.xml new file mode 100644 index 0000000..b1a37ec --- /dev/null +++ b/app/src/main/res/layout/cell_title_listview.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_cardview.xml b/app/src/main/res/layout/content_cardview.xml index b2ef387..7688019 100644 --- a/app/src/main/res/layout/content_cardview.xml +++ b/app/src/main/res/layout/content_cardview.xml @@ -10,17 +10,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/card_view" android:layout_width="match_parent" - android:layout_height="200dp" + android:layout_height="400dp" android:layout_marginBottom="@dimen/cardMarginVertical" android:layout_marginLeft="@dimen/cardMarginHorizontal" android:layout_marginRight="@dimen/cardMarginHorizontal" android:layout_marginTop="@dimen/cardMarginVertical" + app:cardBackgroundColor="#000000" app:cardCornerRadius="2dp" app:cardElevation="2dp" app:cardPreventCornerOverlap="false" android:clickable="true" app:contentPadding="0dp"> - android:foreground="?android:attr/selectableItemBackgroundBorderless" diff --git a/app/src/main/res/layout/fragment_recyclerview.xml b/app/src/main/res/layout/fragment_recyclerview.xml index f4bced4..a039cfb 100644 --- a/app/src/main/res/layout/fragment_recyclerview.xml +++ b/app/src/main/res/layout/fragment_recyclerview.xml @@ -2,5 +2,5 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/header_logo.xml b/app/src/main/res/layout/header_logo.xml index 24a4f69..9d6ea5b 100644 --- a/app/src/main/res/layout/header_logo.xml +++ b/app/src/main/res/layout/header_logo.xml @@ -13,8 +13,8 @@ diff --git a/app/src/main/res/layout/internetforumfragment.xml b/app/src/main/res/layout/internetforumfragment.xml index aba0c88..a382f39 100644 --- a/app/src/main/res/layout/internetforumfragment.xml +++ b/app/src/main/res/layout/internetforumfragment.xml @@ -3,7 +3,7 @@ xmlns:folding-cell="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> + + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 04c9088..87e63d8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -37,4 +37,20 @@ #3CB371 #FFD700 + + #f4f0ff + #594691 + #ffffff + #594691 + #ffffff + #e0e0e0 + #a9a9a9 + #adafb1 + #adafb1 + #343d43 + #ffbf12 + + #66000000 + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..0475ebd --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,6 @@ + + + 16dp + 16dp + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cdf9b2d..1b104b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,29 @@ + # 1234–5678 + $25 + 5 + REQUESTS + 50 oz + WEIGHT + $150 + PLEDGE + SENDER + Edward Norton + (26) + FROM + TO + DELIVERY DATE + 6:30 pm + May 16, 2016 + REQUEST DEADLINE + 24 minutes + REQUEST + 5 people have sent a request + W 90th St + New York, NY 10025 + 46th Ave + Woodside, NY 11101 + Main2Activity diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index eb9b1d1..473255f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -53,4 +53,32 @@ @color/text_black + + + + + + + + + + \ No newline at end of file