From 1bf4194a620cd2115e040c8e8f3780632bd5c5e1 Mon Sep 17 00:00:00 2001 From: Takeshi Hagikura Date: Mon, 11 Jun 2018 20:45:30 +0900 Subject: [PATCH] Fix the import order that should've been addressed in the previous PR --- .../com/google/android/flexbox/FlexItemAdapter.kt | 4 ++-- .../FlexItemChangedListenerImplRecyclerView.kt | 2 +- .../google/android/flexbox/FlexItemClickListener.kt | 2 +- .../google/android/flexbox/FlexItemEditFragment.kt | 4 ++-- .../com/google/android/flexbox/FlexItemViewHolder.kt | 2 +- .../google/android/flexbox/FlexboxLayoutFragment.kt | 4 ++-- .../com/google/android/flexbox/FragmentHelper.kt | 4 ++-- .../java/com/google/android/flexbox/MainActivity.kt | 12 ++++++------ .../google/android/flexbox/RecyclerViewFragment.kt | 6 +++--- .../com/google/android/flexbox/SettingsActivity.kt | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt index 49bf0a7..26b8330 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt @@ -16,10 +16,10 @@ package com.google.android.flexbox -import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.RecyclerView import com.google.android.apps.flexbox.R /** diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt index 2ea6961..acedf7d 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt @@ -16,8 +16,8 @@ package com.google.android.flexbox -import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView /** * Implementation for the [FlexItemChangedListener]. diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt index be8d7d5..6ba866b 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt @@ -16,8 +16,8 @@ package com.google.android.flexbox -import androidx.appcompat.app.AppCompatActivity import android.view.View +import androidx.appcompat.app.AppCompatActivity /** * Implementation of the [android.view.View.OnClickListener] when a flex item is clicked in diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt index fa53517..c1e00ba 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt @@ -19,8 +19,6 @@ package com.google.android.flexbox import android.content.Context import android.os.Build import android.os.Bundle -import com.google.android.material.textfield.TextInputLayout -import androidx.fragment.app.DialogFragment import android.text.Editable import android.text.TextWatcher import android.view.KeyEvent @@ -30,8 +28,10 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.* +import androidx.fragment.app.DialogFragment import com.google.android.apps.flexbox.R import com.google.android.flexbox.validators.* +import com.google.android.material.textfield.TextInputLayout /** * DialogFragment that changes the properties for a flex item. diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt index 78bf7e1..1e9f4a2 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt @@ -16,10 +16,10 @@ package com.google.android.flexbox -import androidx.recyclerview.widget.RecyclerView import android.view.Gravity import android.view.View import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView import com.google.android.apps.flexbox.R /** diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt b/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt index dc5893f..af30676 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt @@ -18,14 +18,14 @@ package com.google.android.flexbox import android.content.Context import android.os.Bundle -import com.google.android.material.floatingactionbutton.FloatingActionButton -import androidx.fragment.app.Fragment import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView +import androidx.fragment.app.Fragment import com.google.android.apps.flexbox.R +import com.google.android.material.floatingactionbutton.FloatingActionButton import java.util.* /** diff --git a/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt b/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt index 31242b2..d1b32a5 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt @@ -17,15 +17,15 @@ package com.google.android.flexbox import android.content.SharedPreferences -import com.google.android.material.navigation.NavigationView -import androidx.preference.PreferenceManager import android.view.Menu import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.Spinner import android.widget.Toast +import androidx.preference.PreferenceManager import com.google.android.apps.flexbox.R +import com.google.android.material.navigation.NavigationView /** * Helper class that has the common logic for initializing the Fragment for the play ground demo diff --git a/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt b/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt index e2df045..7c670ed 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt @@ -18,16 +18,16 @@ package com.google.android.flexbox import android.content.Intent import android.os.Bundle -import com.google.android.material.navigation.NavigationView -import androidx.fragment.app.FragmentManager -import androidx.drawerlayout.widget.DrawerLayout -import androidx.appcompat.app.ActionBarDrawerToggle -import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.widget.Toolbar import android.view.Menu import android.view.MenuItem import android.widget.RadioGroup +import androidx.appcompat.app.ActionBarDrawerToggle +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.Toolbar +import androidx.drawerlayout.widget.DrawerLayout +import androidx.fragment.app.FragmentManager import com.google.android.apps.flexbox.R +import com.google.android.material.navigation.NavigationView class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener { diff --git a/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt b/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt index 88903e5..474c485 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt @@ -17,13 +17,13 @@ package com.google.android.flexbox import android.os.Bundle -import com.google.android.material.floatingactionbutton.FloatingActionButton -import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.fragment.app.Fragment +import androidx.recyclerview.widget.RecyclerView import com.google.android.apps.flexbox.R +import com.google.android.material.floatingactionbutton.FloatingActionButton /** * Fragment that contains the [RecyclerView] and the [FlexboxLayoutManager] as its diff --git a/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt b/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt index e485b72..5abfeea 100644 --- a/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt +++ b/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt @@ -17,11 +17,11 @@ package com.google.android.flexbox import android.os.Bundle +import android.widget.Toast import androidx.fragment.app.FragmentActivity import androidx.preference.EditTextPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import android.widget.Toast import com.google.android.apps.flexbox.R import com.google.android.flexbox.validators.DimensionInputValidator import com.google.android.flexbox.validators.FlexBasisPercentInputValidator -- GitLab