Skip to content

Commit 8ab219c

Browse files
samtsternsamtstern
authored
Kotlin style fixes (#699)
1 parent ed84b6e commit 8ab219c

File tree

124 files changed

+923
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+923
-690
lines changed

‎.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[*.{java,kt}]
2+
max_line_length = 120

‎admob/app/src/main/java/com/google/samples/quickstart/admobexample/EntryChoiceActivity.kt

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.google.samples.quickstart.admobexample
33
import android.content.Intent
44
import com.firebase.example.internal.BaseEntryChoiceActivity
55
import com.firebase.example.internal.Choice
6-
import com.google.android.gms.common.util.CollectionUtils.listOf
76
import com.google.samples.quickstart.admobexample.java.MainActivity
87

98
class EntryChoiceActivity : BaseEntryChoiceActivity() {
@@ -20,5 +19,4 @@ class EntryChoiceActivity : BaseEntryChoiceActivity() {
2019
Intent(this, com.google.samples.quickstart.admobexample.kotlin.MainActivity::class.java))
2120
)
2221
}
23-
2422
}

‎admob/app/src/main/java/com/google/samples/quickstart/admobexample/java/MainActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
import android.util.Log;
2323
import android.view.View;
2424
import android.widget.Button;
25-
import com.google.android.gms.ads.AdListener;
25+
2626
// [SNIPPET load_banner_ad]
2727
// Load an ad into the AdView.
2828
// [START load_banner_ad]
29+
import com.google.android.gms.ads.AdListener;
2930
import com.google.android.gms.ads.AdRequest;
3031
import com.google.android.gms.ads.AdView;
31-
// [START_EXCLUDE]
3232
import com.google.android.gms.ads.InterstitialAd;
33+
// [START_EXCLUDE]
3334
import com.google.samples.quickstart.admobexample.R;
3435
// [END_EXCLUDE]
3536

‎admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/MainActivity.kt

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ import android.os.Bundle
55
import android.support.v7.app.AppCompatActivity
66
import android.util.Log
77
import com.google.android.gms.ads.AdListener
8+
89
// [SNIPPET load_banner_ad]
910
// Load an ad into the AdView.
1011
// [START load_banner_ad]
1112
import com.google.android.gms.ads.AdRequest
1213
// [START_EXCLUDE]
1314
import com.google.android.gms.ads.InterstitialAd
1415
import com.google.samples.quickstart.admobexample.R
15-
import kotlinx.android.synthetic.main.activity_main.*
16+
import kotlinx.android.synthetic.main.activity_main.adView
17+
import kotlinx.android.synthetic.main.activity_main.loadInterstitialButton
1618
// [END_EXCLUDE]
1719

