From cbef51f09e5922d55470c64827c8a598fa483930 Mon Sep 17 00:00:00 2001 From: Naoya Shibahara Date: Sun, 29 May 2016 12:28:57 +0900 Subject: [PATCH 1/3] [WIP] Add top page From 5b23aeeb8e6cbf4885716abb3350bbd83adb544f Mon Sep 17 00:00:00 2001 From: Naoya Shibahara Date: Sun, 29 May 2016 14:15:49 +0900 Subject: [PATCH 2/3] Add Top Page Layout and ClickEvent --- app/build.gradle | 4 + .../com/munisystem/porst/MainActivity.java | 35 ++++++-- .../porst/fragments/MainFragment.java | 81 +++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 10 +-- app/src/main/res/layout/fragment_main.xml | 69 ++++++++++++++++ app/src/main/res/values/dimens.xml | 7 +- app/src/main/res/values/strings.xml | 6 ++ 7 files changed, 201 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/munisystem/porst/fragments/MainFragment.java create mode 100644 app/src/main/res/layout/fragment_main.xml diff --git a/app/build.gradle b/app/build.gradle index 59bf542..7175d0b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,5 +23,9 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-v4:23.4.0' + compile 'com.android.support:cardview-v7:23.4.0' + compile 'com.android.support:gridlayout-v7:23.4.0' + compile 'me.dm7.barcodescanner:zxing:1.8.4' } diff --git a/app/src/main/java/com/munisystem/porst/MainActivity.java b/app/src/main/java/com/munisystem/porst/MainActivity.java index a2638de..0e5b000 100644 --- a/app/src/main/java/com/munisystem/porst/MainActivity.java +++ b/app/src/main/java/com/munisystem/porst/MainActivity.java @@ -1,17 +1,42 @@ package com.munisystem.porst; -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.view.View; + +import com.munisystem.porst.fragments.MainFragment; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity implements MainFragment.OnMainFragmentInteractionListener { + private static final String TAG = MainActivity.class.getSimpleName(); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Intent intent = new Intent(this, QRReaderActivity.class); - startActivity(intent); + getSupportFragmentManager().beginTransaction() + .replace(R.id.container, MainFragment.newInstance()) + .commit(); + } + + @Override + public void onCardItemClick(View v) { + String text = ""; + switch (v.getId()) { + case R.id.card_rental: { + text = "貸出"; + break; + } + case R.id.card_return: { + text = "返却"; + break; + } + case R.id.card_status: { + text = "状態"; + break; + } + } + Log.d(TAG, "onCardItemClick: " + text + " が押されました。"); } } diff --git a/app/src/main/java/com/munisystem/porst/fragments/MainFragment.java b/app/src/main/java/com/munisystem/porst/fragments/MainFragment.java new file mode 100644 index 0000000..1ce9002 --- /dev/null +++ b/app/src/main/java/com/munisystem/porst/fragments/MainFragment.java @@ -0,0 +1,81 @@ +package com.munisystem.porst.fragments; + +import android.content.Context; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.munisystem.porst.R; + +public class MainFragment extends Fragment { + + private OnMainFragmentInteractionListener mListener; + + public MainFragment() {} + + public static MainFragment newInstance() { + MainFragment fragment = new MainFragment(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + Bundle args = getArguments(); + if (args == null) { + return; + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View v = inflater.inflate(R.layout.fragment_main, container, false); + v.findViewById(R.id.card_rental) + .setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mListener.onCardItemClick(v); + } + }); + v.findViewById(R.id.card_return) + .setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mListener.onCardItemClick(v); + } + }); + v.findViewById(R.id.card_status) + .setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mListener.onCardItemClick(v); + } + }); + return v; + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof OnMainFragmentInteractionListener) { + mListener = (OnMainFragmentInteractionListener) context; + } else { + throw new RuntimeException(context.toString() + + " must implement OnMainFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + public interface OnMainFragmentInteractionListener { + void onCardItemClick(View v); + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 910cfe2..a396a43 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,10 +7,10 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context="com.munisystem.porst.MainActivity"> + tools:context=".MainActivityListener"> - + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..117bd74 --- /dev/null +++ b/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 47c8224..fc0fabf 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,10 @@ - 16dp 16dp + + 5dp + + 12dp + 16dp + 20dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dada89b..525edbe 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,9 @@ Porst + + + Hello blank fragment + 貸出 + 返却 + 状態 From 5705478a9e54acdbbd8a693738ce2df672226a65 Mon Sep 17 00:00:00 2001 From: Naoya Shibahara Date: Sun, 29 May 2016 15:16:47 +0900 Subject: [PATCH 3/3] Update layout context --- app/src/main/res/layout/activity_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a396a43..ece4869 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context=".MainActivityListener"> + tools:context=".MainActivity">