Skip to content

Commit 717a7b4

Browse files
thagikurathagikura
authored
Bump up versions of dependencies (#338)
After this change, minSdkVersion is going to be 14 since the support library 26 isn't able to set the minSdkVersion lower than 14. Also findViewById now requires type inference. Modified the code that uses findViewById.
1 parent fb956ef commit 717a7b4

File tree

10 files changed

+50
-65
lines changed

10 files changed

+50
-65
lines changed

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
buildscript {
2020
ext {
21-
minSdkVersion = 9
22-
targetSdkVersion = 25
23-
compileSdkVersion = 25
24-
buildToolsVersion = "25.0.3"
21+
minSdkVersion = 14
22+
targetSdkVersion = 26
23+
compileSdkVersion = 26
24+
buildToolsVersion = "26.0.0"
2525
androidGradlePluginVersion = "2.3.3"
2626
androidMavenGradlePluginVersion = "1.5"
2727
gradleBintrayPluginVersion = "1.6"
2828
kotlinVersion = "1.1.3"
29-
supportLibVersion = "25.3.1"
30-
espressoVersion = "2.2.2"
31-
testRunnerVersion = "0.5"
29+
supportLibVersion = "26.0.0"
30+
espressoVersion = "3.0.0"
31+
testRunnerVersion = "1.0.0"
3232
junitVersion = "4.12"
3333
}
3434

‎circle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ machine:
66

77
dependencies:
88
pre:
9-
- echo y | android update sdk --no-ui --all --filter "android-25,build-tools-25.0.3,tools,platform-tools,extra-android-m2repository"
9+
- echo y | android update sdk --no-ui --all --filter "android-26,build-tools-26.0.0,tools,platform-tools,extra-android-m2repository"
1010
cache_directories:
1111
- ~/.android
1212
override:

‎demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.google.android.flexbox.FlexboxLayoutManager
2727
*/
2828
internal class CatViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
2929

30-
private val imageView = itemView.findViewById(R.id.imageview) as ImageView
30+
private val imageView: ImageView = itemView.findViewById(R.id.imageview)
3131

3232
internal fun bindTo(@DrawableRes drawableRes: Int) {
3333
imageView.setImageResource(drawableRes)

‎demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MainActivity : AppCompatActivity() {
3838
super.onCreate(savedInstanceState)
3939
setContentView(R.layout.activity_main)
4040

41-
val toolbar = findViewById(R.id.toolbar) as Toolbar
41+
val toolbar: Toolbar = findViewById(R.id.toolbar)
4242
setSupportActionBar(toolbar)
4343

4444
val flexboxLayoutManager = FlexboxLayoutManager(this).apply {
@@ -47,7 +47,7 @@ class MainActivity : AppCompatActivity() {
4747
alignItems = AlignItems.STRETCH
4848
}
4949

50-
val recyclerView = findViewById(R.id.recyclerview) as RecyclerView
50+
val recyclerView: RecyclerView = findViewById(R.id.recyclerview)
5151
recyclerView.apply {
5252
layoutManager = flexboxLayoutManager
5353
adapter = CatAdapter()

‎demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt‎

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ internal class FlexItemEditFragment : DialogFragment() {
9494
dialog.setTitle((viewIndex + 1).toString())
9595

9696
val activity = activity
97-
val orderTextInput = view
98-
.findViewById(R.id.input_layout_order) as TextInputLayout
99-
val orderEdit = view.findViewById(R.id.edit_text_order) as EditText
97+
val orderTextInput: TextInputLayout = view.findViewById(R.id.input_layout_order)
98+
val orderEdit: EditText = view.findViewById(R.id.edit_text_order)
10099
orderEdit.setText(flexItem.order.toString())
101100
orderEdit.addTextChangedListener(
102101
FlexEditTextWatcher(activity, orderTextInput, IntegerInputValidator(),
@@ -106,26 +105,23 @@ internal class FlexItemEditFragment : DialogFragment() {
106105
orderEdit.isEnabled = false
107106
}
108107

109-
val flexGrowInput = view
110-
.findViewById(R.id.input_layout_flex_grow) as TextInputLayout
111-
val flexGrowEdit = view.findViewById(R.id.edit_text_flex_grow) as EditText
108+
val flexGrowInput: TextInputLayout = view .findViewById(R.id.input_layout_flex_grow)
109+
val flexGrowEdit: EditText = view.findViewById(R.id.edit_text_flex_grow)
112110
flexGrowEdit.setText(flexItem.flexGrow.toString())
113111
flexGrowEdit.addTextChangedListener(
114112
FlexEditTextWatcher(activity, flexGrowInput, NonNegativeDecimalInputValidator(),
115113
R.string.must_be_non_negative_float))
116114

117-
val flexShrinkInput = view
118-
.findViewById(R.id.input_layout_flex_shrink) as TextInputLayout
119-
val flexShrinkEdit = view.findViewById(
120-
R.id.edit_text_flex_shrink) as EditText
115+
val flexShrinkInput: TextInputLayout = view.findViewById(R.id.input_layout_flex_shrink)
116+
val flexShrinkEdit: EditText = view.findViewById(R.id.edit_text_flex_shrink)
121117
flexShrinkEdit.setText(flexItem.flexShrink.toString())
122118
flexShrinkEdit.addTextChangedListener(
123119
FlexEditTextWatcher(activity, flexShrinkInput, NonNegativeDecimalInputValidator(),
124120
R.string.must_be_non_negative_float))
125121

126-
val flexBasisPercentInput = view.findViewById(R.id.input_layout_flex_basis_percent) as TextInputLayout
127-
val flexBasisPercentEdit = view.findViewById(
128-
R.id.edit_text_flex_basis_percent) as EditText
122+
val flexBasisPercentInput: TextInputLayout =
123+
view.findViewById(R.id.input_layout_flex_basis_percent)
124+
val flexBasisPercentEdit: EditText = view.findViewById(R.id.edit_text_flex_basis_percent)
129125
if (flexItem.flexBasisPercent != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
130126
flexBasisPercentEdit
131127
.setText(Math.round(flexItem.flexBasisPercent * 100).toString())
@@ -136,52 +132,43 @@ internal class FlexItemEditFragment : DialogFragment() {
136132
FlexEditTextWatcher(activity, flexBasisPercentInput, FlexBasisPercentInputValidator(),
137133
R.string.must_be_minus_one_or_non_negative_integer))
138134

139-
val widthInput = view
140-
.findViewById(R.id.input_layout_width) as TextInputLayout
141-
val widthEdit = view.findViewById(R.id.edit_text_width) as EditText
135+
val widthInput: TextInputLayout = view.findViewById(R.id.input_layout_width)
136+
val widthEdit: EditText = view.findViewById(R.id.edit_text_width)
142137
widthEdit.setText(activity.pixelToDp(flexItem.width).toString())
143138
widthEdit.addTextChangedListener(
144139
FlexEditTextWatcher(activity, widthInput, DimensionInputValidator(),
145140
R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
146141

147-
val heightInput = view
148-
.findViewById(R.id.input_layout_height) as TextInputLayout
149-
val heightEdit = view.findViewById(
150-
R.id.edit_text_height) as EditText
142+
val heightInput: TextInputLayout = view.findViewById(R.id.input_layout_height)
143+
val heightEdit: EditText= view.findViewById(R.id.edit_text_height)
151144
heightEdit.setText(activity.pixelToDp(flexItem.height).toString())
152145
heightEdit.addTextChangedListener(
153146
FlexEditTextWatcher(activity, heightInput, DimensionInputValidator(),
154147
R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
155148

156-
val minWidthInput = view
157-
.findViewById(R.id.input_layout_min_width) as TextInputLayout
158-
val minWidthEdit = view.findViewById(R.id.edit_text_min_width) as EditText
149+
val minWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_min_width)
150+
val minWidthEdit: EditText = view.findViewById(R.id.edit_text_min_width)
159151
minWidthEdit.setText(activity.pixelToDp(flexItem.minWidth).toString())
160152
minWidthEdit.addTextChangedListener(
161153
FlexEditTextWatcher(activity, minWidthInput, FixedDimensionInputValidator(),
162154
R.string.must_be_non_negative_integer))
163155

164-
val minHeightInput = view
165-
.findViewById(R.id.input_layout_min_height) as TextInputLayout
166-
val minHeightEdit = view.findViewById(
167-
R.id.edit_text_min_height) as EditText
156+
val minHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_min_height)
157+
val minHeightEdit: EditText = view.findViewById(R.id.edit_text_min_height)
168158
minHeightEdit.setText(activity.pixelToDp(flexItem.minHeight).toString())
169159
minHeightEdit.addTextChangedListener(
170160
FlexEditTextWatcher(activity, minHeightInput, FixedDimensionInputValidator(),
171161
R.string.must_be_non_negative_integer))
172162

173-
val maxWidthInput = view
174-
.findViewById(R.id.input_layout_max_width) as TextInputLayout
175-
val maxWidthEdit = view.findViewById(R.id.edit_text_max_width) as EditText
163+
val maxWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_max_width)
164+
val maxWidthEdit: EditText = view.findViewById(R.id.edit_text_max_width)
176165
maxWidthEdit.setText(activity.pixelToDp(flexItem.maxWidth).toString())
177166
maxWidthEdit.addTextChangedListener(
178167
FlexEditTextWatcher(activity, maxWidthInput, FixedDimensionInputValidator(),
179168
R.string.must_be_non_negative_integer))
180169

181-
val maxHeightInput = view
182-
.findViewById(R.id.input_layout_max_height) as TextInputLayout
183-
val maxHeightEdit = view.findViewById(
184-
R.id.edit_text_max_height) as EditText
170+
val maxHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_max_height)
171+
val maxHeightEdit: EditText = view.findViewById(R.id.edit_text_max_height)
185172
maxHeightEdit.setText(activity.pixelToDp(flexItem.maxHeight).toString())
186173
maxHeightEdit.addTextChangedListener(
187174
FlexEditTextWatcher(activity, maxHeightInput, FixedDimensionInputValidator(),
@@ -190,8 +177,7 @@ internal class FlexItemEditFragment : DialogFragment() {
190177
setNextFocusesOnEnterDown(orderEdit, flexGrowEdit, flexShrinkEdit, flexBasisPercentEdit,
191178
widthEdit, heightEdit, minWidthEdit, minHeightEdit, maxWidthEdit, maxHeightEdit)
192179

193-
val alignSelfSpinner = view.findViewById(
194-
R.id.spinner_align_self) as Spinner
180+
val alignSelfSpinner: Spinner = view.findViewById(R.id.spinner_align_self)
195181
val arrayAdapter = ArrayAdapter.createFromResource(activity,
196182
R.array.array_align_self, R.layout.spinner_item)
197183
alignSelfSpinner.adapter = arrayAdapter
@@ -213,18 +199,18 @@ internal class FlexItemEditFragment : DialogFragment() {
213199
}
214200
}
215201

216-
val wrapBeforeCheckBox = view.findViewById(R.id.checkbox_wrap_before) as CheckBox
202+
val wrapBeforeCheckBox: CheckBox = view.findViewById(R.id.checkbox_wrap_before)
217203
wrapBeforeCheckBox.isChecked = flexItem.isWrapBefore
218204
wrapBeforeCheckBox.setOnCheckedChangeListener { _, isChecked -> flexItemInEdit.isWrapBefore = isChecked }
219205
val alignSelfPosition = arrayAdapter
220206
.getPosition(alignSelfAsString(flexItem.alignSelf))
221207
alignSelfSpinner.setSelection(alignSelfPosition)
222208

223-
view.findViewById(R.id.button_cancel).setOnClickListener {
209+
view.findViewById<Button>(R.id.button_cancel).setOnClickListener {
224210
copyFlexItemValues(flexItem, flexItemInEdit)
225211
dismiss()
226212
}
227-
val okButton = view.findViewById(R.id.button_ok) as Button
213+
val okButton: Button = view.findViewById(R.id.button_ok)
228214
okButton.setOnClickListener(View.OnClickListener {
229215
if (orderTextInput.isErrorEnabled || flexGrowInput.isErrorEnabled ||
230216
flexBasisPercentInput.isErrorEnabled || widthInput.isErrorEnabled ||

‎demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import com.google.android.apps.flexbox.R
2727
*/
2828
class FlexItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
2929

30-
private val textView: TextView = itemView.findViewById(R.id.textview) as TextView
30+
private val textView: TextView = itemView.findViewById(R.id.textview)
3131

3232
fun bindTo(params: RecyclerView.LayoutParams) {
3333
val adapterPosition = adapterPosition

‎demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import java.util.*
3333
*/
3434
class FlexboxLayoutFragment : Fragment() {
3535

36-
private lateinit var flexContainer: FlexContainer
36+
private lateinit var flexContainer: FlexboxLayout
3737

3838
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
3939
savedInstanceState: Bundle?): View? {
@@ -42,7 +42,7 @@ class FlexboxLayoutFragment : Fragment() {
4242

4343
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
4444
val activity = activity as MainActivity
45-
flexContainer = view.findViewById(R.id.flexbox_layout) as FlexboxLayout
45+
flexContainer = view.findViewById(R.id.flexbox_layout)
4646

4747
val fragmentHelper = FragmentHelper(activity, flexContainer)
4848
fragmentHelper.initializeViews()
@@ -64,7 +64,7 @@ class FlexboxLayoutFragment : Fragment() {
6464
}
6565
}
6666

67-
val addFab = activity.findViewById(R.id.add_fab) as FloatingActionButton
67+
val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
6868
addFab.setOnClickListener {
6969
val viewIndex = flexContainer.flexItemCount
7070
// index starts from 0. New View's index is N if N views ([0, 1, 2, ... N-1])
@@ -79,8 +79,7 @@ class FlexboxLayoutFragment : Fragment() {
7979
FlexItemChangedListenerImpl(flexContainer), viewIndex))
8080
flexContainer.addView(textView)
8181
}
82-
val removeFab = activity.findViewById(
83-
R.id.remove_fab) as FloatingActionButton
82+
val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
8483
removeFab.setOnClickListener(View.OnClickListener {
8584
if (flexContainer.flexItemCount == 0) {
8685
return@OnClickListener

‎demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ internal class FragmentHelper(private val activity: MainActivity, private val fl
6767
fun initializeViews() {
6868
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
6969
initializeStringResources()
70-
val navigationView = activity.findViewById(R.id.nav_view) as NavigationView
70+
val navigationView: NavigationView = activity.findViewById(R.id.nav_view)
7171
navigationView.setNavigationItemSelectedListener(activity)
7272
val navigationMenu = navigationView.menu
7373
initializeFlexDirectionSpinner(navigationMenu)

‎demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
3535
super.onCreate(savedInstanceState)
3636
setContentView(R.layout.activity_main)
3737

38-
val toolbar = findViewById(R.id.toolbar) as Toolbar
38+
val toolbar: Toolbar = findViewById(R.id.toolbar)
3939
setSupportActionBar(toolbar)
40-
val drawer = findViewById(R.id.drawer_layout) as DrawerLayout
40+
val drawer: DrawerLayout = findViewById(R.id.drawer_layout)
4141
val toggle = ActionBarDrawerToggle(
4242
this, drawer, toolbar, R.string.navigation_drawer_open,
4343
R.string.navigation_drawer_close)
4444
drawer.addDrawerListener(toggle)
4545
toggle.syncState()
4646

47-
val navigationView = findViewById(R.id.nav_view) as NavigationView
48-
val radioGroup = navigationView.getHeaderView(0)
49-
.findViewById(R.id.radiogroup_container_implementation) as RadioGroup
47+
val navigationView: NavigationView = findViewById(R.id.nav_view)
48+
val radioGroup: RadioGroup = navigationView.getHeaderView(0)
49+
.findViewById(R.id.radiogroup_container_implementation)
5050
val fragmentManager = supportFragmentManager
5151

5252
radioGroup.setOnCheckedChangeListener { _, checkedId ->

‎demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal class RecyclerViewFragment : Fragment() {
4141
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
4242
super.onViewCreated(view, savedInstanceState)
4343

44-
val recyclerView = view.findViewById(R.id.recyclerview) as RecyclerView
44+
val recyclerView: RecyclerView = view.findViewById(R.id.recyclerview)
4545
val activity = activity as MainActivity
4646
val flexboxLayoutManager = FlexboxLayoutManager(activity)
4747
recyclerView.layoutManager = flexboxLayoutManager
@@ -60,15 +60,15 @@ internal class RecyclerViewFragment : Fragment() {
6060
val fragmentHelper = FragmentHelper(activity, flexboxLayoutManager)
6161
fragmentHelper.initializeViews()
6262

63-
val addFab = activity.findViewById(R.id.add_fab) as FloatingActionButton
63+
val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
6464
addFab.setOnClickListener {
6565
val lp = FlexboxLayoutManager.LayoutParams(
6666
ViewGroup.LayoutParams.WRAP_CONTENT,
6767
ViewGroup.LayoutParams.WRAP_CONTENT)
6868
fragmentHelper.setFlexItemAttributes(lp)
6969
adapter.addItem(lp)
7070
}
71-
val removeFab = activity.findViewById(R.id.remove_fab) as FloatingActionButton
71+
val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
7272
removeFab.setOnClickListener(View.OnClickListener {
7373
if (adapter.itemCount == 0) {
7474
return@OnClickListener

0 commit comments

Comments
 (0)