From 8498c0ad8e5ec6f4a1ca574e08d3639767c2c198 Mon Sep 17 00:00:00 2001 From: Rohit Das Date: Sun, 19 Nov 2017 17:02:07 +0530 Subject: [PATCH 1/5] MainActivity:Removed default "Hello World" reply Removed the default "Hello World" reply. Also added /libs/Ab.jar to resolve dependency conflicts for the AIML bot. fixes: #10 Signed-off-by: Rohit Das --- app/build.gradle | 2 +- app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java | 3 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 90b35a4..a5ccac1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.0" + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.phoenix.rudra.aityl" minSdkVersion 15 diff --git a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java index 83e5c5a..e663044 100644 --- a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java +++ b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java @@ -168,9 +168,6 @@ private void sendMessage(String message) { ChatMessage chatMessage = new ChatMessage(message, true, false); mAdapter.add(chatMessage); - - // default "Hello World" Response - mimicOtherMessage("Hello World"); } private void mimicOtherMessage(String message) diff --git a/build.gradle b/build.gradle index c2eea8e..c33a638 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b17f3f9..bae9c77 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 05 14:47:48 IST 2017 +#Sun Nov 19 16:55:00 IST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From 0db0bee3660630d929c615e59d87a6db59dbde14 Mon Sep 17 00:00:00 2001 From: Rohit Das Date: Sun, 19 Nov 2017 17:32:28 +0530 Subject: [PATCH 2/5] activity_main: EditText to be at bottom of screen Changed android:layout_width and android:layout_height of Relative- Layout to "match_parent". This will ensure the height and width is adjusted relative to those of the screen. fixes: #12 Signed-off-by: Rohit Das --- app/src/main/res/layout/activity_main.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4cb28b1..8d4c341 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,8 +11,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="368dp" - android:layout_height="232dp" + android:layout_width="match_parent" + android:layout_height="match_parent" android:orientation="vertical" android:paddingTop="@dimen/activity_vertical_margin" tools:context=".MainActivity" From b7dc9d502ff9d1c0aa438536556b17308a1a887f Mon Sep 17 00:00:00 2001 From: Rohit Das Date: Sun, 19 Nov 2017 18:32:14 +0530 Subject: [PATCH 3/5] MainActivity: Logging Chat History Phase 1: Implementing writing messages and responses to file, named with current date in (dd-MM-yyyy) format. fixes: #13 Signed-off-by: Rohit Das --- .../com/phoenix/rudra/aityl/MainActivity.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java index e663044..2eef5d4 100644 --- a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java +++ b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java @@ -21,6 +21,7 @@ package com.phoenix.rudra.aityl; +import android.content.Context; import android.content.res.AssetManager; import android.os.Environment; import android.support.v7.app.AppCompatActivity; @@ -44,13 +45,16 @@ import org.alicebot.ab.MagicStrings; import org.alicebot.ab.PCAIMLProcessorExtension; import org.alicebot.ab.Timer; +import org.xml.sax.ContentHandler; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; public class MainActivity extends AppCompatActivity { @@ -74,6 +78,14 @@ protected void onCreate(Bundle savedInstanceState) { mAdapter = new ChatMessageAdapter(this, new ArrayList()); mListView.setAdapter(mAdapter); + //to save logfiles by date + String date = new SimpleDateFormat("dd-MM-yyyy").format(new Date()); + final String logFile = "log-" + date + ".txt"; + File logDir = new File(Environment.getExternalStorageDirectory().toString() + "/hari/logs"); + logDir.mkdirs(); + File logOutput = new File(logDir, logFile); + + mButtonSend.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -86,6 +98,20 @@ public void onClick(View view) { sendMessage(message); mimicOtherMessage(response); + + //writing responses and messages to file + String msg = "User: " + message; + String resp = "Bot: " + response; + FileOutputStream logStream; + try { + logStream = openFileOutput(logFile, Context.MODE_PRIVATE | Context.MODE_APPEND); + logStream.write(msg.getBytes()); + logStream.write(resp.getBytes()); + logStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + mEditTextMessage.setText(""); mListView.setSelection(mAdapter.getCount() - 1); } @@ -143,6 +169,10 @@ public static boolean isSDCardAvailable() return Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED); } + private void writeToLog(String data, Context context) { + + } + private void copyFile(InputStream inputStream, OutputStream outputStream) throws IOException { byte[] buffer = new byte[1024]; int read; From 3616f753aebd93ff81769d093bc9ee8c48172976 Mon Sep 17 00:00:00 2001 From: Rohit Das Date: Tue, 21 Nov 2017 21:19:23 +0530 Subject: [PATCH 4/5] Revert "MainActivity:Removed default "Hello World" reply" This reverts commit 8498c0ad8e5ec6f4a1ca574e08d3639767c2c198. --- app/build.gradle | 2 +- app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java | 3 +++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a5ccac1..90b35a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion '26.0.2' + buildToolsVersion "26.0.0" defaultConfig { applicationId "com.phoenix.rudra.aityl" minSdkVersion 15 diff --git a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java index 2eef5d4..abc403a 100644 --- a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java +++ b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java @@ -198,6 +198,9 @@ private void sendMessage(String message) { ChatMessage chatMessage = new ChatMessage(message, true, false); mAdapter.add(chatMessage); + + // default "Hello World" Response + mimicOtherMessage("Hello World"); } private void mimicOtherMessage(String message) diff --git a/build.gradle b/build.gradle index c33a638..c2eea8e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bae9c77..b17f3f9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Nov 19 16:55:00 IST 2017 +#Sun Nov 05 14:47:48 IST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip From 55cab19cf8f58b45ee770c3430aaea4ce7251111 Mon Sep 17 00:00:00 2001 From: Rohit Das Date: Tue, 21 Nov 2017 21:22:34 +0530 Subject: [PATCH 5/5] MainActivity: Default reply "Hello World" removed In MainActivity.java, mimicOtherMessage() is used to display bot reply to a user message. As a default message, "Hello World" was kept, but on further development, it turned out to be a bane as it keeps cropping up. So the default reply has been removed. fixes: #10 Signed-off-by: Rohit Das --- app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java index abc403a..2eef5d4 100644 --- a/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java +++ b/app/src/main/java/com/phoenix/rudra/aityl/MainActivity.java @@ -198,9 +198,6 @@ private void sendMessage(String message) { ChatMessage chatMessage = new ChatMessage(message, true, false); mAdapter.add(chatMessage); - - // default "Hello World" Response - mimicOtherMessage("Hello World"); } private void mimicOtherMessage(String message)