Merge pull request #35 from ritwikshanker/refactor/about-screen-update

Added another contributor
ritwikshanker · Oct 8, 2020 · 248e4a1 · 248e4a1
2 parents 2c67e9d + 083f311
commit 248e4a1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,6 @@ local.properties
 .idea/*.xml
 
 # ignore apk files
-.idea/caches/
 .idea/codeStyles/
 .idea/copyright/
 .idea/dictionaries/

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_icon_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:fullBackupContent="@xml/backup_descriptor">
         <activity
             android:name=".MainActivity"
             android:screenOrientation="portrait">

diff --git a/app/src/main/java/com/example/gocoronago/about/AboutFragment.kt b/app/src/main/java/com/example/gocoronago/about/AboutFragment.kt
@@ -1,6 +1,5 @@
 package com.example.gocoronago.about
 
-import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.util.TypedValue
@@ -24,7 +23,8 @@ class AboutFragment : Fragment() {
     private val contributors = listOf(
         Contributor("Ritwik Shanker", "🇮🇳", true),
         Contributor("Sunny", "🇮🇳"),
-        Contributor("M. Asrof Bayhaqqi", "🇮🇩")
+        Contributor("M. Asrof Bayhaqqi", "🇮🇩"),
+        Contributor("Jacob", "\uD83C\uDDF7\uD83C\uDDFA")
     )
 
     override fun onCreateView(
@@ -80,7 +80,7 @@ class AboutFragment : Fragment() {
 
     private fun createContributorTextView(index: Int, contributor: Contributor): TextView {
         val contributorText = "${contributor.flag} ${contributor.name}" +
-            if (contributor.owner) " (Owner)" else ""
+                if (contributor.owner) " (Owner)" else ""
         return TextView(requireContext()).apply {
             text = contributorText
             setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)

diff --git a/app/src/main/java/com/example/gocoronago/stayHome/StayHomeActivity.kt b/app/src/main/java/com/example/gocoronago/stayHome/StayHomeActivity.kt
@@ -3,7 +3,6 @@ package com.example.gocoronago.stayHome
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Menu
 import androidx.appcompat.app.AppCompatActivity
 import com.example.gocoronago.R
 

diff --git a/app/src/main/java/com/example/gocoronago/ui/main/MainFragment.kt b/app/src/main/java/com/example/gocoronago/ui/main/MainFragment.kt
@@ -4,10 +4,11 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
-import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider

diff --git a/app/src/main/java/com/example/gocoronago/ui/main/MainRepo.kt b/app/src/main/java/com/example/gocoronago/ui/main/MainRepo.kt
@@ -1,6 +1,5 @@
 package com.example.gocoronago.ui.main
 
-import android.content.Context
 import com.example.gocoronago.HomePage.Summary
 import com.example.gocoronago.base.BaseRepo
 

diff --git a/app/src/main/java/com/example/gocoronago/ui/main/MainViewModelFactory.kt b/app/src/main/java/com/example/gocoronago/ui/main/MainViewModelFactory.kt
@@ -1,6 +1,5 @@
 package com.example.gocoronago.ui.main
 
-import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 

diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude specific shared preferences that contain GCM registration Id -->
+</full-backup-content>