Skip to content

-completed android navigation #1

Merged
merged 1 commit into from
Feb 11, 2021
Merged
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
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 14 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,26 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.StormWaterUtilityAndroid">
<activity
android:name=".MainActivity"
android:label="@string/app_name">
<activity android:name=".Settings"></activity>

<activity android:name=".MainMenu" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".Reset_password"/>
<activity android:name=".SampleFordm"/>
<activity android:name=".Login"/>
<activity android:name=".SignUp"/>
<activity
android:name=".WaterWay.WaterWayNav"
>
</activity>
<activity android:name=".Construction.ConstructionNav">

</activity>
<activity android:name=".Reset_password" />
<activity android:name=".SampleFordm" />
<activity android:name=".Login" />
<activity android:name=".SignUp" />
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
package com.sf.stormwaterutilityandroid.notifications;
package com.sf.stormwaterutilityandroid.Construction;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;

import com.sf.stormwaterutilityandroid.R;


public class NotificationsFragment extends Fragment {
public class ConstructionFormFragment extends Fragment {


public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {

View root = inflater.inflate(R.layout.fragment_notifications, container, false);
final TextView textView = root.findViewById(R.id.text_notifications);


View root = inflater.inflate(R.layout.fragment_home, container, false);

return root;

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
package com.sf.stormwaterutilityandroid.Construction;

import android.os.Bundle;
import android.view.MenuItem;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;

import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.firebase.auth.FirebaseAuth;
import com.sf.stormwaterutilityandroid.R;
import com.sf.stormwaterutilityandroid.WaterWay.WaterWayFormFragment;
import com.sf.stormwaterutilityandroid.WaterWay.WaterWayReportFragment;

public class ConstructionNav extends AppCompatActivity {
private TextView mTextMessage;
private FirebaseAuth auth;
final Fragment fragment1 = new ConstructionFormFragment();
final Fragment fragment2 = new ConstructionReportsFragment();

// final Fragment fragment4 = new Admin_fragment();
// final Fragment fragment5 = new HR_fragment();
final FragmentManager fm = getSupportFragmentManager();
Fragment active = fragment1;
private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
= new BottomNavigationView.OnNavigationItemSelectedListener() {

@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.constructionHome:
// mTextMessage.setText(R.string.title_home);
fm.beginTransaction().hide(active).show(fragment1).commit();

active = fragment1;
fm.popBackStack();
return true;
case R.id.constructionReports:
// mTextMessage.setText(R.string.title_dashboard);
fm.beginTransaction().hide(active).show(fragment2).commit();
active = fragment2;
fm.popBackStack();
return true;


}
return false;
}
};

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_construction);

// Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
//setSupportActionBar(toolbar);


BottomNavigationView navigation = findViewById(R.id.navigationConstruction);
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
// fm.beginTransaction().add(R.id.main_container, fragment5, "5").hide(fragment5).commit();
// fm.beginTransaction().add(R.id.main_container, fragment4, "4").hide(fragment4).commit();

fm.beginTransaction().add(R.id.main_containerConstruction, fragment2, "2").hide(fragment2).commit();
fm.beginTransaction().add(R.id.main_containerConstruction, fragment1, "1").commit();

}

/* @Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
signout2 = (Button) findViewById(R.id.sign_out);

signout2.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
FirebaseAuth.getInstance().signOut();
startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, LoginActivity.class));
finish();
}
});


mTextMessage = (TextView) findViewById(R.id.message);
BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation);
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);

}

FirebaseAuth.AuthStateListener authListener = new FirebaseAuth.AuthStateListener() {
@SuppressLint("SetTextI18n")
@Override
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
FirebaseUser user = firebaseAuth.getCurrentUser();
if (user == null) {
// user auth state is changed - user is null
// launch login activity
startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, LoginActivity.class));
finish();
}
}


};
// public void signout (View v){
// signOut();
//}
/*
public void signOut() {
auth.signOut();


// this listener will be called when there is change in firebase user session
FirebaseAuth.AuthStateListener authListener = new FirebaseAuth.AuthStateListener() {
@Override
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
FirebaseUser user = firebaseAuth.getCurrentUser();
if (user == null) {
// user auth state is changed - user is null
// launch login activity
startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, LoginActivity.class));
finish();
}
}
};

}


@Override
public void onStart() {
super.onStart();
auth.addAuthStateListener(authListener);
}

@Override
public void onStop() {
super.onStop();
if (authListener != null) {
auth.removeAuthStateListener(authListener);
}
*/
/*@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu., menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();

if (id == R.id.action_settings) {
startActivity(new Intent(com.samuelford48gmail.thsconnect.teacher.MainActivity.this, SettingsActivity.class));
return true;
}

return super.onOptionsItemSelected(item);
}
*/
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.sf.stormwaterutilityandroid.Construction;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;

