diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 876ceb0..a01fa5b 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 32a728d..922767d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.anirudhmergu.jumble" minSdkVersion 19 targetSdkVersion 27 - versionCode 1 - versionName "0.0.1" + versionCode 2 + versionName "0.0.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b16269f..14dd560 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,16 @@ + android:theme="@style/AppTheme.NoActionBar" /> + + + \ No newline at end of file diff --git a/app/src/main/java/com/anirudhmergu/jumble/CiphersActivity.java b/app/src/main/java/com/anirudhmergu/jumble/CiphersActivity.java new file mode 100644 index 0000000..ec5a45f --- /dev/null +++ b/app/src/main/java/com/anirudhmergu/jumble/CiphersActivity.java @@ -0,0 +1,35 @@ +package com.anirudhmergu.jumble; + +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +public class CiphersActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_ciphers); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + }); + try { + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } catch (NullPointerException e) { + e.printStackTrace(); + } + + } + +} diff --git a/app/src/main/java/com/anirudhmergu/jumble/MainListAdapter.java b/app/src/main/java/com/anirudhmergu/jumble/MainListAdapter.java index 6285677..a4bbf79 100644 --- a/app/src/main/java/com/anirudhmergu/jumble/MainListAdapter.java +++ b/app/src/main/java/com/anirudhmergu/jumble/MainListAdapter.java @@ -1,6 +1,7 @@ package com.anirudhmergu.jumble; import android.content.Context; +import android.content.Intent; import android.support.annotation.NonNull; import android.support.design.widget.Snackbar; import android.support.v7.widget.CardView; @@ -34,12 +35,15 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { return viewHolder; } - public void clickedButton(View v, int position) { - /* + private void clickedButton(View v, int position) { + if(position == 0) { + Intent intent = new Intent(mContext, CiphersActivity.class); + mContext.startActivity(intent); } + /* else if(position == 1) { @@ -52,15 +56,16 @@ else if(position == 3) { } - else */ - Snackbar.make(v, "Clicked " + position, Snackbar.LENGTH_LONG) + else + + Snackbar.make(v, "Not yet implemented", Snackbar.LENGTH_LONG) .setAction("Action", null).show(); } @Override - public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { - + public void onBindViewHolder(@NonNull ViewHolder holder, int position) { + final int pos = position; ImageView image = holder.image; TextView category = holder.category; TextView description = holder.description; @@ -72,21 +77,21 @@ public void onBindViewHolder(@NonNull ViewHolder holder, final int position) { holder.image.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - clickedButton(v, position); + clickedButton(v, pos); } }); holder.category.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - clickedButton(v, position); + clickedButton(v, pos); } }); holder.description.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - clickedButton(v, position); + clickedButton(v, pos); } }); } @@ -103,7 +108,7 @@ public class ViewHolder extends RecyclerView.ViewHolder { TextView description; CardView mainCard; - public ViewHolder(View itemView) { + private ViewHolder(View itemView) { super(itemView); image = itemView.findViewById(R.id.main_category_image); category = itemView.findViewById(R.id.main_category_title); diff --git a/app/src/main/res/layout/activity_ciphers.xml b/app/src/main/res/layout/activity_ciphers.xml new file mode 100644 index 0000000..53b600a --- /dev/null +++ b/app/src/main/res/layout/activity_ciphers.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index fd7a058..640cf31 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -3,6 +3,6 @@ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3770515..034fcfa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,4 +9,5 @@ android.studio@android.com Navigation header Settings + CiphersActivity