Fixes BuildmLearn#314

tejavojjala · Jan 14, 2017 · dd6b56a · dd6b56a
1 parent 638d307
commit dd6b56a
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 12 deletions.
diff --git a/source-code/app/src/main/assets/ComprehensionApp.apk b/source-code/app/src/main/assets/ComprehensionApp.apk
diff --git a/source-code/app/src/main/assets/DictationApp.apk b/source-code/app/src/main/assets/DictationApp.apk
diff --git a/source-code/app/src/main/assets/FlashCardTemplateApp.apk b/source-code/app/src/main/assets/FlashCardTemplateApp.apk
diff --git a/source-code/app/src/main/assets/VideoCollectionApp.apk b/source-code/app/src/main/assets/VideoCollectionApp.apk
diff --git a/.../main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java b/.../main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java
@@ -9,13 +9,15 @@
 import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.CursorLoader;
 import android.support.v4.content.Loader;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -118,6 +120,25 @@ public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getView().setFocusableInTouchMode(true);
+        getView().requestFocus();
+        getView().setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                    getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), org.buildmlearn.toolkit.dictationtemplate.fragment.MainActivityFragment.newInstance()).addToBackStack(null).commit();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+    }
+
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         if (null != dict_Id) {

diff --git a/...de/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java b/...de/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java
@@ -7,6 +7,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
@@ -19,6 +20,7 @@
 import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
 import android.util.Base64;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -158,7 +160,7 @@ public boolean onMenuItemClick(MenuItem item) {
         assert rootView.findViewById(R.id.hint) != null;
         ((TextView) rootView.findViewById(R.id.hint)).setText(String.format(Locale.ENGLISH, "Hint : %s", hint));
 
-        Button prv = (Button) rootView.findViewById(R.id.previous);
+        final Button prv = (Button) rootView.findViewById(R.id.previous);
         Button flip = (Button) rootView.findViewById(R.id.flip);
         Button next = (Button) rootView.findViewById(R.id.next);
         viewPager = (ViewPager) rootView.findViewById(R.id.viewpagerflash);
@@ -251,6 +253,25 @@ public void onClick(View v) {
         return rootView;
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        final Button prv = (Button) rootView.findViewById(R.id.previous);
+        getView().setFocusableInTouchMode(true);
+        getView().requestFocus();
+        getView().setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN && null != prv && prv.isEnabled()) {
+                    prv.performClick();
+                    return true;
+                }
+                return false;
+            }
+        });
+
+    }
+
     private void setAdapterData(FlashModel mFlash) {
         MyPagerAdapter adapter = new MyPagerAdapter(mFlash);
         viewPager.setAdapter(adapter);

diff --git a/...java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java b/...java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.CursorLoader;
@@ -12,6 +13,7 @@
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -98,6 +100,30 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         return rootView;
     }
 
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        getView().setFocusableInTouchMode(true);
+        getView().requestFocus();
+        getView().setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    if(Integer.parseInt(video_Id) == 1 ) {
+                        getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+                        getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), org.buildmlearn.toolkit.videocollectiontemplate.fragment.MainActivityFragment.newInstance()).addToBackStack(null).commit();
+                        return true;
+                    } else if(Integer.parseInt(video_Id) > 1){
+                        rootView.findViewById(R.id.previous).performClick();
+                        return true;
+                    }
+                }
+                return false;
+            }
+        });
+
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         getLoaderManager().initLoader(DETAIL_LOADER, null, this);
@@ -236,6 +262,7 @@ public void onClick(View v) {
                         }
                     }
                 });
+
             }
         }
     }

diff --git a/source-code/gradle.properties b/source-code/gradle.properties
@@ -1,18 +1,23 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
+## Project-wide Gradle settings.
+#
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-
-
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+#Sat Jan 14 05:10:26 IST 2017
+systemProp.http.proxyPassword=Vojjala2014086$
+systemProp.https.proxyUser=iit2014086
+systemProp.https.proxyPort=8080
+systemProp.http.proxyHost=172.31.1.3
+systemProp.https.proxyPassword=Vojjala2014086$
+systemProp.https.proxyHost=172.31.1.3
+systemProp.http.proxyUser=iit2014086
+systemProp.http.proxyPort=8080