import com.sf.stormwaterutilityandroid.R;

public class ConstructionReportsFragment extends Fragment {


public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
View root = inflater.inflate(R.layout.fragment_dashboard, container, false);
final TextView textView = root.findViewById(R.id.text_dashboard);
return root;
}
}
7 changes: 4 additions & 3 deletions app/src/main/java/com/sf/stormwaterutilityandroid/Login.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
Expand All @@ -19,6 +18,7 @@
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth;
import com.sf.stormwaterutilityandroid.WaterWay.WaterWayNav;

public class Login extends AppCompatActivity {

Expand All @@ -38,8 +38,9 @@ protected void onCreate(Bundle savedInstanceState) {
mAuthListener = new FirebaseAuth.AuthStateListener() {
@Override
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {

if (firebaseAuth.getCurrentUser() != null && auth.getCurrentUser().isEmailVerified()) {
startActivity(new Intent(Login.this, MainActivity.class));
startActivity(new Intent(Login.this, WaterWayNav.class));
finish();
}
if (firebaseAuth.getCurrentUser() == null) {
Expand Down Expand Up @@ -112,7 +113,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
}
} else {
if (auth.getCurrentUser().isEmailVerified()) {
Intent intent = new Intent(Login.this, MainActivity.class);
Intent intent = new Intent(Login.this, WaterWayNav.class);
startActivity(intent);
progressBar.setVisibility(View.INVISIBLE);
finish();
Expand Down
48 changes: 48 additions & 0 deletions app/src/main/java/com/sf/stormwaterutilityandroid/MainMenu.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.sf.stormwaterutilityandroid;

import androidx.appcompat.app.AppCompatActivity;

import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;

import com.sf.stormwaterutilityandroid.Construction.ConstructionNav;
import com.sf.stormwaterutilityandroid.WaterWay.WaterWayNav;

public class MainMenu extends AppCompatActivity {
Button launchWWF,launchCF, launchSettings;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main_menu);
launchWWF = findViewById(R.id.wwf);
launchCF = findViewById(R.id.cf);
launchSettings = findViewById(R.id.settings);
launchSettings.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(MainMenu.this, Settings.class);
startActivity(intent);

}
});
launchCF.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(MainMenu.this, ConstructionNav.class);
startActivity(intent);


}
});
launchWWF.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(MainMenu.this, WaterWayNav.class);
startActivity(intent);

}
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class SampleFordm extends AppCompatActivity {
private FormBuilder formBuilder;
private RecyclerView recyclerView;
FormElementTextEmail element11;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -50,6 +51,7 @@ private void setupForm() {
FormElementTextNumber element23 = FormElementTextNumber.createInstance().setTitle("Zip Code").setValue("1000");

FormHeader header3 = FormHeader.createInstance("Schedule");

FormElementPickerDate element31 = FormElementPickerDate.createInstance().setTitle("Date").setDateFormat("MMM dd, yyyy");
FormElementPickerTime element32 = FormElementPickerTime.createInstance().setTitle("Time").setTimeFormat("KK hh");
FormElementTextPassword element33 = FormElementTextPassword.createInstance().setTitle("Password").setValue("abcd1234");
Expand All @@ -60,6 +62,7 @@ private void setupForm() {
fruits.add("Orange");
fruits.add("Mango");
fruits.add("Guava");

FormElementPickerSingle element41 = FormElementPickerSingle.createInstance().setTitle("Single Item").setOptions(fruits).setPickerTitle("Pick any item");
FormElementPickerMulti element42 = FormElementPickerMulti.createInstance().setTitle("Multi Items").setOptions(fruits).setPickerTitle("Pick one or more").setNegativeText("reset");
FormElementSwitch element43 = FormElementSwitch.createInstance().setTitle("Frozen?").setSwitchTexts("Yes", "No");
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/java/com/sf/stormwaterutilityandroid/Settings.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.sf.stormwaterutilityandroid;

import androidx.appcompat.app.AppCompatActivity;

import android.os.Bundle;

public class Settings extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
}
}
Loading