diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml index 1720332..e2647a1 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.LeudaemiaLikeMe"> + diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/DetailActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/DetailActivity.java new file mode 100644 index 0000000..0c31225 --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/DetailActivity.java @@ -0,0 +1,34 @@ +package com.example.leudaemialikeme.Activity; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; + +import androidx.appcompat.app.AppCompatActivity; + +import com.example.leudaemialikeme.R; + +public class DetailActivity extends AppCompatActivity { + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_detail); + + ImageView detail_to=findViewById(R.id.detail_to); + detail_to.setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v) { + finish(); + } + }); + + ImageView search=findViewById(R.id.detail_to_search); + search.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent=new Intent(DetailActivity.this,SearchActivity.class); + startActivity(intent); + } + }); + } +} diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java index bdcf38e..cc5ac4c 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/InfoActivity.java @@ -75,6 +75,8 @@ public class InfoActivity extends AppCompatActivity { InfoAdapter infoAdapter=new InfoAdapter(recNews); recyclerView.setAdapter(infoAdapter); + + } private void initRecNews(){ diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/InfoAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/InfoAdapter.java index 0573c96..991050f 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/InfoAdapter.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/InfoAdapter.java @@ -1,14 +1,17 @@ package com.example.leudaemialikeme.Adapter; +import android.content.Intent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.example.leudaemialikeme.Activity.DetailActivity; import com.example.leudaemialikeme.R; import com.example.leudaemialikeme.Recnews; @@ -23,6 +26,7 @@ public class InfoAdapter extends RecyclerView.Adapter { TextView intro; TextView visNum; TextView time; + LinearLayout linear; public ViewHolder(View view){ super(view); image=(ImageView)view.findViewById(R.id.recNews_image); @@ -30,6 +34,7 @@ public class InfoAdapter extends RecyclerView.Adapter { intro=(TextView)view.findViewById(R.id.recNews_intro); visNum=(TextView)view.findViewById(R.id.recNews_visNum); time=(TextView)view.findViewById(R.id.recNews_time); + linear=(LinearLayout)view.findViewById(R.id.info); } } @@ -42,6 +47,15 @@ public class InfoAdapter extends RecyclerView.Adapter { public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { View view= LayoutInflater.from(parent.getContext()).inflate(R.layout.info_item,parent,false); ViewHolder holder=new ViewHolder(view); + holder.linear.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent=new Intent(view.getContext(), DetailActivity.class); + //intent.putExtra("from",String.valueOf(view.getContext())); + //Log.e("activity",String.valueOf(view.getContext())); + view.getContext().startActivity(intent); + } + }); return holder; } @@ -53,6 +67,7 @@ public class InfoAdapter extends RecyclerView.Adapter { holder.intro.setText(recnews.getIntro()); holder.theme.setText(recnews.getTheme()); holder.time.setText(recnews.getTime()); + } @Override diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/RecnewsAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/RecnewsAdapter.java index cfa70c1..a9991eb 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/RecnewsAdapter.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/RecnewsAdapter.java @@ -1,14 +1,18 @@ package com.example.leudaemialikeme.Adapter; +import android.content.Intent; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.example.leudaemialikeme.Activity.DetailActivity; import com.example.leudaemialikeme.R; import com.example.leudaemialikeme.Recnews; @@ -23,6 +27,7 @@ public class RecnewsAdapter extends RecyclerView.Adapter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/info_item.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/info_item.xml index 787f983..4c8b8f6 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/info_item.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/info_item.xml @@ -7,6 +7,7 @@