Skip to content
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
61 changes: 61 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Built application files
# *.apk
*.ap_


# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/

# Gradle files
gradle
.gradle
build/
/*/build/
/*/*/build
build

# Local configuration file (sdk path, etc)
local.properties
/*/local.properties

#Crashlytics properties file, as it is written on every build by gradle task
app/crashlytics.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Eclipse project files
.classpath
.project

# Android Studio
.idea/workspace.xml
.idea/libraries
.idea/misc.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/vcs.xml
.idea/encodings.xml
.idea/scopes
.idea/compiler.xml
.idea/modules.xml
.idea/runConfigurations.xml

# Windows thumbnail db
Thumbs.db

# OSX files
.DS_Store

app/app.iml
MontyProjectNew.iml
22 changes: 22 additions & 0 deletions .idea/compiler.xml

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

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml

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

3 changes: 3 additions & 0 deletions .idea/dictionaries/amandeepsingh.xml

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

6 changes: 6 additions & 0 deletions .idea/encodings.xml

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

18 changes: 18 additions & 0 deletions .idea/gradle.xml

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

62 changes: 62 additions & 0 deletions .idea/misc.xml

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

9 changes: 9 additions & 0 deletions .idea/modules.xml

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

12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

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

7 changes: 2 additions & 5 deletions app/src/main/java/badebaba/tscore/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

import android.content.Intent;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -16,8 +15,6 @@
import com.roughike.bottombar.BottomBar;
import com.roughike.bottombar.OnTabSelectListener;

import java.util.HashMap;

import badebaba.tscore.SMS.SmsActivity;
import badebaba.tscore.SMS.helper.PrefManager;
import badebaba.tscore.Tscore.General;
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/java/badebaba/tscore/Tscore/BottomMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
Expand All @@ -18,12 +16,14 @@
import com.roughike.bottombar.OnTabSelectListener;

import badebaba.tscore.R;

import badebaba.tscore.Tscore.RecyclerViews.TeacherViewCallback;

/**
* Created by badebaba on 9/18/2016.
*/
public class BottomMain extends AppCompatActivity {


public class BottomMain extends AppCompatActivity implements TeacherViewCallback {

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
Expand Down Expand Up @@ -71,10 +71,7 @@ public void initialisefragment(int tabId) {
fragmentTransaction.addToBackStack(null);
fragmentTransaction.commit();


}


}

@Override
Expand All @@ -97,4 +94,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}


@Override
public void onSuccessFulSubmission() {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

public class TeacherAdapter extends RecyclerView.Adapter<TeacherViewHolder> {

private TeacherViewCallback teacherViewCallback;

String[] teachers = {"Hitesh Vakharia(Maths)",
"Kekul Vakharia(Science)",
"Janki Barodia(French)",
Expand All @@ -32,8 +34,10 @@ public class TeacherAdapter extends RecyclerView.Adapter<TeacherViewHolder> {
Context context;
LayoutInflater inflater;

public TeacherAdapter(Context context) {

public TeacherAdapter(Context context, TeacherViewCallback teacherViewCallback) {
this.context = context;
this.teacherViewCallback = teacherViewCallback;
inflater = LayoutInflater.from(context);

}
Expand All @@ -42,7 +46,7 @@ public TeacherAdapter(Context context) {
public TeacherViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {

View view = inflater.inflate(R.layout.teacher, parent, false);
TeacherViewHolder teacherViewHolder = new TeacherViewHolder(view);
TeacherViewHolder teacherViewHolder = new TeacherViewHolder(view, teacherViewCallback);
return teacherViewHolder;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package badebaba.tscore.Tscore.RecyclerViews;

/**
* Created by amandeepsingh on 14/10/16.
*/

public interface TeacherViewCallback {
void onSuccessFulSubmission();
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ public class TeacherViewHolder extends RecyclerView.ViewHolder {
TextView Elaborate;
EditText ElaborateAns;
Button submit;
private TeacherViewCallback teacherViewCallback;


public TeacherViewHolder(View itemView) {
public TeacherViewHolder(View itemView, final TeacherViewCallback teacherViewCallback) {
super(itemView);
// mref = new Firebase("https://tscf-b4925.firebaseio.com/teacherfeedback/");
this.teacherViewCallback = teacherViewCallback;
TeacherName = (TextView) itemView.findViewById(R.id.staffname);
q1 = (TextView) itemView.findViewById(R.id.q1);
q2 = (TextView) itemView.findViewById(R.id.q2);
Expand Down Expand Up @@ -750,6 +752,8 @@ public void onClick(View view) {
// value.setElaborateans(ElaborateAns.getText().toString());
// value.setTeachername(TeacherName.getText().toString());
// mref.push().child("Teacher feedback").setValue(value);

teacherViewCallback.onSuccessFulSubmission();
Toast.makeText(view.getContext(), "Your Teacher Submission is Done", Toast.LENGTH_LONG).show();
}
};
Expand Down
13 changes: 12 additions & 1 deletion app/src/main/java/badebaba/tscore/Tscore/Teacher.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package badebaba.tscore.Tscore;

import android.app.Activity;
import android.app.Fragment;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -10,12 +11,21 @@

import badebaba.tscore.R;
import badebaba.tscore.Tscore.RecyclerViews.TeacherAdapter;
import badebaba.tscore.Tscore.RecyclerViews.TeacherViewCallback;


public class Teacher extends Fragment {


RecyclerView recyclerView2;
LinearLayoutManager linearLayoutManager;
private TeacherViewCallback teacherViewCallback;

@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
teacherViewCallback = (TeacherViewCallback) activity;
}

@Override
public void onCreate(Bundle savedInstanceState) {
Expand All @@ -30,7 +40,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa

recyclerView2 = (RecyclerView) rootview.findViewById(R.id.teacher_recycler);

TeacherAdapter adapter = new TeacherAdapter(rootview.getContext());

TeacherAdapter adapter = new TeacherAdapter(rootview.getContext(), teacherViewCallback);
linearLayoutManager = new LinearLayoutManager(getActivity());
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
recyclerView2.setAdapter(adapter);
Expand Down
Loading