diff --git a/app/build.gradle b/app/build.gradle index 24b8ec6..a0f3dee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,4 +66,7 @@ dependencies { implementation 'com.android.support:cardview-v7:26.1.0' //混合式recyclerview compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' + //翻页view + compile 'com.github.czy1121:turncardlistview:1.0.0' + } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8bb7fa1..fa4de42 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,9 +17,11 @@ + + + android:exported="true" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java index 1d2d6ef..ee9b6e0 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java @@ -11,6 +11,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.LinearLayout; import com.ToxicBakery.viewpager.transforms.CubeOutTransformer; @@ -19,6 +20,7 @@ import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.adapter.HomePagerAdapter; import com.example.ninefourone.nutritionmaster.base.BaseActivity; import com.example.ninefourone.nutritionmaster.camera.FoodMaterialCamera; +import com.example.ninefourone.nutritionmaster.modules.addinformation.AddActivity; import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager; import com.example.ninefourone.nutritionmaster.utils.MessageUtils; import com.example.ninefourone.nutritionmaster.utils.PermissionUtils; @@ -81,6 +83,8 @@ public class MainActivity extends BaseActivity { BoomMenuButton boomMenuButton; @BindView(R.id.spider_view) RadarChart spiderView; + @BindView(R.id.add_information_button) + ImageView addInformationButton; @Override @@ -166,13 +170,11 @@ public class MainActivity extends BaseActivity { } + //mDrawer.openMenu(); + /** * 点击事件 */ - @OnClick(R.id.navigation_layout) - public void onViewClicked() { - mDrawer.openMenu(); - } /** @@ -305,4 +307,17 @@ public class MainActivity extends BaseActivity { super.onRequestPermissionsResult(requestCode, permissions, grantResults); MessageUtils.MakeToast("权限赋予成功"); } + + @OnClick({R.id.navigation_layout, R.id.add_information_button}) + public void onViewClicked(View view) { + switch (view.getId()) { + case R.id.navigation_layout: + mDrawer.openMenu(); + break; + case R.id.add_information_button: + Intent intent = new Intent(MainActivity.this, AddActivity.class); + startActivity(intent); + break; + } + } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java new file mode 100644 index 0000000..915cd06 --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java @@ -0,0 +1,127 @@ +package com.example.ninefourone.nutritionmaster.modules.addinformation; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.widget.BaseAdapter; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; +import android.widget.Toast; + +import com.example.ninefourone.nutritionmaster.R; +import com.example.ninefourone.nutritionmaster.utils.MessageUtils; +import com.github.czy1121.view.TurnCardListView; +import com.orhanobut.logger.Logger; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; + +public class AddActivity extends AppCompatActivity { + + @BindView(R.id.card_list) + TurnCardListView cardList; + @BindView(R.id.bottom_content) + RelativeLayout bottomContent; + @BindView(R.id.back_button) + ImageView backButton; + + + private int[] colors = {0xff3F51B5, 0xff673AB7, 0xff006064, 0xffC51162, 0xffFFEB3B, 0xff795548, 0xff9E9E9E}; + private Button[] firstButtons = new Button[colors.length]; + private Button[] secondButtons = new Button[colors.length]; + private TextView[] titleViews = new TextView[colors.length]; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + requestWindowFeature(Window.FEATURE_NO_TITLE); + //设置全屏 + getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add); + ButterKnife.bind(this); + initAddView(); + } + + private void initAddView() { + BaseAdapter adapter = new BaseAdapter() { + + + @Override + public int getCount() { + return colors.length; + } + + @Override + public Object getItem(int position) { + return position; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(final int position, View child, ViewGroup parent) { + + child = LayoutInflater.from(parent.getContext()).inflate(R.layout.add_item, parent, false); + child.findViewById(R.id.image).setBackgroundColor(colors[position]); + titleViews[position] = child.findViewById(R.id.title_view); + firstButtons[position] = child.findViewById(R.id.choose_first); + firstButtons[position].setBackgroundColor(colors[position] + 30); + secondButtons[position] = child.findViewById(R.id.choose_second); + secondButtons[position].setBackgroundColor(colors[position] + 30); + + firstButtons[position].setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + firstButtons[position].setBackgroundColor(colors[position] - 60); + secondButtons[position].setBackgroundColor(colors[position] + 30); + cardList.turnTo(position + 1); + } + }); + secondButtons[position].setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + firstButtons[position].setBackgroundColor(colors[position] + 30); + secondButtons[position].setBackgroundColor(colors[position] - 60); + cardList.turnTo(position + 1); + } + }); + return child; + } + + }; + + cardList.setAdapter(adapter); + cardList.setOnTurnListener(new TurnCardListView.OnTurnListener() { + @Override + public void onTurned(int position) { + Toast.makeText(AddActivity.this, "position = " + position, Toast.LENGTH_SHORT).show(); + bottomContent.setBackgroundColor(colors[position] - 60); + } + }); +// cardList.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// cardList.turnTo(1); +// } +// }); + + + } + + @OnClick(R.id.back_button) + public void onViewClicked() { + finish(); + } +} diff --git a/app/src/main/res/drawable/ic_back_button.xml b/app/src/main/res/drawable/ic_back_button.xml new file mode 100644 index 0000000..89e7a6b --- /dev/null +++ b/app/src/main/res/drawable/ic_back_button.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/ic_data_add.xml b/app/src/main/res/drawable/ic_data_add.xml new file mode 100644 index 0000000..7bb3b82 --- /dev/null +++ b/app/src/main/res/drawable/ic_data_add.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/layout/activity_add.xml b/app/src/main/res/layout/activity_add.xml new file mode 100644 index 0000000..232b007 --- /dev/null +++ b/app/src/main/res/layout/activity_add.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7d0e192..b3cdee6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -193,6 +193,7 @@ android:layout_height="match_parent"> + + diff --git a/app/src/main/res/layout/add_item.xml b/app/src/main/res/layout/add_item.xml new file mode 100644 index 0000000..f400d82 --- /dev/null +++ b/app/src/main/res/layout/add_item.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file