diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin index c42576e..53187b0 100644 Binary files a/.gradle/4.1/fileHashes/fileHashes.bin and b/.gradle/4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock index 8d14e4c..fb0d6e2 100644 Binary files a/.gradle/4.1/fileHashes/fileHashes.lock and b/.gradle/4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.1/fileHashes/resourceHashesCache.bin b/.gradle/4.1/fileHashes/resourceHashesCache.bin index 249220b..49e5ccc 100644 Binary files a/.gradle/4.1/fileHashes/resourceHashesCache.bin and b/.gradle/4.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin index c59eb3d..1f056e3 100644 Binary files a/.gradle/4.1/javaCompile/classAnalysis.bin and b/.gradle/4.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/4.1/javaCompile/jarAnalysis.bin b/.gradle/4.1/javaCompile/jarAnalysis.bin index a66b17e..93640ce 100644 Binary files a/.gradle/4.1/javaCompile/jarAnalysis.bin and b/.gradle/4.1/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock index 048c0ff..825bf23 100644 Binary files a/.gradle/4.1/javaCompile/javaCompile.lock and b/.gradle/4.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin index c7ac2fd..d3b1cf6 100644 Binary files a/.gradle/4.1/javaCompile/taskHistory.bin and b/.gradle/4.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/4.1/javaCompile/taskJars.bin b/.gradle/4.1/javaCompile/taskJars.bin index 2090e50..e47684a 100644 Binary files a/.gradle/4.1/javaCompile/taskJars.bin and b/.gradle/4.1/javaCompile/taskJars.bin differ diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin index e0827c5..1a0f445 100644 Binary files a/.gradle/4.1/taskHistory/fileSnapshots.bin and b/.gradle/4.1/taskHistory/fileSnapshots.bin differ diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin index 4fe2dd0..8a04782 100644 Binary files a/.gradle/4.1/taskHistory/taskHistory.bin and b/.gradle/4.1/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock index d263e3c..f88e85d 100644 Binary files a/.gradle/4.1/taskHistory/taskHistory.lock and b/.gradle/4.1/taskHistory/taskHistory.lock differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 89a4be1..7a43191 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + \ No newline at end of file diff --git a/CodeForGood2017.iml b/CodeForGood2017.iml deleted file mode 100644 index b56d48f..0000000 --- a/CodeForGood2017.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index c794134..9f461fd 100644 --- a/app/app.iml +++ b/app/app.iml @@ -50,13 +50,6 @@ - - - - - - - @@ -64,6 +57,13 @@ + + + + + + + @@ -91,6 +91,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index cea48b7..f7234c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,4 +34,5 @@ dependencies { } + apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2d8d56f..d63f9e4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,9 +17,7 @@ android:theme="@style/AppTheme"> - - + android:label="@string/app_name"> + - + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/justinsnellings/wholesomewaves/FirstFragment.java b/app/src/main/java/com/example/justinsnellings/wholesomewaves/FirstFragment.java new file mode 100644 index 0000000..02fa0ae --- /dev/null +++ b/app/src/main/java/com/example/justinsnellings/wholesomewaves/FirstFragment.java @@ -0,0 +1,23 @@ +package com.example.justinsnellings.wholesomewaves; + +import android.app.Fragment; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +/** + * Created by johnlandry on 11/4/17. + */ + +public class FirstFragment extends Fragment { + + View myView; + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) { + myView = inflater.inflate(R.layout.first_layout, container, false); + return myView; + } +} diff --git a/app/src/main/java/com/example/justinsnellings/wholesomewaves/MainActivity.java b/app/src/main/java/com/example/justinsnellings/wholesomewaves/MainActivity.java index 17954e2..d4e5d56 100644 --- a/app/src/main/java/com/example/justinsnellings/wholesomewaves/MainActivity.java +++ b/app/src/main/java/com/example/justinsnellings/wholesomewaves/MainActivity.java @@ -1,10 +1,14 @@ package com.example.justinsnellings.wholesomewaves; +import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; +import android.view.View; +import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; @@ -14,6 +18,11 @@ import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; +import java.io.InputStream; +import java.net.URL; + +import static android.provider.AlarmClock.EXTRA_MESSAGE; + public class MainActivity extends AppCompatActivity { private TextView mTextMessage; @@ -29,8 +38,17 @@ protected void onStart() { Toast.makeText(MainActivity.this, "current user: "+user, Toast.LENGTH_LONG).show(); + + if(user != null) { + Intent myIntent; + myIntent = new Intent(this, Slidemenubar.class); + startActivity(myIntent); + } } + + + private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener = new BottomNavigationView.OnNavigationItemSelectedListener() { @@ -61,4 +79,14 @@ protected void onCreate(Bundle savedInstanceState) { navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener); } + public static Drawable LoadImageFromWebOperations(String url) { + try { + InputStream is = (InputStream) new URL(url).getContent(); + Drawable d = Drawable.createFromStream(is, "src name"); + return d; + } catch (Exception e) { + return null; + } + } + } diff --git a/app/src/main/java/com/example/justinsnellings/wholesomewaves/SecondFragment.java b/app/src/main/java/com/example/justinsnellings/wholesomewaves/SecondFragment.java new file mode 100644 index 0000000..29e49d0 --- /dev/null +++ b/app/src/main/java/com/example/justinsnellings/wholesomewaves/SecondFragment.java @@ -0,0 +1,24 @@ +package com.example.justinsnellings.wholesomewaves; + +import android.app.Fragment; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + +/** + * Created by johnlandry on 11/4/17. + */ + +public class SecondFragment extends Fragment { + + View myView; + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) { + myView = inflater.inflate(R.layout.second_layout, container, false); + return myView; + } +} diff --git a/app/src/main/java/com/example/justinsnellings/wholesomewaves/Slidemenubar.java b/app/src/main/java/com/example/justinsnellings/wholesomewaves/Slidemenubar.java new file mode 100644 index 0000000..77bbf8f --- /dev/null +++ b/app/src/main/java/com/example/justinsnellings/wholesomewaves/Slidemenubar.java @@ -0,0 +1,104 @@ +package com.example.justinsnellings.wholesomewaves; + +import android.app.FragmentManager; +import android.content.Intent; +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.view.View; +import android.support.design.widget.NavigationView; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.Button; + +public class Slidemenubar extends AppCompatActivity + implements NavigationView.OnNavigationItemSelectedListener { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_slidemenubar); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = (FloatingActionButton) 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(); + } + }); + + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( + this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.addDrawerListener(toggle); + toggle.syncState(); + + NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + navigationView.setNavigationItemSelectedListener(this); + } + + @Override + public void onBackPressed() { + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + if (drawer.isDrawerOpen(GravityCompat.START)) { + drawer.closeDrawer(GravityCompat.START); + } else { + super.onBackPressed(); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.slidemenubar, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + @SuppressWarnings("StatementWithEmptyBody") + @Override + public boolean onNavigationItemSelected(MenuItem item) { + // Handle navigation view item clicks here. + int id = item.getItemId(); + + FragmentManager fragmentManager = getFragmentManager(); + + if (id == R.id.nav_first_layout) { + fragmentManager.beginTransaction().replace(R.id.content_frame, new FirstFragment()).commit(); + + } else if (id == R.id.nav_second_layout) { + fragmentManager.beginTransaction().replace(R.id.content_frame, new SecondFragment()).commit(); + + } else if (id == R.id.nav_share) { + + } else if (id == R.id.nav_send) { + + } + + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + return true; + } +} diff --git a/app/src/main/java/com/example/justinsnellings/wholesomewaves/qrcode.java b/app/src/main/java/com/example/justinsnellings/wholesomewaves/qrcode.java index 8b926d7..cafae67 100644 --- a/app/src/main/java/com/example/justinsnellings/wholesomewaves/qrcode.java +++ b/app/src/main/java/com/example/justinsnellings/wholesomewaves/qrcode.java @@ -1,5 +1,6 @@ package com.example.justinsnellings.wholesomewaves; +import android.app.Fragment; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.graphics.Bitmap; diff --git a/app/src/main/res/drawable-v21/ic_menu_camera.xml b/app/src/main/res/drawable-v21/ic_menu_camera.xml new file mode 100644 index 0000000..0d9ea10 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_camera.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable-v21/ic_menu_gallery.xml b/app/src/main/res/drawable-v21/ic_menu_gallery.xml new file mode 100644 index 0000000..f6872c4 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_gallery.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-v21/ic_menu_manage.xml b/app/src/main/res/drawable-v21/ic_menu_manage.xml new file mode 100644 index 0000000..c1be60b --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_manage.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/ic_menu_send.xml b/app/src/main/res/drawable-v21/ic_menu_send.xml new file mode 100644 index 0000000..00c668c --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_send.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-v21/ic_menu_share.xml b/app/src/main/res/drawable-v21/ic_menu_share.xml new file mode 100644 index 0000000..a28fb9e --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_share.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-v21/ic_menu_slideshow.xml b/app/src/main/res/drawable-v21/ic_menu_slideshow.xml new file mode 100644 index 0000000..209aa64 --- /dev/null +++ b/app/src/main/res/drawable-v21/ic_menu_slideshow.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml new file mode 100644 index 0000000..6d81870 --- /dev/null +++ b/app/src/main/res/drawable/side_nav_bar.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout-v17/content_slidemenubar.xml b/app/src/main/res/layout-v17/content_slidemenubar.xml new file mode 100644 index 0000000..d76fe58 --- /dev/null +++ b/app/src/main/res/layout-v17/content_slidemenubar.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d3f16c0..6b77dd7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,19 +1,19 @@ - diff --git a/app/src/main/res/layout/activity_slidemenubar.xml b/app/src/main/res/layout/activity_slidemenubar.xml new file mode 100644 index 0000000..f432833 --- /dev/null +++ b/app/src/main/res/layout/activity_slidemenubar.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/app/src/main/res/layout/app_bar_slidemenubar.xml b/app/src/main/res/layout/app_bar_slidemenubar.xml new file mode 100644 index 0000000..d64bf8e --- /dev/null +++ b/app/src/main/res/layout/app_bar_slidemenubar.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/content_slidemenubar.xml b/app/src/main/res/layout/content_slidemenubar.xml new file mode 100644 index 0000000..d76fe58 --- /dev/null +++ b/app/src/main/res/layout/content_slidemenubar.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/layout/first_layout.xml b/app/src/main/res/layout/first_layout.xml new file mode 100644 index 0000000..754e9b5 --- /dev/null +++ b/app/src/main/res/layout/first_layout.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_slidemenubar.xml b/app/src/main/res/layout/nav_header_slidemenubar.xml new file mode 100644 index 0000000..8f7c8ad --- /dev/null +++ b/app/src/main/res/layout/nav_header_slidemenubar.xml @@ -0,0 +1,28 @@ + + + + + + + + diff --git a/app/src/main/res/layout/second_layout.xml b/app/src/main/res/layout/second_layout.xml new file mode 100644 index 0000000..ceafae6 --- /dev/null +++ b/app/src/main/res/layout/second_layout.xml @@ -0,0 +1,36 @@ + + + + + +