Skip to content
This repository was archived by the owner on Feb 20, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/uiDesigner.xml
/.idea/
5 changes: 4 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
<activity
android:name=".Account.SettingsActivity"
android:parentActivityName=".Account.MainActivity" />
<activity
android:name=".Account.AboutActivity"
android:parentActivityName=".Account.MainActivity" />
<activity
android:name=".Chat.StatusActivity"
android:parentActivityName=".Account.SettingsActivity" />
Expand Down Expand Up @@ -54,4 +57,4 @@
</activity>
</application>

</manifest>
</manifest>
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/layout/activity_about.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="ADD ABOUT HERE"
/>

</RelativeLayout>
19 changes: 12 additions & 7 deletions app/src/main/res/menu/main_menu.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/blog_btn"
android:title="Events" />
android:title="Events"/>

<item
android:id="@+id/main_settings_btn"
android:title="Account Settings" />
android:title="Account Settings"/>
<item
android:id="@+id/main_all_btn"
android:title="All Users" />
android:title="All Users"/>

<item
android:id="@+id/about_btn"
android:title="About"/>

<item
android:id="@+id/main_logout_btn"
android:title="@string/log_out" />
</menu>
android:title="@string/log_out"/>
</menu>