From 2f22321e25e52a485d1434a7b9a11c3349363910 Mon Sep 17 00:00:00 2001
From: Aviran Abady <AviranAbady@users.noreply.github.com>
Date: Thu, 10 Sep 2020 16:00:16 +0300
Subject: [PATCH] Migrated sample to Kotlin

---
 README.md                                     |  50 +++++--
 app/build.gradle                              |  14 ++
 app/src/main/AndroidManifest.xml              |   6 +-
 ...ainActivity.java => JavaDemoFragment.java} |  71 ++++++----
 .../cookiebarsample/JavaSampleActivity.java   |  27 ++++
 .../aviran/cookiebarsample/MainActivity.kt    |  13 ++
 .../aviran/cookiebarsample/MainFragment.kt    | 130 ++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     | 116 +++++-----------
 app/src/main/res/layout/fragment_layout.xml   |  98 +++++++++++++
 app/src/main/res/navigation/nav_graph.xml     |  13 ++
 app/src/main/res/values/dimens.xml            |   3 +
 app/src/main/res/values/strings.xml           |  10 ++
 app/src/main/res/values/styles.xml            |   9 ++
 build.gradle                                  |   4 +
 14 files changed, 443 insertions(+), 121 deletions(-)
 rename app/src/main/java/org/aviran/cookiebarsample/{MainActivity.java => JavaDemoFragment.java} (78%)
 create mode 100644 app/src/main/java/org/aviran/cookiebarsample/JavaSampleActivity.java
 create mode 100644 app/src/main/java/org/aviran/cookiebarsample/MainActivity.kt
 create mode 100644 app/src/main/java/org/aviran/cookiebarsample/MainFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_layout.xml
 create mode 100644 app/src/main/res/navigation/nav_graph.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/README.md b/README.md
index 62f63f2..9360721 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ CookieBar.build(activity)           // Provide activity, using this@MainActivity
 ```
 ### Using Java
 ```java
-CookieBar.build(MainActivity.this)
+CookieBar.build(getactivty())
          .setTitle("TITLE")
          .setMessage("MESSAGE")
          .setCookiePosition(CookieBar.BOTTOM)  // Cookie will be displayed at the bottom
@@ -47,41 +47,61 @@ CookieBar.build(MainActivity.this)
 ```
 
 ## Customize colors, icon, icon animation, call to action button, display duration
-```java
-CookieBar.build(MainActivity.this)
+```kotlin
+CookieBar.build(activity)
          .setTitle(R.string.title)
          .setTitleColor(R.color.green)
          .setIcon(R.drawable.icon)
          .setIconAnimation(R.animator.spin)
          .setMessage(R.string.message)
-         .setAction(R.string.action_text, new OnActionClickListener() {
-             @Override
-             public void onClick() {
-                // Do something
-             }
-         })
+         .setAction(R.string.action_text) { 
+              // Action code - Do something
+         }
          .setDuration(5000) // 5 seconds
-         .show();
+         .show()
 ```
 
 ## Customize in/out animation
-```java
-CookieBar.build(MainActivity.this)
+```kotlin
+CookieBar.build(activity)
          .setTitle(R.string.title)
          .setMessage(R.string.message)
          .setAnimationIn(android.R.anim.slide_in_left, android.R.anim.slide_in_left)
          .setAnimationOut(android.R.anim.slide_out_right, android.R.anim.slide_out_right)
-         .show();
+         .show()
 ```
 
 ## Programmatically dismiss cookies currently being displayed
-```java
-CookieBar.dismiss(MainActivity.this);
+```kotlin
+CookieBar.dismiss(activity)
 
 ```
 
 
 ## Create a cookie with a custom layout - Create a dialog!
