diff --git a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java index 354d2d1b2..7c6c33da4 100644 --- a/briar-android/src/net/sf/briar/android/HomeScreenActivity.java +++ b/briar-android/src/net/sf/briar/android/HomeScreenActivity.java @@ -11,8 +11,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import static net.sf.briar.api.messaging.Rating.GOOD; import java.util.ArrayList; diff --git a/briar-android/src/net/sf/briar/android/SetupActivity.java b/briar-android/src/net/sf/briar/android/SetupActivity.java index e272774b7..73dd6b626 100644 --- a/briar-android/src/net/sf/briar/android/SetupActivity.java +++ b/briar-android/src/net/sf/briar/android/SetupActivity.java @@ -9,8 +9,8 @@ import static android.view.Gravity.CENTER_HORIZONTAL; import static android.view.View.GONE; import static android.view.View.VISIBLE; import static android.widget.LinearLayout.VERTICAL; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import java.io.IOException; import java.security.KeyPair; diff --git a/briar-android/src/net/sf/briar/android/SplashScreenActivity.java b/briar-android/src/net/sf/briar/android/SplashScreenActivity.java index a0683b546..1d905f1cb 100644 --- a/briar-android/src/net/sf/briar/android/SplashScreenActivity.java +++ b/briar-android/src/net/sf/briar/android/SplashScreenActivity.java @@ -2,7 +2,7 @@ package net.sf.briar.android; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; import net.sf.briar.api.db.DatabaseConfig; import roboguice.RoboGuice; import roboguice.activity.RoboSplashActivity; diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java index f60337396..b3fa2cd92 100644 --- a/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/BlogActivity.java @@ -8,8 +8,8 @@ import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static net.sf.briar.android.blogs.ReadBlogPostActivity.RESULT_NEXT; import static net.sf.briar.android.blogs.ReadBlogPostActivity.RESULT_PREV; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.util.Collection; import java.util.concurrent.Executor; @@ -17,8 +17,8 @@ import java.util.logging.Logger; import net.sf.briar.R; import net.sf.briar.android.AscendingHeaderComparator; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.Author; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java index 046b10650..bd181bded 100644 --- a/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java +++ b/briar-android/src/net/sf/briar/android/blogs/BlogAdapter.java @@ -5,14 +5,14 @@ import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import static net.sf.briar.api.messaging.Rating.BAD; import static net.sf.briar.api.messaging.Rating.GOOD; import java.util.ArrayList; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.Author; import net.sf.briar.api.db.GroupMessageHeader; import net.sf.briar.api.messaging.Rating; diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java b/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java index 5680ad930..0b16ce342 100644 --- a/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/BlogListActivity.java @@ -9,9 +9,9 @@ import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static net.sf.briar.android.blogs.BlogListItem.MANAGE; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.util.Collection; import java.util.Comparator; @@ -21,9 +21,9 @@ import java.util.concurrent.Executor; import java.util.logging.Logger; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.HorizontalSpace; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.HorizontalSpace; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; import net.sf.briar.api.db.DbException; diff --git a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java index 470ee405c..f99eb1a8a 100644 --- a/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java +++ b/briar-android/src/net/sf/briar/android/blogs/BlogListAdapter.java @@ -6,7 +6,7 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; import static net.sf.briar.android.blogs.BlogListItem.MANAGE; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import java.util.ArrayList; import java.util.Collections; @@ -14,7 +14,7 @@ import java.util.Comparator; import java.util.List; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import android.content.Context; import android.content.res.Resources; import android.text.format.DateUtils; diff --git a/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java index 0d7ca47c2..1fe42adc6 100644 --- a/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/ConfigureBlogActivity.java @@ -6,8 +6,8 @@ import static android.view.View.VISIBLE; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import java.util.Collection; import java.util.Collections; diff --git a/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java b/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java index a92b19ea5..f699007d2 100644 --- a/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/CreateBlogActivity.java @@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import java.io.IOException; import java.security.KeyPair; diff --git a/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java b/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java index 105502498..430e40e7d 100644 --- a/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/ManageBlogsActivity.java @@ -3,7 +3,7 @@ package net.sf.briar.android.blogs; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static net.sf.briar.android.blogs.ManageBlogsItem.NONE; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; import java.util.ArrayList; import java.util.Collection; @@ -13,7 +13,7 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.logging.Logger; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; import net.sf.briar.api.db.DbException; diff --git a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java index 7188674f2..f243acb1f 100644 --- a/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/ReadBlogPostActivity.java @@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import static net.sf.briar.api.messaging.Rating.BAD; import static net.sf.briar.api.messaging.Rating.GOOD; import static net.sf.briar.api.messaging.Rating.UNRATED; @@ -19,8 +19,8 @@ import java.util.concurrent.Executor; import java.util.logging.Logger; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; import net.sf.briar.api.db.DbException; diff --git a/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java b/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java index e3d60e2a9..d8885ffe3 100644 --- a/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java +++ b/briar-android/src/net/sf/briar/android/blogs/WriteBlogPostActivity.java @@ -7,7 +7,7 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; import java.io.IOException; import java.security.GeneralSecurityException; @@ -21,7 +21,7 @@ import net.sf.briar.android.identity.CreateIdentityActivity; import net.sf.briar.android.identity.LocalAuthorItem; import net.sf.briar.android.identity.LocalAuthorItemComparator; import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.AuthorId; import net.sf.briar.api.LocalAuthor; import net.sf.briar.api.android.DatabaseUiExecutor; diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java index 061d52a10..e525239cc 100644 --- a/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java +++ b/briar-android/src/net/sf/briar/android/contact/ContactListActivity.java @@ -10,9 +10,9 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.io.File; import java.util.Collection; @@ -23,9 +23,9 @@ import java.util.logging.Logger; import net.sf.briar.R; import net.sf.briar.android.invitation.AddContactActivity; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.HorizontalSpace; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.HorizontalSpace; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.Contact; import net.sf.briar.api.ContactId; import net.sf.briar.api.android.DatabaseUiExecutor; diff --git a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java index d20412f30..3ff0f06da 100644 --- a/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java +++ b/briar-android/src/net/sf/briar/android/contact/ContactListAdapter.java @@ -2,7 +2,7 @@ package net.sf.briar.android.contact; import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import java.util.ArrayList; diff --git a/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java index cedcdc3ff..f0f0f9fdc 100644 --- a/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java @@ -6,8 +6,8 @@ import static android.view.View.VISIBLE; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import java.util.Collection; import java.util.Collections; diff --git a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java index 56b5187e0..7ebd8b593 100644 --- a/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/CreateGroupActivity.java @@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import java.io.IOException; import java.util.Collection; diff --git a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java index c7de96f65..49c125ef4 100644 --- a/briar-android/src/net/sf/briar/android/groups/GroupActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/GroupActivity.java @@ -8,8 +8,8 @@ import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static net.sf.briar.android.groups.ReadGroupPostActivity.RESULT_NEXT; import static net.sf.briar.android.groups.ReadGroupPostActivity.RESULT_PREV; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.util.Collection; import java.util.concurrent.Executor; @@ -17,8 +17,8 @@ import java.util.logging.Logger; import net.sf.briar.R; import net.sf.briar.android.AscendingHeaderComparator; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.Author; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; diff --git a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java index d47cc864c..7f2cd71ab 100644 --- a/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java +++ b/briar-android/src/net/sf/briar/android/groups/GroupAdapter.java @@ -5,14 +5,14 @@ import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import static net.sf.briar.api.messaging.Rating.BAD; import static net.sf.briar.api.messaging.Rating.GOOD; import java.util.ArrayList; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.Author; import net.sf.briar.api.db.GroupMessageHeader; import net.sf.briar.api.messaging.Rating; diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java index bd4d27465..9f6741d6b 100644 --- a/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/GroupListActivity.java @@ -9,9 +9,9 @@ import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static net.sf.briar.android.groups.GroupListItem.MANAGE; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.util.Collection; import java.util.Comparator; @@ -19,9 +19,9 @@ import java.util.concurrent.Executor; import java.util.logging.Logger; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.HorizontalSpace; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.HorizontalSpace; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; import net.sf.briar.api.db.DbException; diff --git a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java index 0c34a0e6b..d1c1a542d 100644 --- a/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java +++ b/briar-android/src/net/sf/briar/android/groups/GroupListAdapter.java @@ -6,7 +6,7 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; import static net.sf.briar.android.groups.GroupListItem.MANAGE; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import java.util.ArrayList; import java.util.Collections; @@ -14,7 +14,7 @@ import java.util.Comparator; import java.util.List; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import android.content.Context; import android.content.res.Resources; import android.text.format.DateUtils; diff --git a/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java b/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java index 390de0e28..bba527fe7 100644 --- a/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java @@ -3,7 +3,7 @@ package net.sf.briar.android.groups; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static net.sf.briar.android.groups.ManageGroupsItem.NONE; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; import java.util.ArrayList; import java.util.Collection; @@ -13,7 +13,7 @@ import java.util.List; import java.util.concurrent.Executor; import java.util.logging.Logger; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; import net.sf.briar.api.db.DbException; diff --git a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java index 097ce6024..8ce4f8a4c 100644 --- a/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/ReadGroupPostActivity.java @@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import static net.sf.briar.api.messaging.Rating.BAD; import static net.sf.briar.api.messaging.Rating.GOOD; import static net.sf.briar.api.messaging.Rating.UNRATED; @@ -19,8 +19,8 @@ import java.util.concurrent.Executor; import java.util.logging.Logger; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.AuthorId; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; diff --git a/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java b/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java index f3168ad89..d2bba8792 100644 --- a/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java +++ b/briar-android/src/net/sf/briar/android/groups/WriteGroupPostActivity.java @@ -7,7 +7,7 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; import java.io.IOException; import java.security.GeneralSecurityException; @@ -24,7 +24,7 @@ import net.sf.briar.android.identity.CreateIdentityActivity; import net.sf.briar.android.identity.LocalAuthorItem; import net.sf.briar.android.identity.LocalAuthorItemComparator; import net.sf.briar.android.identity.LocalAuthorSpinnerAdapter; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.AuthorId; import net.sf.briar.api.LocalAuthor; import net.sf.briar.api.android.DatabaseUiExecutor; diff --git a/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java b/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java index 71e82cfbd..f89fff502 100644 --- a/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java +++ b/briar-android/src/net/sf/briar/android/identity/CreateIdentityActivity.java @@ -10,8 +10,8 @@ import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import static net.sf.briar.api.messaging.Rating.GOOD; import java.io.IOException; diff --git a/briar-android/src/net/sf/briar/android/invitation/AddContactView.java b/briar-android/src/net/sf/briar/android/invitation/AddContactView.java index cd3602b30..a6ee0afc5 100644 --- a/briar-android/src/net/sf/briar/android/invitation/AddContactView.java +++ b/briar-android/src/net/sf/briar/android/invitation/AddContactView.java @@ -1,7 +1,7 @@ package net.sf.briar.android.invitation; import static android.view.Gravity.CENTER_HORIZONTAL; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; import android.content.Context; import android.widget.LinearLayout; diff --git a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java b/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java similarity index 93% rename from briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java rename to briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java index 073c5923a..1cec858cb 100644 --- a/briar-android/src/net/sf/briar/android/invitation/BluetoothWidget.java +++ b/briar-android/src/net/sf/briar/android/invitation/BluetoothStatusView.java @@ -3,7 +3,7 @@ package net.sf.briar.android.invitation; import static android.bluetooth.BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE; import static android.provider.Settings.ACTION_BLUETOOTH_SETTINGS; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import net.sf.briar.R; import android.bluetooth.BluetoothAdapter; import android.content.Context; @@ -15,9 +15,10 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -public class BluetoothWidget extends LinearLayout implements OnClickListener { +public class BluetoothStatusView extends LinearLayout +implements OnClickListener { - public BluetoothWidget(Context ctx) { + public BluetoothStatusView(Context ctx) { super(ctx); } diff --git a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java b/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java similarity index 94% rename from briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java rename to briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java index 6685abc36..bafcba55d 100644 --- a/briar-android/src/net/sf/briar/android/invitation/CodeEntryWidget.java +++ b/briar-android/src/net/sf/briar/android/invitation/CodeEntryView.java @@ -5,7 +5,7 @@ import static android.text.InputType.TYPE_CLASS_NUMBER; import static android.view.Gravity.CENTER; import static android.view.Gravity.CENTER_HORIZONTAL; import static android.view.inputmethod.InputMethodManager.HIDE_IMPLICIT_ONLY; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import net.sf.briar.R; import android.content.Context; import android.view.KeyEvent; @@ -18,14 +18,14 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -public class CodeEntryWidget extends LinearLayout +public class CodeEntryView extends LinearLayout implements OnEditorActionListener, OnClickListener { private CodeEntryListener listener = null; private EditText codeEntry = null; private Button continueButton = null; - public CodeEntryWidget(Context ctx) { + public CodeEntryView(Context ctx) { super(ctx); } diff --git a/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java b/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java index c3e1ffb4a..ca8d119e8 100644 --- a/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java +++ b/briar-android/src/net/sf/briar/android/invitation/CodesDoNotMatchView.java @@ -1,7 +1,7 @@ package net.sf.briar.android.invitation; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import net.sf.briar.R; import android.content.Context; import android.view.View; diff --git a/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java b/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java index 6d000b32f..0e5caf53f 100644 --- a/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java +++ b/briar-android/src/net/sf/briar/android/invitation/ConfirmationCodeView.java @@ -49,7 +49,7 @@ implements CodeEntryListener { code.setText(String.format("%06d", localCode)); addView(code); - CodeEntryWidget codeEntry = new CodeEntryWidget(ctx); + CodeEntryView codeEntry = new CodeEntryView(ctx); Resources res = getResources(); codeEntry.init(this, res.getString(R.string.enter_confirmation_code)); addView(codeEntry); diff --git a/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java b/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java index 658153b87..f3c5bf42f 100644 --- a/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java +++ b/briar-android/src/net/sf/briar/android/invitation/ConnectionFailedView.java @@ -1,7 +1,7 @@ package net.sf.briar.android.invitation; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import net.sf.briar.R; import android.content.Context; import android.view.View; @@ -14,8 +14,8 @@ import android.widget.TextView; public class ConnectionFailedView extends AddContactView implements OnClickListener { - private WifiWidget wifi = null; - private BluetoothWidget bluetooth = null; + private WifiStatusView wifi = null; + private BluetoothStatusView bluetooth = null; private Button tryAgainButton = null; ConnectionFailedView(Context ctx) { @@ -46,11 +46,11 @@ implements OnClickListener { checkNetwork.setText(R.string.check_same_network); addView(checkNetwork); - wifi = new WifiWidget(ctx); + wifi = new WifiStatusView(ctx); wifi.init(); addView(wifi); - bluetooth = new BluetoothWidget(ctx); + bluetooth = new BluetoothStatusView(ctx); bluetooth.init(); addView(bluetooth); diff --git a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java index 09a74dabe..dfb2d0103 100644 --- a/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java +++ b/briar-android/src/net/sf/briar/android/invitation/ContactAddedView.java @@ -1,7 +1,7 @@ package net.sf.briar.android.invitation; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import net.sf.briar.R; import android.content.Context; import android.view.View; diff --git a/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java b/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java index c55f1bfb4..262b0ae94 100644 --- a/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java +++ b/briar-android/src/net/sf/briar/android/invitation/InvitationCodeView.java @@ -31,7 +31,7 @@ implements CodeEntryListener { code.setText(String.format("%06d", localCode)); addView(code); - CodeEntryWidget codeEntry = new CodeEntryWidget(ctx); + CodeEntryView codeEntry = new CodeEntryView(ctx); Resources res = getResources(); codeEntry.init(this, res.getString(R.string.enter_invitation_code)); addView(codeEntry); diff --git a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java index 5c1487cd7..5756fb30b 100644 --- a/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java +++ b/briar-android/src/net/sf/briar/android/invitation/NetworkSetupView.java @@ -2,8 +2,8 @@ package net.sf.briar.android.invitation; import static android.view.Gravity.CENTER; import static net.sf.briar.android.identity.LocalAuthorItem.NEW; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import net.sf.briar.R; import net.sf.briar.android.identity.CreateIdentityActivity; import net.sf.briar.android.identity.LocalAuthorItem; @@ -25,8 +25,8 @@ implements OnItemSelectedListener, OnClickListener { private LocalAuthorSpinnerAdapter adapter = null; private Spinner spinner = null; - private WifiWidget wifi = null; - private BluetoothWidget bluetooth = null; + private WifiStatusView wifi = null; + private BluetoothStatusView bluetooth = null; private Button continueButton = null; NetworkSetupView(Context ctx) { @@ -56,11 +56,11 @@ implements OnItemSelectedListener, OnClickListener { innerLayout.addView(spinner); addView(innerLayout); - wifi = new WifiWidget(ctx); + wifi = new WifiStatusView(ctx); wifi.init(); addView(wifi); - bluetooth = new BluetoothWidget(ctx); + bluetooth = new BluetoothStatusView(ctx); bluetooth.init(); addView(bluetooth); diff --git a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java b/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java similarity index 93% rename from briar-android/src/net/sf/briar/android/invitation/WifiWidget.java rename to briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java index 22d49df39..2f88acffc 100644 --- a/briar-android/src/net/sf/briar/android/invitation/WifiWidget.java +++ b/briar-android/src/net/sf/briar/android/invitation/WifiStatusView.java @@ -3,7 +3,7 @@ package net.sf.briar.android.invitation; import static android.content.Context.WIFI_SERVICE; import static android.provider.Settings.ACTION_WIFI_SETTINGS; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import net.sf.briar.R; import android.content.Context; import android.content.Intent; @@ -16,9 +16,9 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -public class WifiWidget extends LinearLayout implements OnClickListener { +public class WifiStatusView extends LinearLayout implements OnClickListener { - public WifiWidget(Context ctx) { + public WifiStatusView(Context ctx) { super(ctx); } diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java index 3c6fc5cce..2f3ffeaeb 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationActivity.java @@ -6,8 +6,8 @@ import static android.view.View.VISIBLE; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.util.Collection; import java.util.concurrent.Executor; @@ -15,8 +15,8 @@ import java.util.logging.Logger; import net.sf.briar.R; import net.sf.briar.android.AscendingHeaderComparator; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.AuthorId; import net.sf.briar.api.ContactId; import net.sf.briar.api.android.DatabaseUiExecutor; diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java index fadd7f8dc..17207065d 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationAdapter.java @@ -5,14 +5,14 @@ import static android.view.Gravity.CENTER_VERTICAL; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import static net.sf.briar.api.messaging.Rating.BAD; import static net.sf.briar.api.messaging.Rating.GOOD; import java.util.ArrayList; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.db.PrivateMessageHeader; import net.sf.briar.api.messaging.Rating; import android.content.Context; diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java index 2ffb72ba6..d42e30ac4 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationListActivity.java @@ -6,8 +6,8 @@ import static android.view.View.VISIBLE; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_MATCH; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_MATCH; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; import java.util.Collection; import java.util.Comparator; @@ -16,8 +16,8 @@ import java.util.logging.Logger; import net.sf.briar.R; import net.sf.briar.android.invitation.AddContactActivity; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.ListLoadingProgressBar; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.ListLoadingProgressBar; import net.sf.briar.api.Contact; import net.sf.briar.api.ContactId; import net.sf.briar.api.android.DatabaseUiExecutor; diff --git a/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java b/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java index 80431fa55..a6ba168ad 100644 --- a/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java +++ b/briar-android/src/net/sf/briar/android/messages/ConversationListAdapter.java @@ -5,7 +5,7 @@ import static android.view.Gravity.LEFT; import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import java.util.ArrayList; diff --git a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java index 5a66b3203..c86cbc726 100644 --- a/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/ReadPrivateMessageActivity.java @@ -7,9 +7,9 @@ import static android.widget.LinearLayout.VERTICAL; import static java.text.DateFormat.SHORT; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP_1; import static net.sf.briar.api.messaging.Rating.BAD; import static net.sf.briar.api.messaging.Rating.GOOD; import static net.sf.briar.api.messaging.Rating.UNRATED; @@ -19,8 +19,8 @@ import java.util.concurrent.Executor; import java.util.logging.Logger; import net.sf.briar.R; -import net.sf.briar.android.widgets.HorizontalBorder; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalBorder; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.ContactId; import net.sf.briar.api.android.DatabaseUiExecutor; import net.sf.briar.api.db.DatabaseComponent; diff --git a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java index 78c46c017..e67058b83 100644 --- a/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java +++ b/briar-android/src/net/sf/briar/android/messages/WritePrivateMessageActivity.java @@ -7,7 +7,7 @@ import static android.widget.LinearLayout.HORIZONTAL; import static android.widget.LinearLayout.VERTICAL; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -21,7 +21,7 @@ import net.sf.briar.android.contact.ContactItem; import net.sf.briar.android.contact.ContactItemComparator; import net.sf.briar.android.contact.ContactSpinnerAdapter; import net.sf.briar.android.invitation.AddContactActivity; -import net.sf.briar.android.widgets.HorizontalSpace; +import net.sf.briar.android.util.HorizontalSpace; import net.sf.briar.api.AuthorId; import net.sf.briar.api.Contact; import net.sf.briar.api.ContactId; diff --git a/briar-android/src/net/sf/briar/android/widgets/CommonLayoutParams.java b/briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java similarity index 95% rename from briar-android/src/net/sf/briar/android/widgets/CommonLayoutParams.java rename to briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java index 465b98fad..402639083 100644 --- a/briar-android/src/net/sf/briar/android/widgets/CommonLayoutParams.java +++ b/briar-android/src/net/sf/briar/android/util/CommonLayoutParams.java @@ -1,4 +1,4 @@ -package net.sf.briar.android.widgets; +package net.sf.briar.android.util; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; diff --git a/briar-android/src/net/sf/briar/android/widgets/HorizontalBorder.java b/briar-android/src/net/sf/briar/android/util/HorizontalBorder.java similarity index 93% rename from briar-android/src/net/sf/briar/android/widgets/HorizontalBorder.java rename to briar-android/src/net/sf/briar/android/util/HorizontalBorder.java index 9b462f0fc..b75f47415 100644 --- a/briar-android/src/net/sf/briar/android/widgets/HorizontalBorder.java +++ b/briar-android/src/net/sf/briar/android/util/HorizontalBorder.java @@ -1,4 +1,4 @@ -package net.sf.briar.android.widgets; +package net.sf.briar.android.util; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import net.sf.briar.R; diff --git a/briar-android/src/net/sf/briar/android/widgets/HorizontalSpace.java b/briar-android/src/net/sf/briar/android/util/HorizontalSpace.java similarity index 89% rename from briar-android/src/net/sf/briar/android/widgets/HorizontalSpace.java rename to briar-android/src/net/sf/briar/android/util/HorizontalSpace.java index 215003f6c..f173caf03 100644 --- a/briar-android/src/net/sf/briar/android/widgets/HorizontalSpace.java +++ b/briar-android/src/net/sf/briar/android/util/HorizontalSpace.java @@ -1,4 +1,4 @@ -package net.sf.briar.android.widgets; +package net.sf.briar.android.util; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import android.content.Context; diff --git a/briar-android/src/net/sf/briar/android/widgets/ListLoadingProgressBar.java b/briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java similarity index 71% rename from briar-android/src/net/sf/briar/android/widgets/ListLoadingProgressBar.java rename to briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java index b66fb8025..fbc0bf287 100644 --- a/briar-android/src/net/sf/briar/android/widgets/ListLoadingProgressBar.java +++ b/briar-android/src/net/sf/briar/android/util/ListLoadingProgressBar.java @@ -1,8 +1,8 @@ -package net.sf.briar.android.widgets; +package net.sf.briar.android.util; import static android.view.Gravity.CENTER; -import static net.sf.briar.android.widgets.CommonLayoutParams.MATCH_WRAP_1; -import static net.sf.briar.android.widgets.CommonLayoutParams.WRAP_WRAP; +import static net.sf.briar.android.util.CommonLayoutParams.MATCH_WRAP_1; +import static net.sf.briar.android.util.CommonLayoutParams.WRAP_WRAP; import android.content.Context; import android.widget.LinearLayout; import android.widget.ProgressBar;