Merge branch 'dev'

* dev: update helpstack
shalzz · Nov 22, 2019 · 9d66231 · 9d66231
2 parents 45d5a20 + b6d73c1
commit 9d66231
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -201,7 +201,8 @@ dependencies {
 
     implementation("com.google.firebase:firebase-core:17.2.1")
     implementation("com.google.firebase:firebase-analytics:17.2.1")
-    implementation("com.github.shalzz:helpstack-android:1.4.2")
+    implementation("com.github.shalzz:helpstack-android:1.4.3")
+//    implementation("com.github.shalzz:helpstack:1.4.1-debug")
 
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
     implementation("com.google.android.material:material:1.0.0")

diff --git a/app/src/main/res/xml/articles.xml b/app/src/main/res/xml/articles.xml
@@ -20,7 +20,7 @@
 
 <articles>
 
-    <article subject="How do I login">
+    <article subject="How do I login?">
         <![CDATA[<div>
    To login you need to enter the correct username and password.
    <br />
@@ -53,7 +53,7 @@
 ]]>
     </article>
 
-    <article subject="Which colleges are supported">
+    <article subject="Which colleges are supported?">
         <![CDATA[There are a limited number of colleges supported by College Academics. We strive to
          continuously add support for more colleges.
 <div>
@@ -152,9 +152,10 @@
 ]]>
     </article>
 
-    <article subject="Where can I change my Privacy settings">
-        <![CDATA[<p>You can find privacy related settings in the Settings menu in the drawer
-        under the privacy section.</p>]]>
+    <article subject="Where can I change my Privacy settings?">
+        <![CDATA[<p>You can find privacy related settings under the privacy section
+        in the Settings menu in the drawer by sliding from the left or by clicking on the
+        hamburger menu icon.</p>]]>
     </article>
 
     <article subject="How do I change my language settings">
@@ -166,7 +167,7 @@ for the android system in the system settings.<br/> The apps language will chang
     <article subject="How do I reset my password">
         <![CDATA[<p>If you have forgotten your password,<br/> please visit the website of your college
         providing the attendance info and click the <br/>'Forgot Password' link to reset your password.
-        <br/> You will receive a mail with a confirmation code <br/> which you will need at the time of resetting your
-        password.</p>]]>
+        <br/> You will receive a mail on your registered email-id with a confirmation code <br/>
+         which you will need at the time of resetting your password.</p>]]>
     </article>
 </articles>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
     }
     dependencies {
         classpath(kotlin("gradle-plugin", kotlinVersion))
-        classpath("com.android.tools.build:gradle:4.0.0-alpha03")
+        classpath("com.android.tools.build:gradle:4.0.0-alpha04")
         classpath("com.google.gms:google-services:4.3.2")
 
         classpath("com.google.android.gms:oss-licenses-plugin:0.10.0")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 28 08:28:55 IST 2019
+#Fri Nov 22 19:09:51 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-rc-1-all.zip