+```kotlin
+CookieBar.build(activity)
+         .setCustomView(R.layout.custom_cookie)
+         .setCustomViewInitializer { view ->
+             val btnNew = view.findViewById<Button>(R.id.custom_cookie_btn_new)
+             val btnOpen = view.findViewById<Button>(R.id.custom_cookie_btn_open)
+             val btnSave = view.findViewById<Button>(R.id.custom_cookie_btn_save)
+             val btnListener = View.OnClickListener { view ->
+                 val button = view as Button
+                 button.setText(R.string.clicked)
+             }
+             btnNew.setOnClickListener(btnListener)
+             btnOpen.setOnClickListener(btnListener)
+             btnSave.setOnClickListener(btnListener)
+         }
+         .setAction("Close") { CookieBar.dismiss(activity) }
+         .setTitle(R.string.custom_view_cookie_title)
+         .setMessage(R.string.custom_view_cookie_message)
+         .setEnableAutoDismiss(false)
+         .setSwipeToDismiss(false)
+         .setCookiePosition(Gravity.BOTTOM)
+         .show()
+```
 ```java
 /* setCustomView -  Set the layout resource for your custom cookie view.
    setCustomViewInitializer - Called after layout inflation, for subview setup. */
diff --git a/app/build.gradle b/app/build.gradle
index bf488ff..e6942a1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
@@ -17,10 +19,22 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2ffb650..7ec0c58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,8 +7,12 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/org/aviran/cookiebarsample/MainActivity.java b/app/src/main/java/org/aviran/cookiebarsample/JavaDemoFragment.java
similarity index 78%
rename from app/src/main/java/org/aviran/cookiebarsample/MainActivity.java
rename to app/src/main/java/org/aviran/cookiebarsample/JavaDemoFragment.java
index 131454d..f9002d0 100644
--- a/app/src/main/java/org/aviran/cookiebarsample/MainActivity.java
+++ b/app/src/main/java/org/aviran/cookiebarsample/JavaDemoFragment.java
@@ -1,30 +1,55 @@
 package org.aviran.cookiebarsample;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import org.aviran.cookiebar2.CookieBar;
 import org.aviran.cookiebar2.CookieBarDismissListener;
 import org.aviran.cookiebar2.OnActionClickListener;
 
-public class MainActivity extends AppCompatActivity {
+import java.util.concurrent.TimeoutException;
 
-    int topCookieCounter = 0;
+public class JavaDemoFragment extends Fragment {
+
+    private int topCookieCounter = 0;
+    private TextView infoTextView;
+
+    public JavaDemoFragment() {
+        // Required empty public constructor
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+    }
 
-        Button btnTop = findViewById(R.id.btn_top);
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_layout, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View rootView, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        this.infoTextView = rootView.findViewById(R.id.infoTextView);
+
+        Button btnTop = rootView.findViewById(R.id.btnTop);
         btnTop.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                CookieBar.build(MainActivity.this)
+                CookieBar.build(getActivity())
                         .setTitle(R.string.top_cookie_title)
                         .setTitleColor(R.color.yellow)
                         .setMessage(getString(R.string.top_cookie_message, ++topCookieCounter))
@@ -54,18 +79,18 @@ public void onDismiss(int dismissType) {
 
                                 }
 
-                                Toast.makeText(MainActivity.this, desc, Toast.LENGTH_LONG).show();
+                                infoTextView.setText(desc);
                             }
                         })
                         .show();
             }
         });
 
-        final Button btnBottom = findViewById(R.id.btn_bottom);
+        final Button btnBottom = rootView.findViewById(R.id.btnBottom);
         btnBottom.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                CookieBar.build(MainActivity.this)
+                CookieBar.build(getActivity())
                         .setDuration(5000)
                         .setTitle(R.string.bottom_cookie_title)
                         .setIcon(R.mipmap.ic_launcher)
@@ -77,7 +102,7 @@ public void onClick(View view) {
                         .setAction(R.string.cookie_action, new OnActionClickListener() {
                             @Override
                             public void onClick() {
-                                Toast.makeText(getApplicationContext(), "Action Engaged!", Toast.LENGTH_LONG).show();
+                               infoTextView.setText(R.string.action_engaged);
                             }
                         })
                         .show();
@@ -85,11 +110,11 @@ public void onClick() {
         });
 
 
-        Button btnCustomAnimation = findViewById(R.id.btn_custom_anim);
+        Button btnCustomAnimation = rootView.findViewById(R.id.btnCustomAnim);
         btnCustomAnimation.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                CookieBar.build(MainActivity.this)
+                CookieBar.build(getActivity())
                         .setTitle(R.string.custom_anim_cookie_title)
                         .setMessage(R.string.custom_anim_cookie_message)
                         .setIcon(R.drawable.ic_android_white_48dp)
@@ -103,11 +128,11 @@ public void onClick(View view) {
         });
 
 
-        Button btnBottomAnimated = findViewById(R.id.btn_bottom_animated);
+        Button btnBottomAnimated = rootView.findViewById(R.id.btnBottomAnimated);
         btnBottomAnimated.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                CookieBar.build(MainActivity.this)
+                CookieBar.build(getActivity())
                         .setTitle(R.string.fancy_cookie_title)
                         .setMessage(R.string.fancy_cookie_message)
                         .setIcon(R.drawable.ic_settings_white_48dp)
@@ -121,20 +146,20 @@ public void onClick(View view) {
                         .setAction("OPEN SETTINGS", new OnActionClickListener() {
                             @Override
                             public void onClick() {
-                                Toast.makeText(getApplicationContext(), "Action Engaged!", Toast.LENGTH_LONG).show();
+                                infoTextView.setText(R.string.action_engaged);
                             }
                         })
                         .show();
             }
         });
 
-        Button btnCustomView = findViewById(R.id.btn_custom_view);
+        Button btnCustomView = rootView.findViewById(R.id.btnCustomView);
         btnCustomView.setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View view) {
 
-                CookieBar.build(MainActivity.this)
+                CookieBar.build(getActivity())
                         .setCustomView(R.layout.custom_cookie)
                         .setCustomViewInitializer(new CookieBar.CustomViewInitializer() {
                             @Override
@@ -161,7 +186,7 @@ public void onClick(View view) {
                         .setAction("Close", new OnActionClickListener() {
                             @Override
                             public void onClick() {
-                                CookieBar.dismiss(MainActivity.this);
+                                CookieBar.dismiss(getActivity());
                             }
                         })
                         .setTitle(R.string.custom_view_cookie_title)
@@ -173,13 +198,11 @@ public void onClick() {
             }
         });
 
-        findViewById(R.id.activity_main).setOnClickListener(new View.OnClickListener() {
+        rootView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                CookieBar.dismiss(MainActivity.this);
+                CookieBar.dismiss(getActivity());
             }
         });
-
-
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/aviran/cookiebarsample/JavaSampleActivity.java b/app/src/main/java/org/aviran/cookiebarsample/JavaSampleActivity.java
new file mode 100644
index 0000000..895e6c1
--- /dev/null
+++ b/app/src/main/java/org/aviran/cookiebarsample/JavaSampleActivity.java
@@ -0,0 +1,27 @@
+package org.aviran.cookiebarsample;
+
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import org.aviran.cookiebar2.CookieBar;
+import org.aviran.cookiebar2.CookieBarDismissListener;
+import org.aviran.cookiebar2.OnActionClickListener;
+
+public class JavaSampleActivity extends AppCompatActivity {
+
+    int topCookieCounter = 0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+
+
+
+    }
+}
diff --git a/app/src/main/java/org/aviran/cookiebarsample/MainActivity.kt b/app/src/main/java/org/aviran/cookiebarsample/MainActivity.kt
new file mode 100644
index 0000000..e7c5f8d
--- /dev/null
+++ b/app/src/main/java/org/aviran/cookiebarsample/MainActivity.kt
@@ -0,0 +1,13 @@
+package org.aviran.cookiebarsample
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        setSupportActionBar(findViewById(R.id.toolbar))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/aviran/cookiebarsample/MainFragment.kt b/app/src/main/java/org/aviran/cookiebarsample/MainFragment.kt
new file mode 100644
index 0000000..a6929bd
--- /dev/null
+++ b/app/src/main/java/org/aviran/cookiebarsample/MainFragment.kt
@@ -0,0 +1,130 @@
+package org.aviran.cookiebarsample
+
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import kotlinx.android.synthetic.main.fragment_layout.*
+import org.aviran.cookiebar2.CookieBar
+import org.aviran.cookiebar2.CookieBarDismissListener.DismissType
+
+/**
+ * A simple [Fragment] subclass as the default destination in the navigation.
+ */
+class MainFragment : Fragment() {
+
+    var topCookieCounter = 0
+
+    override fun onCreateView(
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_layout, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        btnTop.setOnClickListener {
+            CookieBar.build(activity)
+                    .setTitle(R.string.top_cookie_title)
+                    .setTitleColor(R.color.yellow)
+                    .setMessage(getString(R.string.top_cookie_message, ++topCookieCounter))
+                    .setIcon(R.drawable.ic_android_white_48dp)
+                    .setDuration(5000)
+                    .setCookieListener { dismissType ->
+                        var desc = ""
+                        when (dismissType) {
+                            DismissType.DURATION_COMPLETE -> desc = "Cookie display duration completed"
+                            DismissType.USER_DISMISS -> desc = "Cookie dismissed by user"
+                            DismissType.USER_ACTION_CLICK -> desc = "Cookie dismissed by action click"
+                            DismissType.PROGRAMMATIC_DISMISS -> desc = "Cookie dismissed programmatically"
+                            DismissType.REPLACE_DISMISS -> desc = "Replaced by new cookie"
+                        }
+                        infoTextView.text = desc
+                    }
+                    .show()
+        }
+
+        btnBottom.setOnClickListener {
+            CookieBar.build(activity)
+                    .setDuration(5000)
+                    .setTitle(R.string.bottom_cookie_title)
+                    .setIcon(R.mipmap.ic_launcher)
+                    .setMessage(R.string.bottom_cookie_message)
+                    .setBackgroundColor(R.color.colorPrimary)
+                    .setActionColor(R.color.yellow)
+                    .setTitleColor(R.color.yellow)
+                    .setCookiePosition(CookieBar.BOTTOM)
+                    .setAction(R.string.cookie_action) {
+                        infoTextView.text = getString(R.string.action_engaged)
+                    }
+                    .show()
+        }
+
+        btnCustomAnim.setOnClickListener {
+            CookieBar.build(activity)
+                    .setTitle(R.string.custom_anim_cookie_title)
+                    .setMessage(R.string.custom_anim_cookie_message)
+                    .setIcon(R.drawable.ic_android_white_48dp)
+                    .setMessageColor(R.color.liteblue)
+                    .setBackgroundColor(R.color.orange)
+                    .setDuration(5000)
+                    .setAnimationIn(android.R.anim.slide_in_left, android.R.anim.slide_in_left)
+                    .setAnimationOut(android.R.anim.slide_out_right, android.R.anim.slide_out_right)
+                    .show()
+        }
+
+
+        btnBottomAnimated.setOnClickListener {
+            CookieBar.build(activity)
+                    .setTitle(R.string.fancy_cookie_title)
+                    .setMessage(R.string.fancy_cookie_message)
+                    .setIcon(R.drawable.ic_settings_white_48dp)
+                    .setIconAnimation(R.animator.iconspin)
+                    .setTitleColor(R.color.fancyTitle)
+                    .setActionColor(R.color.fancyAction)
+                    .setMessageColor(R.color.fancyMessage)
+                    .setBackgroundColor(R.color.fancyBackground)
+                    .setDuration(5000)
+                    .setCookiePosition(CookieBar.BOTTOM)
+                    .setAction("OPEN SETTINGS") {
+                        infoTextView.text = getString(R.string.action_engaged)
+                    }
+                    .show()
+        }
+
+        btnCustomView.setOnClickListener {
+            CookieBar.build(activity)
+                    .setCustomView(R.layout.custom_cookie)
+                    .setCustomViewInitializer { view ->
+                        val btnNew = view.findViewById<Button>(R.id.custom_cookie_btn_new)
+                        val btnOpen = view.findViewById<Button>(R.id.custom_cookie_btn_open)
+                        val btnSave = view.findViewById<Button>(R.id.custom_cookie_btn_save)
+                        val btnListener = View.OnClickListener { view ->
+                            val button = view as Button
+                            button.setText(R.string.clicked)
+                        }
+                        btnNew.setOnClickListener(btnListener)
+                        btnOpen.setOnClickListener(btnListener)
+                        btnSave.setOnClickListener(btnListener)
+                    }
+                    .setAction("Close") { CookieBar.dismiss(activity) }
+                    .setTitle(R.string.custom_view_cookie_title)
+                    .setMessage(R.string.custom_view_cookie_message)
+                    .setEnableAutoDismiss(false)
+                    .setSwipeToDismiss(false)
+                    .setCookiePosition(Gravity.BOTTOM)
+                    .show()
+        }
+
+        rootView.setOnClickListener {
+            CookieBar.dismiss(activity)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 329578e..9bc8946 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,88 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.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:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:clickable="true"
-    android:focusable="true"
-    android:gravity="center"
-    android:orientation="vertical">
+    tools:context=".MainActivity">
 
-    <ImageView
-        android:id="@+id/cookie_monster"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:src="@drawable/cookiemonster"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/btn_top"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:padding="20dp"
-        android:text="@string/top_cookie"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <Button
-        android:id="@+id/btn_bottom"
-        android:layout_width="200dp"
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:padding="20dp"
-        android:text="@string/bottom_cookie"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_top" />
-
-    <Button
-        android:id="@+id/btn_custom_anim"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:padding="20dp"
-        android:text="@string/custom_animations"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_bottom" />
-
-
-    <Button
-        android:id="@+id/btn_bottom_animated"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:padding="20dp"
-        android:text="@string/fancy_bottom_cookie"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_custom_anim" />
-
-
-    <Button
-        android:id="@+id/btn_custom_view"
-        android:layout_width="200dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:padding="20dp"
-        android:text="@string/custom_view_cookie"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_bottom_animated" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <fragment
+            android:id="@+id/nav_host_fragment"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:defaultNavHost="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navGraph="@navigation/nav_graph" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_layout.xml b/app/src/main/res/layout/fragment_layout.xml
new file mode 100644
index 0000000..f464373
--- /dev/null
+++ b/app/src/main/res/layout/fragment_layout.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/rootView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/cookie_monster"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
+        android:src="@drawable/cookiemonster"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/btnTop"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="20dp"
+        android:text="@string/top_cookie"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <Button
+        android:id="@+id/btnBottom"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="20dp"
+        android:text="@string/bottom_cookie"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnTop" />
+
+    <Button
+        android:id="@+id/btnCustomAnim"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="20dp"
+        android:text="@string/custom_animations"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnBottom" />
+
+
+    <Button
+        android:id="@+id/btnBottomAnimated"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="20dp"
+        android:text="@string/fancy_bottom_cookie"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnCustomAnim" />
+
+
+    <Button
+        android:id="@+id/btnCustomView"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:padding="20dp"
+        android:text="@string/custom_view_cookie"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnBottomAnimated" />
+
+    <TextView
+        android:id="@+id/infoTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btnCustomView"
+        tools:text="Information TextView" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..d66bcff
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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:id="@+id/nav_graph"
+    app:startDestination="@id/FirstFragment">
+
+    <fragment
+        android:id="@+id/FirstFragment"
+        android:name="org.aviran.cookiebarsample.MainFragment"
+        android:label="@string/main_fragment_label"
+        tools:layout="@layout/fragment_layout"/>
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..125df87
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 589bfcd..6a7da19 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,5 +26,15 @@
     <string name="custom_view_cookie">Custom View Cookie</string>
     <string name="custom_message">Custom message</string>
     <string name="custom_title">Custom Title</string>
+    <string name="title_activity_main2">MainActivity</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="main_fragment_label">Main Fragment</string>
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+
+    <string name="hello_first_fragment">Hello first fragment</string>
+    <string name="action_engaged">Action engaged!</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fba9ffd..e11d11a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,5 +8,14 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
 
 </resources>
diff --git a/build.gradle b/build.gradle
index f8d83e8..e73f005 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        kotlin_version = '1.3.72'
+    }
     repositories {
         jcenter()
         google()
@@ -9,6 +12,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }