Skip to content

Commit

Permalink
Toasts Removed, Data entry error fixes in syllabus, Spinner size redu…
Browse files Browse the repository at this point in the history
…ced in login, attendence dialog made small to fit low res screens
  • Loading branch information
prabhashankar-k committed Nov 23, 2017
1 parent 33bd25a commit 91f0b2a
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 62 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
buildToolsVersion '26.0.2'
defaultConfig {
applicationId 'com.learnera.app'
minSdkVersion 19
minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/learnera/app/IntroActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.os.Bundle;
import android.support.annotation.Nullable;

import com.heinrichreimersoftware.materialintro.slide.FragmentSlide;
import com.learnera.app.fragments.LoginFragment;

Expand Down Expand Up @@ -53,8 +54,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
.fragment(new LoginFragment())
.canGoForward(false)
.build());

}


@Override
public void onBackPressed() {
super.onBackPressed();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;

import com.learnera.app.AnnouncementsActivity;
import com.learnera.app.AttendanceActivity;
Expand Down Expand Up @@ -57,13 +56,13 @@ public void onClick(View v) {
Intent sendIntent = new Intent(Intent.ACTION_SENDTO);
sendIntent.setData(Uri.parse("mailto:"));
sendIntent.putExtra(Intent.EXTRA_SUBJECT, "");
sendIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"test@gmail.com"});
sendIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"learneraproject@gmail.com"});
sendIntent.putExtra(Intent.EXTRA_TEXT, "Feedback for LearnEra");
startActivity(sendIntent);
}
});

Toast.makeText(getActivity(), "" + getFragmentManager().getBackStackEntryCount(), Toast.LENGTH_SHORT).show();
//Toast.makeText(getActivity(), "" + getFragmentManager().getBackStackEntryCount(), Toast.LENGTH_SHORT).show();
return view;
}

Expand Down
14 changes: 14 additions & 0 deletions app/src/main/java/com/learnera/app/fragments/LoginFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.jsoup.select.Elements;

import java.io.IOException;
import java.lang.reflect.Field;

/**
* Created by Prejith on 7/4/2017.
Expand Down Expand Up @@ -193,6 +194,19 @@ private void initView() {
mPassInput = (TextInputLayout) view.findViewById(R.id.text_input_password_field);
inputMethodManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
mDepartment = (Spinner) view.findViewById(R.id.department_spinner);
//decreased spinner height due to issues in low res screens
try {
Field popup = Spinner.class.getDeclaredField("mPopup");
popup.setAccessible(true);

// Get private mPopup member variable and try cast to ListPopupWindow
android.widget.ListPopupWindow popupWindow = (android.widget.ListPopupWindow) popup.get(mDepartment);

// Set popupWindow height to 500px
popupWindow.setHeight(300);
} catch (NoClassDefFoundError | ClassCastException | NoSuchFieldException | IllegalAccessException e) {
// silently fail...
}
}

private void initSpinner() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
public class MarksFragment extends Fragment implements AdapterView.OnItemSelectedListener {

public static int countSemesters;
public long startTime, stopTime, elapsedTime;
protected ArrayList<String> semList;
@BindView(R.id.spinner_marks_semesters)
Spinner spinner1;
Expand Down Expand Up @@ -180,8 +179,7 @@ private void createList() {
mRecyclerView.setLayoutManager(mLayoutManager);
mRecyclerView.setItemAnimator(new DefaultItemAnimator());
mRecyclerView.setAdapter(marksAdapter);
String x = elapsedTime + "";
Toast.makeText(getActivity(), x, Toast.LENGTH_LONG).show();

}

private void initProgressDialog() {
Expand Down Expand Up @@ -347,7 +345,6 @@ protected Void doInBackground(Void... params) {

@Override
protected void onPostExecute(Void result) {
startTime = System.currentTimeMillis();
Marks marks;
String subjectHeader[] = new String[3];
int rownum = 0, colnum;
Expand Down Expand Up @@ -421,8 +418,6 @@ protected void onPostExecute(Void result) {
marks.setmSubMarks(subjectMarks.get(i));
marksList.add(marks);
}
stopTime = System.currentTimeMillis();
elapsedTime = stopTime - startTime;
createList();
subjectLetters.clear();
subjectCodes.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ListView;
import android.widget.Toast;

import com.learnera.app.R;
import com.learnera.app.SyllabusActivity;
Expand Down Expand Up @@ -62,7 +61,7 @@ public boolean onItemLongClick(AdapterView<?> arg0, View v,
final int index, long arg3) {
//Share with WhatsApp option only if module details are long pressed. It won't appear on long press of text books, credits or prerequisites
final AlertDialog.Builder build = new AlertDialog.Builder(getActivity());
Toast.makeText(getActivity(), "" + index, Toast.LENGTH_SHORT).show();
//Toast.makeText(getActivity(), "" + index, Toast.LENGTH_SHORT).show();
final int tempIndex = index + 1;
build.setTitle("Share");
build.setMessage("Would you like to share the syllabus of Module " + tempIndex + "?");
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/dialog_attendence_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="500dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">

Expand All @@ -22,7 +22,7 @@
<ListView
android:id="@+id/list_view_attendence_table"
android:layout_width="match_parent"
android:layout_height="450dp"
android:layout_height="300dp"
android:layout_below="@id/attendence_dialog_header" />

<TextView
Expand Down
41 changes: 3 additions & 38 deletions app/src/main/res/values/syllabus_ae.xml
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
invertability, time invariance - Linearity - Causality - Memory - Time domain
description - Convolution - Impulse response
</item>
<item>2</item>
<item></item>
<item>Representation of LTI systems - Differential equation and difference equation
representations of LTI systems ,Continuous Time LTI systems and Convolution Integral,
Discrete Time LTI systems and linear convolution
Expand Down Expand Up @@ -618,13 +618,7 @@

<array name="ae365">
<item>IFA</item>
<item>Text Books:\n 1. C D Johnson Process control and instrumentation technology, PHI 2.
Patranabis, Industrial instrumentation, TMH. 3. Wills B.A., “Mineral Processing
Technology”, 4th Ed.,Pergamon Press
\n\nReferences \n  B.G.Liptak , Instrumentation handbook-process control, Chilton
</item>
<item></item>
<item>NONE</item>

<item></item>
<item>Necessity of instrumentation &amp; control for agriculture, engineering properties of
soil: fundamental definitions &amp; relationships, index properties of soil,
Expand Down Expand Up @@ -672,19 +666,7 @@

<array name="ae366">
<item>ESD</item>
<item>Text Books:\n 1. Shibu K.V, Introduction to Embedded Systems, Mc Graw Hill 2. Wayne
Wolf, Computers as Components: Principles of Embedded Computing System Design – Harcourt
India, Morgan Kaufman Publishers, First Indian Reprint 2001
</item>

<item>Reference Books \n 1. David E. Simon An Embedded Software Primer, Pearson Education.
2. Frank Vahid and Tony Givargis, Embedded System Design – A unified Hardware / Software
Introduction, John Wiley, 2002. 3. Lyla B Das, Embedded Systems An Integrated Approach,
Pearson, 2013 4. Rajkamal, Embedded Systems Architecture, Programming and Design, TATA
McGraw-Hill, First reprint Oct. 2003
</item>
<item></item>
<item>NONE</item>
<item></item>
<item>Introduction to Embedded Systems: Definition of Embedded System, Embedded Systems Vs
General Computing Systems, History of Embedded Systems, Classification, Major
Expand Down Expand Up @@ -725,24 +707,7 @@

<array name="ae368">
<item>PE</item>
<item>Text Books:\n 1. Cyril Donaldson, George H.Lecain, V C Goold, Tool Design, TATA McGraw
Hill,1998. 2. Fred W. Billmeyer, Jr., Text Book of Polymer Science, John Wiley &amp;Sons,
Singapore,1994. 3. G.J.L. Griffin, Chemistry and Technology of Biodegradable Polymers,
Blackie Academic Professional, 1994
\n\nReference Books \n 1. Abraham J. Domb, Joseph Kost &amp; David M.Wiseman, Handbook
of Biodegradable polymers, CRC Press 2. Dominick V. Rosato, DonaldV. Rosato, Injection
Molding Hand Book, CBC Publishers&amp;Distributors,1987 3. Gerald Scott &amp; Dan Gilad,
Degradable Polymers-Principles &amp; Applications, Chapman &amp; Hall, 1995. 4. Gordon
L. Robertson, Food Packaging Principles and Practice, Marcel Dekker, Inc., New York
1993. 5. IrwinI Rubin, Injection Molding Theory and Practice, Wisely Inter science
Publication, 1972. 6. Louis T. Manzione, Plastic Packaging of Microelectronic Devices,
Van Nostrand Reinhold, New York, 1990. 7. Plastics Engineering Hand Book of the Society
of the Plastics Industry Inc.,Van Nostrand Reinhold Company, 1945. 8. Vishu Shah, Hand
Book of Plastics Testing Technology, John Wiley &amp; Sons Inc., New York, 1998
</item>
<item></item>

<item>NONE</item>

<item></item>
<item>Engineering Plastics : Sources and Manufacture of raw materials, Methods of
Manufacture of Polymer, General Properties and applications of Acrylonitrile Butadiene
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/syllabus_ec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@
realization
</item>

<item></item>
<item></item>
<item>Analysis of Asynchronous Sequential Circuits (ASC)\nFlow table reduction- Races in
ASC\nState assignment problem and the transition table-Design of AS\nDesign of Vending
Expand Down
7 changes: 1 addition & 6 deletions app/src/main/res/values/syllabus_hs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,7 @@

<array name="hs300">
<item>PM</item>
<item>Harold Koontz and Heinz Weihrich, Essentials of Management, McGraw Hill Companies,
10th
Edition
</item>
<item>3</item>
<item>NIL</item>

<item>Introduction to Management</item>
<item>Definitions, managerial roles and functions; Science or Art perspectives- External
environment-global, innovative and entrepreneurial perspectives ofManagement (3 Hrs.)–
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/syllabus_it.xml
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
\n ILP using multiple issue and static scheduling, ILP using dynamic scheduling,
multiple issue and speculation.
</item>
<item>MODULE 4</item>
<item></item>
<item>Case study- Intel Core i7.
\n Data level parallelism -Vector architecture-Vector instruction types, Vector-Access
memory schemes , Graphic processing units.
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/syllabus_main_data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@
<item>it363</item>
<item>it365</item>
<item>it367</item>
<item>ma361</item>
</string-array>
<string-array name="its5subnames">
<item>Software Architecture and Design Patterns</item>
Expand All @@ -367,6 +368,7 @@
<item>Unix Shell Programming</item>
<item>Computer Architecture and Parallel Processing</item>
<item>Computer Graphics and Multimedia</item>
<item>Random Process and Queuing Theory</item>
</string-array>

<!-- SEMESTER 5 COMPUTER SCIENCE -->
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/values/syllabus_me.xml
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
displacement diagrams, velocity and acceleration analysis of SHM, uniform velocity,
uniform acceleration, cycloidal motion
</item>
<item>Module 3</item>
<item></item>
<item>Graphical cam profile synthesis, pressure angle Analysis of tangent cam with roller
follower and circular cam with flat follower Introduction to polynomial cams.
</item>
Expand Down Expand Up @@ -644,7 +644,7 @@
between two parallel plates, potential flow in a sector. Introduction to conformal
transformation, conformal mapping.
</item>
<item>MODULE 4</item>
<item></item>
<item>Incompressible viscous flow. Concepts of laminar and turbulent flows . Stokes
viscosity law. Navier Stoke’s equation and significance (Derivation not
necessary).Simplification of Havier stock equation for steady incompressible flows with
Expand Down Expand Up @@ -736,7 +736,6 @@

<array name="me365">

<item>Advanced Metal Casting</item>

<item>AMC</item>

Expand Down

0 comments on commit 91f0b2a

Please sign in to comment.