From 1c52eaef5ec963828e4be91319037b2f1014c4c5 Mon Sep 17 00:00:00 2001 From: Mary Huerta Date: Fri, 8 Feb 2019 18:34:23 -0600 Subject: [PATCH 1/7] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..83eae1d --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Sloth +Markdown note taking for Mobi +### Hi From d8d02ada135e0d607c3c98af1489b4462b7ce082 Mon Sep 17 00:00:00 2001 From: Mary Huerta Date: Fri, 8 Feb 2019 18:48:27 -0600 Subject: [PATCH 2/7] Update README.md --- README.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 83eae1d..405067c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ # Sloth -Markdown note taking for Mobi -### Hi + +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/) + From f7715264f6604cd472c1f44028216d8496a9fd22 Mon Sep 17 00:00:00 2001 From: Sean Date: Fri, 8 Feb 2019 23:51:23 -0600 Subject: [PATCH 3/7] one of the buttons is up --- .../me/koltensturgill/sloth/MainActivity.java | 9 +++++++++ .../sloth/ui/editor/EditorFragment.java | 1 + app/src/main/res/layout/activity_main.xml | 3 ++- app/src/main/res/layout/content_main.xml | 15 ++++++++++++++- app/src/main/res/layout/editor_fragment.xml | 11 +++++++++++ build.gradle | 2 +- 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/me/koltensturgill/sloth/MainActivity.java b/app/src/main/java/me/koltensturgill/sloth/MainActivity.java index 346a9e1..c8d470a 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,14 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); + Button button = (Button) findViewById (R.id.button); + button.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/me/koltensturgill/sloth/ui/editor/EditorFragment.java b/app/src/main/java/me/koltensturgill/sloth/ui/editor/EditorFragment.java index a06f1cc..a8d9e3a 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 @@ -23,6 +23,7 @@ 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); } 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..e766372 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -6,4 +6,17 @@ 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"> + +