naming style

Author: butterflyforever

android/canonical/app/build.gradle

@@ -36,6 +36,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.gms:play-services-auth:18.0.0'
     implementation 'com.google.android.material:material:1.1.0'

android/canonical/app/google-services.json

@@ -15,23 +15,21 @@ import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
 
 class MainActivity : AppCompatActivity() {
-  lateinit var mGoogleSignInClient: GoogleSignInClient
+  lateinit var googleSignInClient: GoogleSignInClient
   private lateinit var auth: FirebaseAuth
-  private val tag = "MainActivity-Login"
-  private val firebaseTag = "MainActivity-Login"
 
   private fun googleSignInInit() {
     val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
       .requestIdToken(getString(R.string.default_web_client_id))
       .requestEmail()
       .build()
 
-    mGoogleSignInClient = GoogleSignIn.getClient(this, gso)
+    googleSignInClient = GoogleSignIn.getClient(this, gso)
   }
 
   private fun signIn() {
     auth = FirebaseAuth.getInstance()
-    val signInIntent = mGoogleSignInClient.signInIntent
+    val signInIntent = googleSignInClient.signInIntent
     startActivityForResult(signInIntent, RC_SIGN_IN)
   }
 
@@ -46,16 +44,16 @@ class MainActivity : AppCompatActivity() {
         try {
           // Google Sign In was successful, authenticate with Firebase
           val account = task.getResult(ApiException::class.java)!!
-          Log.d(tag, "firebaseAuthWithGoogle:" + account.id)
+          Log.d(TAG, "firebaseAuthWithGoogle:" + account.id)
           firebaseAuthWithGoogle(account.idToken!!)
           setContentView(R.layout.activity_main)
           setupNavigationBar()
         } catch (e: ApiException) {
           // Google Sign In failed
-          Log.w(tag, "Google sign in failed", e)
+          Log.w(TAG, "Google sign in failed", e)
         }
       } else {
-        Log.w(tag, "Google sign in unsuccessful")
+        Log.w(TAG, "Google sign in unsuccessful")
       }
 
     }
@@ -69,12 +67,12 @@ class MainActivity : AppCompatActivity() {
       .addOnCompleteListener(this) { task ->
         if (task.isSuccessful) {
           // Firebase Sign in success, update UI with the signed-in user's information
-          Log.d(firebaseTag, "signInWithCredential:success")
+          Log.d(FIREBASE_TAG, "signInWithCredential:success")
           val user = auth.currentUser
-          Log.d(firebaseTag, "signed-in user's Email:" + user!!.email)
+          Log.d(FIREBASE_TAG, "signed-in user's Email:" + user!!.email)
         } else {
           // If sign in fails, log a message to the user.
-          Log.w(firebaseTag, "signInWithCredential:failure", task.exception)
+          Log.w(FIREBASE_TAG, "signInWithCredential:failure", task.exception)
         }
       }
   }
@@ -152,6 +150,8 @@ class MainActivity : AppCompatActivity() {
 
   companion object {
     private const val RC_SIGN_IN = 0
+    private const val TAG = "MainActivity-Login"
+    private const val FIREBASE_TAG = "MainAct-firebase-Login"
   }
 
 

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MainActivity.kt

@@ -14,7 +14,7 @@ import com.google.firebase.auth.FirebaseAuth
 
 private const val ARG_PARAM1 = "param1"
 private const val ARG_PARAM2 = "param2"
-private const val meTag = "MeFragment"
+
 
 /**
  * A simple [Fragment] subclass.
@@ -50,7 +50,7 @@ class MeFragment : Fragment() {
         logoutButton.setOnClickListener {
             // Sign out both Google account and Firebase
             FirebaseAuth.getInstance().signOut()
-            (activity as MainActivity).mGoogleSignInClient.signOut().addOnCompleteListener {
+            (activity as MainActivity).googleSignInClient.signOut().addOnCompleteListener {
                 val intent = Intent(context, MainActivity::class.java)
                 startActivity(intent)
             }
@@ -62,10 +62,10 @@ class MeFragment : Fragment() {
         super.onStart()
         val account = GoogleSignIn.getLastSignedInAccount(this.context)
         account?.let {
-            Log.i(meTag, "Already login")
+            Log.i(ME_TAG, "Already login")
             view?.findViewById<TextView>(R.id.textView)?.text = account.displayName
         } ?.run {
-            Log.i(meTag, "No login")
+            Log.i(ME_TAG, "No login")
         }
     }
 
@@ -79,6 +79,9 @@ class MeFragment : Fragment() {
          * @param param2 Parameter 2.
          * @return A new instance of fragment MeFragment.
          */
+
+        private const val ME_TAG = "MeFragment"
+
         // TODO: Rename and change types and number of parameters
         @JvmStatic
         fun newInstance(param1: String, param2: String) =

android/canonical/app/src/main/java/com/google/samples/quickstart/canonical/MeFragment.kt

@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.Chronometer
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.ViewModelProviders
@@ -51,6 +50,8 @@ class RunFragment : Fragment() {
             param2 = it.getString(ARG_PARAM2)
         }
 
+//        stopwatchVM = StopwatchViewModel()
+
         stopwatchVM = activity?.run {
             ViewModelProviders.of(this)[StopwatchViewModel::class.java]
         } ?: throw Exception("Null Activity")