1820
class MainActivity : AppCompatActivity() {
1921

2022
// [START_EXCLUDE]
21-
private lateinit var mInterstitialAd: InterstitialAd
22-
23+
private lateinit var interstitialAd: InterstitialAd
2324
// [END_EXCLUDE]
2425

2526
override fun onCreate(savedInstanceState: Bundle?) {
@@ -39,12 +40,12 @@ class MainActivity : AppCompatActivity() {
3940
// [START instantiate_interstitial_ad]
4041
// Create an InterstitialAd object. This same object can be re-used whenever you want to
4142
// show an interstitial.
42-
mInterstitialAd = InterstitialAd(this)
43-
mInterstitialAd.adUnitId = getString(R.string.interstitial_ad_unit_id)
43+
interstitialAd = InterstitialAd(this)
44+
interstitialAd.adUnitId = getString(R.string.interstitial_ad_unit_id)
4445
// [END instantiate_interstitial_ad]
4546

4647
// [START create_interstitial_ad_listener]
47-
mInterstitialAd.adListener = object : AdListener() {
48+
interstitialAd.adListener = object : AdListener() {
4849
override fun onAdClosed() {
4950
requestNewInterstitial()
5051
beginSecondActivity()
@@ -59,23 +60,23 @@ class MainActivity : AppCompatActivity() {
5960

6061
override fun onAdFailedToLoad(i: Int) {
6162
// See https://goo.gl/sCZj0H for possible error codes.
62-
Log.w(Companion.TAG, "onAdFailedToLoad:$i")
63+
Log.w(TAG, "onAdFailedToLoad:$i")
6364
}
6465
}
6566
// [END create_interstitial_ad_listener]
6667

6768
// [START display_interstitial_ad]
6869
loadInterstitialButton.setOnClickListener {
69-
if (mInterstitialAd.isLoaded) {
70-
mInterstitialAd.show()
70+
if (interstitialAd.isLoaded) {
71+
interstitialAd.show()
7172
} else {
7273
beginSecondActivity()
7374
}
7475
}
7576
// [END display_interstitial_ad]
7677

7778
// Disable button if an interstitial ad is not loaded yet.
78-
loadInterstitialButton.isEnabled = mInterstitialAd.isLoaded
79+
loadInterstitialButton.isEnabled = interstitialAd.isLoaded
7980
}
8081

8182
/**
@@ -86,7 +87,7 @@ class MainActivity : AppCompatActivity() {
8687
val adRequest = AdRequest.Builder()
8788
.build()
8889

89-
mInterstitialAd.loadAd(adRequest)
90+
interstitialAd.loadAd(adRequest)
9091
}
9192
// [END request_new_interstitial]
9293

@@ -106,7 +107,7 @@ class MainActivity : AppCompatActivity() {
106107
public override fun onResume() {
107108
super.onResume()
108109
adView.resume()
109-
if (!mInterstitialAd.isLoaded) {
110+
if (!interstitialAd.isLoaded) {
110111
requestNewInterstitial()
111112
}
112113
}
@@ -119,7 +120,6 @@ class MainActivity : AppCompatActivity() {
119120

120121
// [END add_lifecycle_methods]
121122
companion object {
122-
private val TAG = "MainActivity"
123+
private const val TAG = "MainActivity"
123124
}
124-
125125
}

‎admob/app/src/main/java/com/google/samples/quickstart/admobexample/kotlin/SecondActivity.kt

-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ class SecondActivity : AppCompatActivity() {
1010
super.onCreate(savedInstanceState)
1111
setContentView(R.layout.second_activity)
1212
}
13-
1413
}

‎analytics/app/src/main/java/com/google/firebase/quickstart/analytics/EntryChoiceActivity.kt

-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ class EntryChoiceActivity : BaseEntryChoiceActivity() {
2222
com.google.firebase.quickstart.analytics.kotlin.MainActivity::class.java))
2323
)
2424
}
25-
2625
}

‎analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/ImageFragment.kt

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ class ImageFragment : Fragment() {
2222
}
2323
}
2424

25-
override fun onCreateView(inflater: LayoutInflater,
26-
container: ViewGroup?,
27-
savedInstanceState: Bundle?): View? {
25+
override fun onCreateView(
26+
inflater: LayoutInflater,
27+
container: ViewGroup?,
28+
savedInstanceState: Bundle?
29+
): View? {
2830
val view = inflater.inflate(R.layout.fragment_main, null)
2931
val imageView = view.findViewById<ImageView>(R.id.imageView)
3032
imageView.setImageResource(resId)
@@ -49,5 +51,4 @@ class ImageFragment : Fragment() {
4951
return fragment
5052
}
5153
}
52-
5354
}

‎analytics/app/src/main/java/com/google/firebase/quickstart/analytics/kotlin/MainActivity.kt

+15-15
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import android.view.Menu
1414
import android.view.MenuItem
1515
import com.google.firebase.analytics.FirebaseAnalytics
1616
import com.google.firebase.quickstart.analytics.R
17-
import kotlinx.android.synthetic.main.activity_main.*
18-
import java.util.*
17+
import kotlinx.android.synthetic.main.activity_main.pagerTabStrip
18+
import kotlinx.android.synthetic.main.activity_main.viewPager
19+
import java.util.Locale
1920

2021
/**
2122
* Activity which displays numerous background images that may be viewed. These background images
@@ -38,13 +39,13 @@ class MainActivity : AppCompatActivity() {
3839
* The [android.support.v4.view.PagerAdapter] that will provide fragments for each image.
3940
* This uses a [FragmentPagerAdapter], which keeps every loaded fragment in memory.
4041
*/
41-
private lateinit var mImagePagerAdapter: ImagePagerAdapter
42+
private lateinit var imagePagerAdapter: ImagePagerAdapter
4243

4344
/**
4445
* The `FirebaseAnalytics` used to record screen views.
4546
*/
4647
// [START declare_analytics]
47-
private lateinit var mFirebaseAnalytics: FirebaseAnalytics
48+
private lateinit var firebaseAnalytics: FirebaseAnalytics
4849
// [END declare_analytics]
4950

5051
override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,7 +54,7 @@ class MainActivity : AppCompatActivity() {
5354

5455
// [START shared_app_measurement]
5556
// Obtain the FirebaseAnalytics instance.
56-
mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)
57+
firebaseAnalytics = FirebaseAnalytics.getInstance(this)
5758
// [END shared_app_measurement]
5859

5960
// On first app open, ask the user his/her favorite food. Then set this as a user property
@@ -65,12 +66,11 @@ class MainActivity : AppCompatActivity() {
6566
setUserFavoriteFood(userFavoriteFood)
6667
}
6768

68-
6969
// Create the adapter that will return a fragment for each image.
70-
mImagePagerAdapter = ImagePagerAdapter(supportFragmentManager, IMAGE_INFOS)
70+
imagePagerAdapter = ImagePagerAdapter(supportFragmentManager, IMAGE_INFOS)
7171

7272
// Set up the ViewPager with the pattern adapter.
73-
viewPager.adapter = mImagePagerAdapter
73+
viewPager.adapter = imagePagerAdapter
7474

7575
// Workaround for AppCompat issue not showing ViewPager titles
7676
val params = pagerTabStrip.layoutParams as ViewPager.LayoutParams
@@ -131,7 +131,7 @@ class MainActivity : AppCompatActivity() {
131131
.apply()
132132

133133
// [START user_property]
134-
mFirebaseAnalytics.setUserProperty("favorite_food", food)
134+
firebaseAnalytics.setUserProperty("favorite_food", food)
135135
// [END user_property]
136136
}
137137

@@ -156,7 +156,7 @@ class MainActivity : AppCompatActivity() {
156156
val params = Bundle()
157157
params.putString("image_name", name)
158158
params.putString("full_text", text)
159-
mFirebaseAnalytics.logEvent("share_image", params)
159+
firebaseAnalytics.logEvent("share_image", params)
160160
// [END custom_event]
161161
}
162162
return false
@@ -197,7 +197,7 @@ class MainActivity : AppCompatActivity() {
197197
bundle.putString(FirebaseAnalytics.Param.ITEM_ID, id)
198198
bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, name)
199199
bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, "image")
200-
mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle)
200+
firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SELECT_CONTENT, bundle)
201201
// [END image_view_event]
202202
}
203203

@@ -210,7 +210,7 @@ class MainActivity : AppCompatActivity() {
210210
val screenName = "${getCurrentImageId()}-${getCurrentImageTitle()}"
211211

212212
// [START set_current_screen]
213-
mFirebaseAnalytics.setCurrentScreen(this, screenName, null /* class override */)
213+
firebaseAnalytics.setCurrentScreen(this, screenName, null /* class override */)
214214
// [END set_current_screen]
215215
}
216216

@@ -219,8 +219,8 @@ class MainActivity : AppCompatActivity() {
219219
* one of the sections/tabs/pages.
220220
*/
221221
inner class ImagePagerAdapter(
222-
fm: FragmentManager,
223-
private val infos: Array<ImageInfo>
222+
fm: FragmentManager,
223+
private val infos: Array<ImageInfo>
224224
) : FragmentPagerAdapter(fm) {
225225

226226
override fun getItem(position: Int): Fragment {
@@ -239,4 +239,4 @@ class MainActivity : AppCompatActivity() {
239239
return getString(info.title).toUpperCase(l)
240240
}
241241
}
242-
}
242+
}

‎app-indexing/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Getting Started
1414
- [Add Firebase to your Android Project](https://firebase.google.com/docs/android/setup).
1515
- Open the App Indexing project in Android Studio.
1616
- Run the sample on your Android device or emulator by issuing the following command using **adb** tool:
17-
`adb shell am start -a android.intent.action.VIEW -d "https://www.example.com/articles/test" com.google.samples.quickstart.app_indexing`
17+
`adb shell am start -a android.intent.action.VIEW -d "https://www.example.com/articles/test" com.google.samples.quickstart.appindexing`
1818
- Use ADD STICKERS and CLEAR STICKERS buttons to add and remove stickers from the index.
1919

2020
Result

‎app-indexing/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ android {
77
compileSdkVersion 28
88

99
defaultConfig {
10-
applicationId "com.google.samples.quickstart.app_indexing"
10+
applicationId "com.google.samples.quickstart.appindexing"
1111
minSdkVersion 18
1212
targetSdkVersion 28
1313
versionCode 2

‎app-indexing/app/src/androidTest/java/com/google/samples/quickstart/app_indexing/MainActivityTest.java renamed to ‎app-indexing/app/src/androidTest/java/com/google/samples/quickstart/appindexing/MainActivityTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.google.samples.quickstart.app_indexing;
1+
package com.google.samples.quickstart.appindexing;
22
/*
33
* Copyright (C) The Android Open Source Project
44
*
@@ -20,7 +20,7 @@
2020
import android.support.test.rule.ActivityTestRule;
2121
import android.support.test.runner.AndroidJUnit4;
2222

23-
import com.google.samples.quickstart.app_indexing.java.MainActivity;
23+
import com.google.samples.quickstart.appindexing.java.MainActivity;
2424

2525
import org.junit.Rule;
2626
import org.junit.Test;

‎app-indexing/app/src/androidTest/java/com/google/samples/quickstart/app_indexing/kotlin/MainActivityTest.kt renamed to ‎app-indexing/app/src/androidTest/java/com/google/samples/quickstart/appindexing/kotlin/MainActivityTest.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.google.samples.quickstart.app_indexing.kotlin
1+
package com.google.samples.quickstart.appindexing.kotlin
22

33
import android.content.Intent
44
import android.net.Uri
@@ -8,12 +8,11 @@ import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
88
import android.support.test.espresso.matcher.ViewMatchers.withText
99
import android.support.test.rule.ActivityTestRule
1010
import android.support.test.runner.AndroidJUnit4
11-
import com.google.samples.quickstart.app_indexing.java.MainActivity
11+
import com.google.samples.quickstart.appindexing.java.MainActivity
1212
import org.junit.Rule
1313
import org.junit.Test
1414
import org.junit.runner.RunWith
1515

16-
1716
@RunWith(AndroidJUnit4::class)
1817
class MainActivityTest {
1918

‎app-indexing/app/src/main/AndroidManifest.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.samples.quickstart.app_indexing">
3+
package="com.google.samples.quickstart.appindexing">
44

55
<uses-permission android:name="android.permission.INTERNET" />
66

@@ -10,7 +10,7 @@
1010
android:label="@string/app_name"
1111
android:theme="@style/AppTheme">
1212

13-
<activity android:name=".EntryChoiceActivity">
13+
<activity android:name="com.google.samples.quickstart.appindexing.EntryChoiceActivity">
1414
<intent-filter>
1515
<action android:name="android.intent.action.MAIN" />
1616

@@ -20,7 +20,7 @@
2020

2121
<!-- [START intent_filter] -->
2222
<activity
23-
android:name="com.google.samples.quickstart.app_indexing.java.MainActivity"
23+
android:name="com.google.samples.quickstart.appindexing.java.MainActivity"
2424
android:exported="true"
2525
android:label="@string/app_name"
2626
android:launchMode="singleTop">
@@ -53,7 +53,7 @@
5353
<!-- [END intent_filter] -->
5454

5555
<activity
56-
android:name="com.google.samples.quickstart.app_indexing.kotlin.MainActivity"
56+
android:name="com.google.samples.quickstart.appindexing.kotlin.MainActivity"
5757
android:exported="true"
5858
android:label="@string/app_name"
5959
android:launchMode="singleTop">
@@ -85,19 +85,19 @@
8585
</activity>
8686

8787
<provider
88-
android:name="com.google.samples.quickstart.app_indexing.java.StickerProvider"
89-
android:authorities="com.google.samples.quickstart.app_indexing.java.StickerProvider"
88+
android:name="com.google.samples.quickstart.appindexing.java.StickerProvider"
89+
android:authorities="com.google.samples.quickstart.appindexing.java.StickerProvider"
9090
android:exported="true"
9191
android:grantUriPermissions="true" />
9292

9393
<provider
94-
android:name="com.google.samples.quickstart.app_indexing.kotlin.StickerProvider"
95-
android:authorities="com.google.samples.quickstart.app_indexing.kotlin.StickerProvider"
94+
android:name="com.google.samples.quickstart.appindexing.kotlin.StickerProvider"
95+
android:authorities="com.google.samples.quickstart.appindexing.kotlin.StickerProvider"
9696
android:exported="true"
9797
android:grantUriPermissions="true" />
9898

9999
<service
100-
android:name=".java.AppIndexingService"
100+
android:name="com.google.samples.quickstart.appindexing.java.AppIndexingService"
101101
android:exported="true"
102102
android:permission="com.google.android.gms.permission.APPINDEXING">
103103
<intent-filter>
@@ -106,7 +106,7 @@
106106
</service>
107107

108108
<service
109-
android:name=".kotlin.AppIndexingService"
109+
android:name="com.google.samples.quickstart.appindexing.kotlin.AppIndexingService"
110110
android:exported="true"
111111
android:permission="com.google.android.gms.permission.APPINDEXING">
112112
<intent-filter>

0 commit comments

Comments
 (0)