chore: Release v1.1.0 (#2227)

chore: Release v1.1.0

Author: iamareebjamal

.github/release-drafter.yml

@@ -0,0 +1,21 @@
+name-template: v$NEXT_PATCH_VERSION 🌈
+tag-template: v$NEXT_PATCH_VERSION
+categories:
+  - title: 🚀 Features
+    label: feature
+  - title: 🐛 Bug Fixes
+    label: fix
+  - title: 🛠️ Maintenance
+    label: chore
+  - title: Dependencies and Libraries
+    label: dependencies
+change-template: '- $TITLE (#$NUMBER) - @$AUTHOR'
+template: |
+  ## Changes
+
+  $CHANGES
+  
+  ## Contributors
+  
+  Thanks a lot to our contributors for making this release possible:
+  $CONTRIBUTORS

README.md

@@ -42,7 +42,12 @@ Our chat channel is on gitter here: https://gitter.im/fossasia/susi_android
   <tr>
     <td><img src="docs/_static/groupwise_skills.png" height = "480" width="270"></td>
     <td><img src="docs/_static/rating_and_feedback.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/settings.png" height = "480" width="270"></td>
+    <td><img src="docs/_static/settings1.png" height = "480" width="270"></td>
+  </tr>
+  <tr>
+    <td><img src="docs/_static/settings2.png" height = "480" width="270"></td>
+    <td><img src="docs/_static/help.png" height = "480" width="270"></td>
+    <td><img src="docs/_static/privacy.png" height = "480" width="270"></td>
   </tr>
 </table>
 
@@ -59,7 +64,7 @@ Please find info about the set up of the Android app in your development environ
 - Realm [Docs](https://realm.io/docs/java/latest/)
 - Retrofit [Docs](http://square.github.io/retrofit/2.x/retrofit/)
 - ButterKnife [Docs](http://jakewharton.github.io/butterknife/javadoc/)
-- Espresso [Docs](https://google.github.io/android-testing-support-library/docs/espresso/)
+- Espresso [Docs](https://developer.android.com/training/testing/espresso)
 - Tajchert Waiting Dots [Docs](https://github.com/tajchert/WaitingDots)
 - Picasso [Docs](http://square.github.io/picasso/)
 - LeakCanary [Docs](https://github.com/square/leakcanary)
@@ -177,7 +182,7 @@ Go to AndroidManifest.xml and replace the ${YOUTUBE_API_KEY} with the real youtu
    
 ## For Testers: Testing the App
 If you are a tester and want to test the app, you have two ways to do that:
-1. **Installing APK on your device:** You can get debug [APK](https://github.com/fossasia/susi_android/blob/apk/susi-debug.apk) as well as Release [APK](https://github.com/fossasia/susi_android/blob/apk/susi-release.apk) in apk branch of the repository. After each PR merge, both the APKs are automatically updated. So, just download the APK you want and install it on your device. The APKs will always be the latest one.
+1. **Installing APK on your device:** You can get debug [APK](https://github.com/fossasia/susi_android/blob/apk/app-fdroid-debug.apk) as well as Release [APK](https://github.com/fossasia/susi_android/blob/apk/app-fdroid-release-unsigned.apk) in apk branch of the repository. After each PR merge, both the APKs are automatically updated. So, just download the APK you want and install it on your device. The APKs will always be the latest one.
 2. **Testing on [appetize.io](https://appetize.io/app/mbpprq4xj92c119j7nxdhttjm0):** If you don't want to download the APKs, you can simply go on [this](https://appetize.io/app/mbpprq4xj92c119j7nxdhttjm0) link and use the App on an online simulator. You will always find the latest version of App on that link because it is updated after each PR merge.
 
 ## License

app/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.diffplug.gradle.spotless" version "3.16.0"
+    id "com.diffplug.gradle.spotless" version "3.23.0"
 }
 
 def rootConfiguration = {}
@@ -12,6 +12,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'realm-android'
 
 def YOUTUBE_API_KEY = System.getenv('YOUTUBE_API_KEY') ?: "YOUR_API_KEY"
+//noinspection SpellCheckingInspection
 def MAPBOX_API_KEY = '"'+System.getenv('MAPBOX_API_KEY')+'"' ?: '"DEFAULT"'
 
 android {
@@ -21,8 +22,8 @@ android {
         applicationId "ai.susi"
         minSdkVersion rootConfiguration.minSdkVersion
         targetSdkVersion rootConfiguration.targetSdkVersion
-        versionCode 15
-        versionName "1.0.14"
+        versionCode 16
+        versionName "1.1.0"
         vectorDrawables.useSupportLibrary = true
         // for unit test
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -72,7 +73,6 @@ android {
             includeAndroidResources = true
         }
     }
-
 }
 
 spotless {
@@ -101,12 +101,12 @@ dependencies {
     implementation "com.android.support:cardview-v7:${rootConfiguration.supportLibraryVersion}"
     implementation "com.android.support:support-v4:${rootConfiguration.supportLibraryVersion}"
     implementation "com.android.support:customtabs:${rootConfiguration.supportLibraryVersion}"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     //piechart
     implementation "com.github.PhilJay:MPAndroidChart:${rootConfiguration.mpAndroidChartVersion}"
 
     //Leak Canary
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${rootConfiguration.leakCanaryVersion}"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${rootConfiguration.leakCanaryVersion}"
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${rootConfiguration.leakCanaryVersion}"
@@ -150,5 +150,8 @@ dependencies {
     //Timber
     implementation "com.jakewharton.timber:timber:${rootConfiguration.timberVersion}"
 
+    //Shimmer
+    implementation 'com.facebook.shimmer:shimmer:0.4.0'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${rootConfiguration.kotlinVersion}"
 }

app/config.gradle

@@ -1,6 +1,6 @@
 ext {
     compileSdkVersion = 28
-    minSdkVersion = 15
+    minSdkVersion = 21
     targetSdkVersion = 28
 
     //Libraries

app/src/androidTest/java/org/fossasia/susi/ai/chat/ChatActivityTest.kt

@@ -73,10 +73,10 @@ class ChatActivityTest {
         onView(withId(R.id.rv_chat_feed)).check(matches(isDisplayed()))
 
         // checks if layout container for chat box is present
-        onView(withId(R.id.send_message_layout)).check(matches(isDisplayed()))
+        onView(withId(R.id.sendMessageLayout)).check(matches(isDisplayed()))
 
         // checks if message box is present
-        onView(withId(R.id.et_message)).check(matches(isDisplayed()))
+        onView(withId(R.id.askSusiMessage)).check(matches(isDisplayed()))
 
         // checks if microphone button is present
         onView(withId(R.id.btnSpeak)).check(matches(isDisplayed()))

app/src/androidTest/java/org/fossasia/susi/ai/login/LoginActivityTest.kt

@@ -65,17 +65,17 @@ class LoginActivityTest {
         onView(withId(R.id.password)).check(matches(isDisplayed()))
 
         // checks if login button is present
-        onView(withId(R.id.log_in)).check(matches(isDisplayed()))
+        onView(withId(R.id.logIn)).check(matches(isDisplayed()))
 
         // checks if forgot password button is present
-        onView(withId(R.id.forgot_password)).check(matches(isDisplayed()))
+        onView(withId(R.id.forgotPassword)).check(matches(isDisplayed()))
 
         // checks if checkbox is present
         onView(withId(R.id.customer_server)).check(matches(isDisplayed()))
 
         // checks if sign up button is present
-        onView(withId(R.id.sign_up)).perform(scrollTo())
-        onView(withId(R.id.sign_up)).check(matches(isDisplayed()))
+        onView(withId(R.id.signUp)).perform(scrollTo())
+        onView(withId(R.id.signUp)).check(matches(isDisplayed()))
 
         // checks if skip button is present
         onView(withId(R.id.skip)).perform(scrollTo())

app/src/androidTest/java/org/fossasia/susi/ai/signup/SignUpActivityTest.kt

@@ -54,13 +54,13 @@ class SignUpActivityTest {
         onView(withId(R.id.password)).check(matches(isDisplayed()))
 
         // checks if confirm password button is present
-        onView(withId(R.id.confirm_password)).check(matches(isDisplayed()))
+        onView(withId(R.id.confirmPassword)).check(matches(isDisplayed()))
 
         // checks if checkbox is present
-        onView(withId(R.id.customer_server)).check(matches(isDisplayed()))
+        onView(withId(R.id.customServerSignUp)).check(matches(isDisplayed()))
 
         // checks if sign up button is present
-        onView(withId(R.id.sign_up)).perform(scrollTo())
-        onView(withId(R.id.sign_up)).check(matches(isDisplayed()))
+        onView(withId(R.id.signUp)).perform(scrollTo())
+        onView(withId(R.id.signUp)).check(matches(isDisplayed()))
     }
 }

app/src/fdroid/java/org/fossasia/susi/ai/chat/YoutubeVid.kt

@@ -7,7 +7,7 @@ import android.net.Uri
 class YoutubeVid(val context: Context) : IYoutubeVid {
 
     override fun playYoutubeVid(videoId: String) {
-        val url: String = "http://www.youtube.com/watch?v=" + videoId
+        val url = "http://www.youtube.com/watch?v=$videoId"
         val videoClient = Intent(Intent.ACTION_VIEW, Uri.parse(url))
         context.startActivity(videoClient)
     }

app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:vmSafeMode="true">
-
+        <activity android:name=".chat.search.ChatSearchActivity"></activity>
         <activity
             android:name=".login.WelcomeActivity"
             android:theme="@style/PreferenceFixTheme.DayNight.NoActionBar">
@@ -69,7 +69,7 @@
 
         <!--
         For Developers:
-        Replay the fabric_api_key to your actual API KEY
+        Replace the fabric_api_key to your actual API KEY
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="fabric_api_key" />
@@ -97,7 +97,6 @@
             android:name=".skills.feedback.FeedbackActivity"
             android:label="See All Reviews"
             android:theme="@style/PreferencesThemeLight" />
-
         <activity
             android:name=".chat.YouTubeActivity"
             android:theme="@style/Theme.AppCompat.Dialog" />

app/src/main/java/org/fossasia/susi/ai/MainApplication.kt

@@ -41,13 +41,13 @@ class MainApplication : Application() {
 
         if (BuildConfig.DEBUG) {
             Timber.plant(object : Timber.DebugTree() {
-                //Add the line number to the tag
+                // Add the line number to the tag
                 override fun createStackElementTag(element: StackTraceElement): String? {
                     return super.createStackElementTag(element) + ": " + element.lineNumber
                 }
             })
         } else {
-            //Release mode
+            // Release mode
             Timber.plant(ReleaseLogTree())
         }
     }