diff --git a/README.md b/README.md new file mode 100644 index 0000000..405067c --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +# Sloth + +Sloth is a Android note taking app devloped by Mobi Social Coding Team +### developed by these Collaborators: + +## Getting Started with Github +First of all WELCOME! Github is an amazing tool for collaborating with people and making sure you never lose your code to life's little disaters! Here's a couple of things to help you get started: +- First thing's first: [Here's where to download git](https://git-scm.com/book/en/v1/Getting-Started-Installing-Git) +- This is a super helpful tutorial +- if you don't feel comfortable working with the command line (ie the terminal, windows powershell) [Github has a desktop version](https://desktop.github.com/) + +## Making Those PRs +- Why make a PR? +-- 1st PR: Free Mobi Sticker +-- 3rd PR: Added to collaborator section on this repo, Added as a member to the Mobi Github Org +-- 100th PR: adopt a UTA Squirrel or Cat (Do not pet pls) +- [A guide to Making your first PR](https://www.thinkful.com/learn/github-pull-request-tutorial/) + +## Getting Started with Android + - [Download Android Studio Here](https://developer.android.com/studio/) + - [Free Android Course](https://www.udacity.com/course/new-android-fundamentals--ud851) + - [Android Tutorials Point](https://www.tutorialspoint.com/android/) + - [Android's Documentation](https://developer.android.com/docs/) + diff --git a/app/src/main/java/me/koltensturgill/sloth/MainActivity.java b/app/src/main/java/me/koltensturgill/sloth/MainActivity.java index 346a9e1..b49cb2c 100644 --- a/app/src/main/java/me/koltensturgill/sloth/MainActivity.java +++ b/app/src/main/java/me/koltensturgill/sloth/MainActivity.java @@ -14,6 +14,7 @@ import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import android.widget.Button; import android.widget.EditText; import android.widget.Toast; @@ -32,6 +33,16 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); + //sean edited this + //the button id is located in content_main + Button button2 = (Button) findViewById (R.id.button2); + button2.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + // do something + Toast.makeText(MainActivity.this, "Goodbye now!", Toast.LENGTH_SHORT).show(); + } + }); + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); final Intent intent = new Intent(this, Editor.class); diff --git a/app/src/main/java/Note.java b/app/src/main/java/me/koltensturgill/sloth/Model/Note.java similarity index 96% rename from app/src/main/java/Note.java rename to app/src/main/java/me/koltensturgill/sloth/Model/Note.java index a42f391..abbc860 100644 --- a/app/src/main/java/Note.java +++ b/app/src/main/java/me/koltensturgill/sloth/Model/Note.java @@ -1,3 +1,5 @@ +package me.koltensturgill.sloth.Model; + import java.util.ArrayList; public class Note { diff --git a/app/src/main/java/me/koltensturgill/sloth/ui/editor/EditorFragment.java b/app/src/main/java/me/koltensturgill/sloth/ui/editor/EditorFragment.java index a06f1cc..8dc9f04 100644 --- a/app/src/main/java/me/koltensturgill/sloth/ui/editor/EditorFragment.java +++ b/app/src/main/java/me/koltensturgill/sloth/ui/editor/EditorFragment.java @@ -5,6 +5,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,6 +16,9 @@ public class EditorFragment extends Fragment { private EditorViewModel mViewModel; + //sean left off here, was trying to get the data the user types... + //EditText editText = (EditText) findViewById(R.id.editText); + public static EditorFragment newInstance() { return new EditorFragment(); } @@ -23,6 +27,11 @@ public static EditorFragment newInstance() { @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + + + + + return inflater.inflate(R.layout.editor_fragment, container, false); } @@ -33,4 +42,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { // TODO: Use the ViewModel } + + + + } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a61d8a6..c00346b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,6 +20,7 @@ android:layout_gravity="start" android:fitsSystemWindows="true" app:headerLayout="@layout/nav_header_main" - app:menu="@menu/activity_main_drawer" /> + app:menu="@menu/activity_main_drawer" + /> diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index b474202..c4732d2 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -6,4 +6,16 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:context=".MainActivity" - tools:showIn="@layout/app_bar_main"/> \ No newline at end of file + tools:showIn="@layout/app_bar_main"> + +