v0.0.2

- Added intent switch - Bug Fixes Signed-off-by: ANIRUDH\Anirudh Mergu <[email protected]>
AnirudhMergu · Apr 26, 2018 · 6773026 · 6773026
1 parent 8146117
commit 6773026
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 14 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git 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
@@ -21,7 +21,16 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/title_activity_main"
-            android:theme="@style/AppTheme.NoActionBar"></activity>
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".CiphersActivity"
+            android:label="@string/title_activity_ciphers"
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/AppTheme.NoActionBar">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.anirudhmergu.jumble.MainActivity" />
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/anirudhmergu/jumble/CiphersActivity.java 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
@@ -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
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".CiphersActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            android:background="@color/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_ciphers" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:visibility="gone"
+        app:srcCompat="@android:drawable/ic_dialog_email" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -3,6 +3,6 @@
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,4 +9,5 @@
     <string name="nav_header_subtitle">[email protected]</string>
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
+    <string name="title_activity_ciphers">CiphersActivity</string>
 </resources>