From 78891498e8875a0a588e1f26317d201c5f2be478 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Sat, 15 Oct 2016 16:31:17 +0900 Subject: [PATCH] Moved receiver classes to seperate package --- .../test/syncthing/AppConfigReceiverTest.java | 2 +- .../test/syncthing/BatteryReceiverTest.java | 2 +- .../test/syncthing/NetworkReceiverTest.java | 4 ++-- src/main/AndroidManifest.xml | 6 +++--- .../nutomic/syncthingandroid/fragments/FolderFragment.java | 6 ++++-- .../{syncthing => receiver}/AppConfigReceiver.java | 3 ++- .../{syncthing => receiver}/BatteryReceiver.java | 5 ++++- .../{syncthing => receiver}/NetworkReceiver.java | 5 ++++- 8 files changed, 21 insertions(+), 12 deletions(-) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => receiver}/AppConfigReceiver.java (96%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => receiver}/BatteryReceiver.java (85%) rename src/main/java/com/nutomic/syncthingandroid/{syncthing => receiver}/NetworkReceiver.java (87%) diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java index 5c899c90..3227d7da 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/AppConfigReceiverTest.java @@ -5,7 +5,7 @@ import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.AppConfigReceiver; +import com.nutomic.syncthingandroid.receiver.AppConfigReceiver; import com.nutomic.syncthingandroid.syncthing.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java index 77da3116..2c8af0ba 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/BatteryReceiverTest.java @@ -5,7 +5,7 @@ import android.preference.PreferenceManager; import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; -import com.nutomic.syncthingandroid.syncthing.BatteryReceiver; +import com.nutomic.syncthingandroid.receiver.BatteryReceiver; import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; import com.nutomic.syncthingandroid.syncthing.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; diff --git a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java index 30bd8b4a..02ac72af 100644 --- a/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java +++ b/src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/NetworkReceiverTest.java @@ -7,7 +7,7 @@ import android.support.test.InstrumentationRegistry; import android.support.test.rule.ServiceTestRule; import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; -import com.nutomic.syncthingandroid.syncthing.NetworkReceiver; +import com.nutomic.syncthingandroid.receiver.NetworkReceiver; import com.nutomic.syncthingandroid.syncthing.SyncthingService; import com.nutomic.syncthingandroid.test.MockContext; @@ -19,7 +19,7 @@ import org.junit.Test; /** * Tests for correct extras on the Intent sent by - * {@link com.nutomic.syncthingandroid.syncthing.NetworkReceiver}. + * {@link NetworkReceiver}. * * Does not test for correct result value, as that would require mocking * {@link android.net.ConnectivityManager} (or replacing it with an interface). diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 87551fc8..eb56b760 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -81,12 +81,12 @@ - + - + @@ -97,7 +97,7 @@ - diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java index 26a96325..f47f1f35 100644 --- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java +++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java @@ -11,6 +11,7 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.Log; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -40,10 +41,10 @@ import java.util.List; import static android.support.v4.view.MarginLayoutParamsCompat.setMarginEnd; import static android.support.v4.view.MarginLayoutParamsCompat.setMarginStart; +import static android.util.TypedValue.COMPLEX_UNIT_DIP; import static android.view.Gravity.CENTER_VERTICAL; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import static com.nutomic.syncthingandroid.syncthing.SyncthingService.State.ACTIVE; -import static com.nutomic.syncthingandroid.util.DpConverter.dp; import static java.lang.String.valueOf; /** @@ -379,7 +380,8 @@ public class FolderFragment extends Fragment } private void addEmptyDeviceListView() { - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(WRAP_CONTENT, dp(48, getActivity())); + int height = (int) TypedValue.applyDimension(COMPLEX_UNIT_DIP, 48, getResources().getDisplayMetrics()); + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(WRAP_CONTENT, height); int dividerInset = getResources().getDimensionPixelOffset(R.dimen.material_divider_inset); int contentInset = getResources().getDimensionPixelOffset(R.dimen.abc_action_bar_content_inset_material); setMarginStart(params, dividerInset); diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/AppConfigReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java similarity index 96% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/AppConfigReceiver.java rename to src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java index beb9d628..309fec79 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/AppConfigReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/AppConfigReceiver.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.receiver; import android.annotation.TargetApi; import android.app.Notification; @@ -12,6 +12,7 @@ import android.support.v4.app.NotificationCompat; import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.activities.MainActivity; +import com.nutomic.syncthingandroid.syncthing.SyncthingService; /** * Broadcast-receiver to control and configure SyncThing remotely diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/BatteryReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java similarity index 85% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/BatteryReceiver.java rename to src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java index f3f76589..4a8682fa 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/BatteryReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/BatteryReceiver.java @@ -1,10 +1,13 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.receiver; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; +import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; +import com.nutomic.syncthingandroid.syncthing.SyncthingService; + /** * Receives battery plug/unplug intents and sends the charging state to {@link SyncthingService}. */ diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/NetworkReceiver.java b/src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java similarity index 87% rename from src/main/java/com/nutomic/syncthingandroid/syncthing/NetworkReceiver.java rename to src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java index dbcfe98c..19fa603c 100644 --- a/src/main/java/com/nutomic/syncthingandroid/syncthing/NetworkReceiver.java +++ b/src/main/java/com/nutomic/syncthingandroid/receiver/NetworkReceiver.java @@ -1,4 +1,4 @@ -package com.nutomic.syncthingandroid.syncthing; +package com.nutomic.syncthingandroid.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -7,6 +7,9 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.util.Log; +import com.nutomic.syncthingandroid.syncthing.DeviceStateHolder; +import com.nutomic.syncthingandroid.syncthing.SyncthingService; + /** * Receives network connection change intents and sends the wifi state to {@link SyncthingService}. */