Merge pull request #4 from Sushant-Hande/dev

Development for version 1.0.0 completed
Sushant-Hande · Apr 16, 2020 · 4fabe54 · 4fabe54
2 parents 092b72b + 3fda987
commit 4fabe54
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 34 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.sushanthande.gocorona"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0.0-alpha"
+        versionCode 2
+        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <application
         android:name=".GCApplication"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_logo"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"

diff --git a/app/src/main/java/com/sushanthande/gocorona/ui/dashboard/DashboardActivity.kt b/app/src/main/java/com/sushanthande/gocorona/ui/dashboard/DashboardActivity.kt
@@ -51,7 +51,7 @@ class DashboardActivity : AppCompatActivity(),
                 val shareIntent = Intent(Intent.ACTION_SEND).apply {
                     type = "text/plain"
                     putExtra(Intent.EXTRA_SUBJECT, R.string.app_name)
-                    var shareMessage = "\n${R.string.share_app}\n\n"
+                    val shareMessage = "\n${getString(R.string.share_app)}\n"
                     putExtra(Intent.EXTRA_TEXT, shareMessage)
                 }
                 startActivity(Intent.createChooser(shareIntent, "choose one"))

diff --git a/...src/main/java/com/sushanthande/gocorona/ui/dashboard/fragments/setting/SettingFragment.kt b/...src/main/java/com/sushanthande/gocorona/ui/dashboard/fragments/setting/SettingFragment.kt
@@ -10,6 +10,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.pixplicity.easyprefs.library.Prefs
+import com.sushanthande.gocorona.BuildConfig
 import com.sushanthande.gocorona.LanguageUtil
 import com.sushanthande.gocorona.R
 import com.sushanthande.gocorona.databinding.SettingFragmentBinding
@@ -35,6 +36,7 @@ class SettingFragment : Fragment(), View.OnClickListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.cvLanguage.setOnClickListener(this)
+        binding.tvVersionName.append(BuildConfig.VERSION_NAME)
     }
 
     override fun onClick(v: View) {

diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
diff --git a/app/src/main/res/layout/setting_fragment.xml b/app/src/main/res/layout/setting_fragment.xml
@@ -49,6 +49,19 @@
 
         </com.google.android.material.card.MaterialCardView>
 
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/tvVersionName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            android:gravity="center"
+            android:text="@string/v"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginBottom="10dp"
+            />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
@@ -38,8 +38,9 @@
     <string name="search_by_country">देश खोजे</string>
 
     <!--Share Strings-->
-    <string name="share_app">दुनिया के विभिन्न देशों से कोरोना के बारे में नवीनतम जानकारी प्राप्त करने के लिए GoCorona एप्लिकेशन डाउनलोड करें.
-    GoCorona एप्लिकेशन अंग्रेजी, मराठी और हिंदी भाषाओं में उपलब्ध है।</string>
+    <string name="share_app">दुनिया के विभिन्न देशों से कोरोना(COVID-19) के बारे में नवीनतम जानकारी प्राप्त करने के लिए GoCorona एप्लिकेशन डाउनलोड करें.
+    GoCorona एप्लिकेशन अंग्रेजी, मराठी और हिंदी भाषाओं में उपलब्ध है।
+    \n\n Download Link:- \nhttp://fourthquadrant.comli.com/androidapp/gocorona/gocorona.apk</string>
     <string name="New">New</string>
     <string name="country_details">Country Details</string>
     <string name="active">Active</string>
@@ -49,5 +50,6 @@
     <string name="retry">Retry</string>
     <string name="india_updates">इंडिया अपडेट्स</string>
     <string name="search_by_state">राज्य खोजे</string>
+    <string name="v">v</string>
 
 </resources>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
@@ -38,7 +38,8 @@
     <string name="search_by_country">देश शोधा</string>
 
     <!--Share Strings-->
-    <string name="share_app">जगातील विविध देशांमधील, कोरोनाविषयी नवीनतम माहिती मिळविण्यासाठी GoCorona अॅप डाउनलोड करा. GoCorona अॅप, इंग्रजी, मराठी आणि हिंदी भाषांमध्ये उपलब्ध आहे.</string>
+    <string name="share_app">जगातील विविध देशांमधील, कोरोनाविषयी(COVID-19) नवीनतम माहिती मिळविण्यासाठी GoCorona अॅप डाउनलोड करा. GoCorona अॅप, इंग्रजी, मराठी आणि हिंदी भाषांमध्ये उपलब्ध आहे.
+    \n\n Download Link:- \nhttp://fourthquadrant.comli.com/androidapp/gocorona/gocorona.apk</string>
     <string name="New">New</string>
     <string name="country_details">Country Details</string>
     <string name="active">Active</string>
@@ -48,5 +49,6 @@
     <string name="retry">Retry</string>
     <string name="india_updates">इंडिया अपडेट्स</string>
     <string name="search_by_state">राज्य शोधा</string>
+    <string name="v">v</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -38,9 +38,11 @@
     <string name="search_by_country">Search by country</string>
 
     <!--Share Strings-->
-    <string name="share_app">Download the GoCorona application to get the latest information about the Corona
-        Virus from the different countries of the world. It also helps you with Symptoms, Precautions and
-        other important information. GoCorona application is available in english, marathi and hindi languages.</string>
+    <string name="share_app">I recommend the GoCorona Android application to get the latest information and updates about the Corona Virus(COVID-19),
+        from India and all Corona affected countries of the world. \nIt also helps you with Symptoms, Precautions and
+        other important information. \n\nGoCorona application is available in english, marathi and hindi languages.
+        \n\n Download Link:- \nhttp://fourthquadrant.comli.com/androidapp/gocorona/gocorona.apk
+    </string>
     <string name="New">New</string>
     <string name="country_details">Country Details</string>
     <string name="active">Active</string>
@@ -50,5 +52,6 @@
     <string name="retry">Retry</string>
     <string name="india_updates">India Updates</string>
     <string name="search_by_state">Search by state</string>
+    <string name="v">v</string>
 
 </resources>