Skip to content

Commit

Permalink
feature/Updated form to use switches instead of Multipickers
Browse files Browse the repository at this point in the history
feature/Added Submit button onClick Listener functionality
  • Loading branch information
IbrahimSaeedPurdue authored and IbrahimSaeedPurdue committed Feb 25, 2021
2 parents 4172104 + 398d8e8 commit 34d9aa4
Show file tree
Hide file tree
Showing 32 changed files with 644 additions and 161 deletions.
23 changes: 15 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,27 @@
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=".InspectionForm"/>
<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=".InspectionForm" />
<activity android:name=".Login" />
<activity android:name=".SignUp" />
</application>

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

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

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.RecyclerView;

import com.google.firebase.Timestamp;
import com.google.type.DateTime;
import com.sf.stormwaterutilityandroid.R;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import me.riddhimanadib.formmaster.FormBuilder;
import me.riddhimanadib.formmaster.model.BaseFormElement;
import me.riddhimanadib.formmaster.model.FormElementPickerDate;
import me.riddhimanadib.formmaster.model.FormElementPickerMulti;
import me.riddhimanadib.formmaster.model.FormElementPickerSingle;
import me.riddhimanadib.formmaster.model.FormElementSwitch;
import me.riddhimanadib.formmaster.model.FormElementTextMultiLine;
import me.riddhimanadib.formmaster.model.FormElementTextSingleLine;
import me.riddhimanadib.formmaster.model.FormHeader;

public class ConstructionFormFragment extends Fragment {
private FormBuilder formBuilder;
private RecyclerView recyclerView;
private Button submitButton;

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

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

recyclerView = root.findViewById(R.id.recyclerView2);

recyclerView.addView(submitButton);

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
@@ -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.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;

import com.sf.stormwaterutilityandroid.R;


public class NotificationsFragment extends Fragment {
public class ConstructionReportsFragment 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_dashboard, container, false);
final TextView textView = root.findViewById(R.id.text_dashboard);
return root;
}
}
Loading

0 comments on commit 34d9aa4

Please sign in to comment.