Skip to content

Commit 1bf4194

Browse files
committed
Fix the import order that should've been addressed in the previous PR
1 parent be9bdcb commit 1bf4194

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package com.google.android.flexbox
1818

19-
import androidx.appcompat.app.AppCompatActivity
20-
import androidx.recyclerview.widget.RecyclerView
2119
import android.view.LayoutInflater
2220
import android.view.ViewGroup
21+
import androidx.appcompat.app.AppCompatActivity
22+
import androidx.recyclerview.widget.RecyclerView
2323
import com.google.android.apps.flexbox.R
2424

2525
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.android.flexbox
1818

19-
import androidx.recyclerview.widget.RecyclerView
2019
import android.view.ViewGroup
20+
import androidx.recyclerview.widget.RecyclerView
2121

2222
/**
2323
* Implementation for the [FlexItemChangedListener].

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.android.flexbox
1818

19-
import androidx.appcompat.app.AppCompatActivity
2019
import android.view.View
20+
import androidx.appcompat.app.AppCompatActivity
2121

2222
/**
2323
* Implementation of the [android.view.View.OnClickListener] when a flex item is clicked in

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ package com.google.android.flexbox
1919
import android.content.Context
2020
import android.os.Build
2121
import android.os.Bundle
22-
import com.google.android.material.textfield.TextInputLayout
23-
import androidx.fragment.app.DialogFragment
2422
import android.text.Editable
2523
import android.text.TextWatcher
2624
import android.view.KeyEvent
@@ -30,8 +28,10 @@ import android.view.ViewGroup
3028
import android.view.inputmethod.EditorInfo
3129
import android.view.inputmethod.InputMethodManager
3230
import android.widget.*
31+
import androidx.fragment.app.DialogFragment
3332
import com.google.android.apps.flexbox.R
3433
import com.google.android.flexbox.validators.*
34+
import com.google.android.material.textfield.TextInputLayout
3535

3636
/**
3737
* DialogFragment that changes the properties for a flex item.

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
@@ -16,10 +16,10 @@
1616

1717
package com.google.android.flexbox
1818

19-
import androidx.recyclerview.widget.RecyclerView
2019
import android.view.Gravity
2120
import android.view.View
2221
import android.widget.TextView
22+
import androidx.recyclerview.widget.RecyclerView
2323
import com.google.android.apps.flexbox.R
2424

2525
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ package com.google.android.flexbox
1818

1919
import android.content.Context
2020
import android.os.Bundle
21-
import com.google.android.material.floatingactionbutton.FloatingActionButton
22-
import androidx.fragment.app.Fragment
2321
import android.view.Gravity
2422
import android.view.LayoutInflater
2523
import android.view.View
2624
import android.view.ViewGroup
2725
import android.widget.TextView
26+
import androidx.fragment.app.Fragment
2827
import com.google.android.apps.flexbox.R
28+
import com.google.android.material.floatingactionbutton.FloatingActionButton
2929
import java.util.*
3030

3131
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
package com.google.android.flexbox
1818

1919
import android.content.SharedPreferences
20-
import com.google.android.material.navigation.NavigationView
21-
import androidx.preference.PreferenceManager
2220
import android.view.Menu
2321
import android.view.View
2422
import android.widget.AdapterView
2523
import android.widget.ArrayAdapter
2624
import android.widget.Spinner
2725
import android.widget.Toast
26+
import androidx.preference.PreferenceManager
2827
import com.google.android.apps.flexbox.R
28+
import com.google.android.material.navigation.NavigationView
2929

3030
/**
3131
* Helper class that has the common logic for initializing the Fragment for the play ground demo

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ package com.google.android.flexbox
1818

1919
import android.content.Intent
2020
import android.os.Bundle
21-
import com.google.android.material.navigation.NavigationView
22-
import androidx.fragment.app.FragmentManager
23-
import androidx.drawerlayout.widget.DrawerLayout
24-
import androidx.appcompat.app.ActionBarDrawerToggle
25-
import androidx.appcompat.app.AppCompatActivity
26-
import androidx.appcompat.widget.Toolbar
2721
import android.view.Menu
2822
import android.view.MenuItem
2923
import android.widget.RadioGroup
24+
import androidx.appcompat.app.ActionBarDrawerToggle
25+
import androidx.appcompat.app.AppCompatActivity
26+
import androidx.appcompat.widget.Toolbar
27+
import androidx.drawerlayout.widget.DrawerLayout
28+
import androidx.fragment.app.FragmentManager
3029
import com.google.android.apps.flexbox.R
30+
import com.google.android.material.navigation.NavigationView
3131

3232
class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
3333

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
@@ -17,13 +17,13 @@
1717
package com.google.android.flexbox
1818

1919
import android.os.Bundle
20-
import com.google.android.material.floatingactionbutton.FloatingActionButton
21-
import androidx.fragment.app.Fragment
22-
import androidx.recyclerview.widget.RecyclerView
2320
import android.view.LayoutInflater
2421
import android.view.View
2522
import android.view.ViewGroup
23+
import androidx.fragment.app.Fragment
24+
import androidx.recyclerview.widget.RecyclerView
2625
import com.google.android.apps.flexbox.R
26+
import com.google.android.material.floatingactionbutton.FloatingActionButton
2727

2828
/**
2929
* Fragment that contains the [RecyclerView] and the [FlexboxLayoutManager] as its

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package com.google.android.flexbox
1818

1919
import android.os.Bundle
20+
import android.widget.Toast
2021
import androidx.fragment.app.FragmentActivity
2122
import androidx.preference.EditTextPreference
2223
import androidx.preference.Preference
2324
import androidx.preference.PreferenceFragmentCompat
24-
import android.widget.Toast
2525
import com.google.android.apps.flexbox.R
2626
import com.google.android.flexbox.validators.DimensionInputValidator
2727
import com.google.android.flexbox.validators.FlexBasisPercentInputValidator

0 commit comments

Comments
 (0)