Skip to content

Commit 1ca079a

Browse files
meiron03meiron03
committed
Lint
1 parent 31eb7e3 commit 1ca079a

File tree

97 files changed

+1410
-1256
lines changed

Some content is hidden

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

97 files changed

+1410
-1256
lines changed

‎.github/workflows/android-workflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165

166166
- name: Install ktlint
167167
run: |
168-
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.2.1/ktlint
168+
curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.3.1/ktlint
169169
chmod a+x ktlint
170170
sudo mv ktlint /usr/local/bin/
171171

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,31 @@ class AboutFragment : Fragment() {
4848
if (gif is AnimatedVectorDrawable) {
4949
gif.start()
5050
} else {
51-
Glide.with(this).asGif().load(R.drawable.logo_gif_transparent).listener(
52-
object : RequestListener<GifDrawable> {
53-
override fun onLoadFailed(
54-
e: GlideException?,
55-
model: Any?,
56-
target: com.bumptech.glide.request.target.Target<GifDrawable>?,
57-
isFirstResource: Boolean,
58-
): Boolean {
59-
return false
60-
}
51+
Glide
52+
.with(this)
53+
.asGif()
54+
.load(R.drawable.logo_gif_transparent)
55+
.listener(
56+
object : RequestListener<GifDrawable> {
57+
override fun onLoadFailed(
58+
e: GlideException?,
59+
model: Any?,
60+
target: com.bumptech.glide.request.target.Target<GifDrawable>?,
61+
isFirstResource: Boolean,
62+
): Boolean = false
6163

62-
override fun onResourceReady(
63-
resource: GifDrawable,
64-
model: Any,
65-
target: com.bumptech.glide.request.target.Target<GifDrawable>?,
66-
dataSource: DataSource,
67-
isFirstResource: Boolean,
68-
): Boolean {
69-
resource.setLoopCount(1)
70-
return false
71-
}
72-
},
73-
).into(binding.logoGifIv)
64+
override fun onResourceReady(
65+
resource: GifDrawable,
66+
model: Any,
67+
target: com.bumptech.glide.request.target.Target<GifDrawable>?,
68+
dataSource: DataSource,
69+
isFirstResource: Boolean,
70+
): Boolean {
71+
resource.setLoopCount(1)
72+
return false
73+
}
74+
},
75+
).into(binding.logoGifIv)
7476
}
7577

7678
binding.ourTeamRv.layoutManager = GridLayoutManager(context, 3)
@@ -103,7 +105,8 @@ class AboutFragment : Fragment() {
103105
binding.licensesBtn.setOnClickListener {
104106
val webView = LayoutInflater.from(mActivity).inflate(R.layout.dialog_licenses, null) as WebView
105107
webView.loadUrl("file:///android_asset/open_source_licenses.html")
106-
AlertDialog.Builder(mActivity, R.style.AppTheme_AppBarOverlay_Light)
108+
AlertDialog
109+
.Builder(mActivity, R.style.AppTheme_AppBarOverlay_Light)
107110
.setTitle(getString(R.string.action_licenses))
108111
.setView(webView)
109112
.setPositiveButton(android.R.string.ok, null)

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/BookGsrFragment.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,16 @@ class BookGsrFragment : Fragment() {
9191
emailEt.setText(email)
9292

9393
submit.setOnClickListener {
94-
if (firstNameEt.text.toString().matches("".toRegex()) || lastNameEt.text.toString().matches("".toRegex()) ||
94+
if (firstNameEt.text.toString().matches("".toRegex()) ||
95+
lastNameEt.text.toString().matches("".toRegex()) ||
9596
emailEt.text.toString().matches("".toRegex())
9697
) {
97-
Toast.makeText(
98-
activity,
99-
"Please fill in all fields before booking",
100-
Toast.LENGTH_LONG,
101-
).show()
98+
Toast
99+
.makeText(
100+
activity,
101+
"Please fill in all fields before booking",
102+
Toast.LENGTH_LONG,
103+
).show()
102104
} else if (!emailEt.text.toString().matches("""\w+@(seas\.|sas\.|wharton\.|nursing\.)?upenn\.edu""".toRegex())) {
103105
Toast.makeText(activity, "Please enter a valid Penn email", Toast.LENGTH_LONG).show()
104106
} else {

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/CampusExpressLoginFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ class CampusExpressLoginFragment : Fragment() {
5757
inflater: LayoutInflater,
5858
container: ViewGroup?,
5959
savedInstanceState: Bundle?,
60-
): View? {
61-
return inflater.inflate(R.layout.fragment_campus_express_login, container, false)
62-
}
60+
): View? = inflater.inflate(R.layout.fragment_campus_express_login, container, false)
6361

6462
override fun onCreate(savedInstanceState: Bundle?) {
6563
super.onCreate(savedInstanceState)
@@ -86,7 +84,8 @@ class CampusExpressLoginFragment : Fragment() {
8684
headerLayout = view.findViewById(R.id.linear_layout)
8785
cancelButton = view.findViewById(R.id.cancel_button)
8886
val uri =
89-
Uri.parse(campusExpressAuthUrl)
87+
Uri
88+
.parse(campusExpressAuthUrl)
9089
.buildUpon()
9190
.appendQueryParameter("response_type", "code")
9291
.appendQueryParameter("client_id", clientID)
@@ -135,7 +134,8 @@ class CampusExpressLoginFragment : Fragment() {
135134
private fun goToDiningInsights(refresh: Boolean) {
136135
if (refresh) {
137136
val fragment = DiningInsightsFragment()
138-
parentFragmentManager.beginTransaction()
137+
parentFragmentManager
138+
.beginTransaction()
139139
.replace(R.id.campus_express_page, fragment)
140140
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
141141
.addToBackStack(null)

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@ class DiningFragment : Fragment() {
154154

155155
// Map each item in the list of venues to a Venue Observable, then map each Venue to a DiningHall Observable
156156
try {
157-
mStudentLife.venues()
157+
mStudentLife
158+
.venues()
158159
.flatMap { venues -> Observable.from(venues) }
159160
.flatMap { venue ->
160161
val hall = createHall(venue)
161162
Observable.just(hall)
162-
}
163-
.toList()
163+
}.toList()
164164
.subscribe({ diningHalls ->
165165
mActivity.runOnUiThread {
166166
getMenus(diningHalls)

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHallWidget.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ class DiningHallWidget : AppWidgetProvider() {
111111
okHttpClient.setWriteTimeout(35, TimeUnit.SECONDS) // Write timeout
112112

113113
val restAdapter =
114-
RestAdapter.Builder()
114+
RestAdapter
115+
.Builder()
115116
.setConverter(GsonConverter(gson))
116117
.setClient(OkClient(okHttpClient))
117118
.setEndpoint("https://pennmobile.org/api")

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ class DiningInfoFragment : Fragment() {
5959
}
6060
}
6161

62-
private fun hasMeals(day: VenueInterval): Boolean {
63-
return day.meals.isNotEmpty()
64-
}
62+
private fun hasMeals(day: VenueInterval): Boolean = day.meals.isNotEmpty()
6563

6664
private fun addDiningHour(
6765
day: VenueInterval,

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInsightsFragment.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ class DiningInsightsFragment : Fragment() {
7575
val accessToken = networkManager.getAccessToken()
7676
if (accessToken == "") {
7777
val fragment = CampusExpressLoginFragment()
78-
parentFragmentManager.beginTransaction()
78+
parentFragmentManager
79+
.beginTransaction()
7980
.replace(R.id.dining_insights_page, fragment)
8081
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
8182
.addToBackStack("DiningInsightsFragment")
@@ -112,7 +113,8 @@ class DiningInsightsFragment : Fragment() {
112113
if (accessToken == "") {
113114
binding.diningInsightsRefresh.isRefreshing = false
114115
val fragment = CampusExpressLoginFragment()
115-
parentFragmentManager.beginTransaction()
116+
parentFragmentManager
117+
.beginTransaction()
116118
.replace(R.id.dining_insights_page, fragment)
117119
.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
118120
.addToBackStack("DiningInsightsFragment")

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningSettingsFragment.kt

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import retrofit.RetrofitError
2525
import retrofit.client.Response
2626
import rx.Observable
2727

28-
class DiningSettingsFragment(dataModel: HomepageDataModel) : Fragment() {
28+
class DiningSettingsFragment(
29+
dataModel: HomepageDataModel,
30+
) : Fragment() {
2931
private lateinit var mActivity: MainActivity
3032
private lateinit var mStudentLife: StudentLife
3133
private lateinit var halls: List<DiningHall>
@@ -93,13 +95,13 @@ class DiningSettingsFragment(dataModel: HomepageDataModel) : Fragment() {
9395
// Map each item in the list of venues to a Venue Observable, then map each Venue to a DiningHall Observable
9496
originalPreferences = dataModel.getDiningHallPrefs()
9597
try {
96-
mStudentLife.venues()
98+
mStudentLife
99+
.venues()
97100
.flatMap { venues -> Observable.from(venues) }
98101
.flatMap { venue ->
99102
val hall = DiningFragment.createHall(venue)
100103
Observable.just(hall)
101-
}
102-
.toList()
104+
}.toList()
103105
.subscribe({ diningHalls ->
104106
mActivity.runOnUiThread {
105107
halls = diningHalls
@@ -162,11 +164,12 @@ class DiningSettingsFragment(dataModel: HomepageDataModel) : Fragment() {
162164

163165
override fun failure(error: RetrofitError) {
164166
Log.e("Dining", "Error saving dining preferences: $error")
165-
Toast.makeText(
166-
mActivity,
167-
"Error saving dining preferences",
168-
Toast.LENGTH_SHORT,
169-
).show()
167+
Toast
168+
.makeText(
169+
mActivity,
170+
"Error saving dining preferences",
171+
Toast.LENGTH_SHORT,
172+
).show()
170173
}
171174
},
172175
)

‎PennMobile/src/main/java/com/pennapps/labs/pennmobile/FlingFragment.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class FlingFragment : Fragment() {
5858
inflater: LayoutInflater,
5959
container: ViewGroup?,
6060
savedInstanceState: Bundle?,
61-
): View? {
61+
): View {
6262
// Inflate the layout for this fragment
6363
_binding = FragmentFlingBinding.inflate(inflater, container, false)
6464
val view = binding.root
@@ -75,13 +75,15 @@ class FlingFragment : Fragment() {
7575
},
7676
{
7777
activity?.runOnUiThread {
78-
Toast.makeText(
79-
activity,
80-
"Could not retrieve Spring Fling schedule",
81-
Toast.LENGTH_LONG
82-
).show()
78+
Toast
79+
.makeText(
80+
activity,
81+
"Could not retrieve Spring Fling schedule",
82+
Toast.LENGTH_LONG,
83+
).show()
8384
}
84-
})
85+
},
86+
)
8587
} catch (e: Exception) {
8688
e.printStackTrace()
8789
}
@@ -96,8 +98,8 @@ class FlingFragment : Fragment() {
9698

9799
override fun onResume() {
98100
super.onResume()
99-
val mActivity: MainActivity? = activity as MainActivity
100-
mActivity?.removeTabs()
101-
mActivity?.setTitle(R.string.spring_fling)
101+
val mActivity: MainActivity = activity as MainActivity
102+
mActivity.removeTabs()
103+
mActivity.setTitle(R.string.spring_fling)
102104
}
103105
}

0 commit comments

Comments
 (0)