From 6784b5cc8bc170264394858db3e6cc67de873721 Mon Sep 17 00:00:00 2001 From: Serghei Ceacal Date: Thu, 25 Oct 2018 21:51:37 +0300 Subject: [PATCH 1/3] Configure .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 309977d..59fbb1b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ .idea/dataSources.ids .idea/sqlDataSources.xml .idea/dynamic.xml -.idea/uiDesigner.xml \ No newline at end of file +.idea/uiDesigner.xml +/.idea/ From a289b700e8c19fad284115259ee32b3a111ddb15 Mon Sep 17 00:00:00 2001 From: Serghei Ceacal Date: Thu, 25 Oct 2018 22:16:15 +0300 Subject: [PATCH 2/3] Add about to menu and create empty AboutActivity --- app/src/main/AndroidManifest.xml | 5 +++- .../techbmechat/Account/AboutActivity.java | 16 ++++++++++ .../techbmechat/Account/MainActivity.java | 12 ++++---- .../techbmechat/Blog/BlogActivity.java | 30 ++++--------------- app/src/main/res/layout/activity_about.xml | 16 ++++++++++ app/src/main/res/menu/main_menu.xml | 19 +++++++----- 6 files changed, 59 insertions(+), 39 deletions(-) create mode 100644 app/src/main/java/tech/honeysharma/techbmechat/Account/AboutActivity.java create mode 100644 app/src/main/res/layout/activity_about.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dde03c9..b226ee4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,6 +24,9 @@ + @@ -54,4 +57,4 @@ - \ No newline at end of file + diff --git a/app/src/main/java/tech/honeysharma/techbmechat/Account/AboutActivity.java b/app/src/main/java/tech/honeysharma/techbmechat/Account/AboutActivity.java new file mode 100644 index 0000000..2f1351e --- /dev/null +++ b/app/src/main/java/tech/honeysharma/techbmechat/Account/AboutActivity.java @@ -0,0 +1,16 @@ +package tech.honeysharma.techbmechat.Account; + +import android.os.Bundle; +import android.os.PersistableBundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; +import tech.honeysharma.techbmechat.R; + +public class AboutActivity extends AppCompatActivity { + + @Override + public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) { + super.onCreate(savedInstanceState, persistentState); + setContentView(R.layout.activity_about); + } +} diff --git a/app/src/main/java/tech/honeysharma/techbmechat/Account/MainActivity.java b/app/src/main/java/tech/honeysharma/techbmechat/Account/MainActivity.java index 335015b..3578da9 100644 --- a/app/src/main/java/tech/honeysharma/techbmechat/Account/MainActivity.java +++ b/app/src/main/java/tech/honeysharma/techbmechat/Account/MainActivity.java @@ -1,29 +1,22 @@ package tech.honeysharma.techbmechat.Account; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.support.design.widget.Snackbar; import android.os.Bundle; import android.support.design.widget.TabLayout; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; -import android.view.View; - import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseUser; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.ServerValue; - import tech.honeysharma.techbmechat.Blog.BlogActivity; import tech.honeysharma.techbmechat.Chat.UsersActivity; import tech.honeysharma.techbmechat.R; -import tech.honeysharma.techbmechat.Utility.Utility; public class MainActivity extends AppCompatActivity { @@ -159,6 +152,11 @@ public boolean onOptionsItemSelected(MenuItem item) { } + if (item.getItemId() == R.id.about_btn) { + Intent settingsIntent = new Intent(MainActivity.this, UsersActivity.class); + startActivity(settingsIntent); + } + return true; } } diff --git a/app/src/main/java/tech/honeysharma/techbmechat/Blog/BlogActivity.java b/app/src/main/java/tech/honeysharma/techbmechat/Blog/BlogActivity.java index 15bfbc8..8655f9f 100644 --- a/app/src/main/java/tech/honeysharma/techbmechat/Blog/BlogActivity.java +++ b/app/src/main/java/tech/honeysharma/techbmechat/Blog/BlogActivity.java @@ -1,45 +1,22 @@ package tech.honeysharma.techbmechat.Blog; -import android.app.AlertDialog; -import android.app.ProgressDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.design.widget.TabLayout; import android.support.v4.app.NavUtils; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.ImageButton; -import android.widget.ImageView; -import android.widget.TextView; -import android.widget.Toast; - -import com.firebase.ui.database.FirebaseRecyclerAdapter; import com.google.firebase.auth.FirebaseAuth; -import com.google.firebase.database.DataSnapshot; -import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; -import com.google.firebase.database.Query; import com.google.firebase.database.ServerValue; -import com.google.firebase.database.ValueEventListener; -import com.squareup.picasso.Picasso; - -import java.util.ArrayList; -import java.util.List; - -import tech.honeysharma.techbmechat.Account.MainActivity; +import tech.honeysharma.techbmechat.Account.AboutActivity; import tech.honeysharma.techbmechat.Account.SettingsActivity; import tech.honeysharma.techbmechat.Account.StartActivity; import tech.honeysharma.techbmechat.Chat.UsersActivity; @@ -156,6 +133,11 @@ public boolean onOptionsItemSelected(MenuItem item) { } + if (item.getItemId() == R.id.about_btn) { + Intent settingsIntent = new Intent(BlogActivity.this, AboutActivity.class); + startActivity(settingsIntent); + } + if (item.getItemId() == android.R.id.home) { NavUtils.navigateUpFromSameTask(this); } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml new file mode 100644 index 0000000..b99f405 --- /dev/null +++ b/app/src/main/res/layout/activity_about.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 61fdde3..98cc3ad 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -1,18 +1,23 @@ - + + android:title="Events"/> + android:title="Account Settings"/> + android:title="All Users"/> + + + - \ No newline at end of file + android:title="@string/log_out"/> + From 8c720bd3e19b79716ede81ba40655f85c40e3bba Mon Sep 17 00:00:00 2001 From: Serghei Ceacal Date: Thu, 25 Oct 2018 22:32:00 +0300 Subject: [PATCH 3/3] Change parent activity for AboutActivity in manifest --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b226ee4..783b116 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,7 @@ android:parentActivityName=".Account.MainActivity" /> + android:parentActivityName=".Account.MainActivity" />