firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor platform_services sample (#8949)

Browse Source 
* Refactor platform_services sample

* removed exception
This commit is contained in:
Sarah Zakarias
2017-03-22 13:18:38 +01:00
committed by GitHub
parent 9adf1bf1b6
commit 972da54320
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/platform_services/android/app/src/androidTest/java/com/example/flutter/ExampleInstrumentedTest.java
View File

@@ -8,12 +8,8 @@ import android.support.test.runner.AndroidJUnit4;
import io.flutter.view.FlutterView;
import android.app.Instrumentation;
import android.support.test.InstrumentationRegistry;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,8 +19,8 @@ import static org.junit.Assert.*;
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Rule
public ActivityTestRule<ExampleActivity> activityRule =
new ActivityTestRule<>(ExampleActivity.class);
public ActivityTestRule<MainActivity> activityRule =
new ActivityTestRule<>(MainActivity.class);
@Test

2
examples/platform_services/android/app/src/main/AndroidManifest.xml
View File

@@ -10,7 +10,7 @@
<application android:name="io.flutter.app.FlutterApplication" android:label="@string/app_name" >
<activity
android:name=".ExampleActivity"
android:name=".MainActivity"
android:launchMode="singleTop"
android:theme="@android:style/Theme.Black.NoTitleBar"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"

20
examples/platform_services/android/app/src/main/java/com/example/flutter/ExampleActivity.java → examples/platform_services/android/app/src/main/java/com/example/flutter/MainActivity.java
View File

@@ -18,7 +18,7 @@ import io.flutter.plugin.common.FlutterMethodChannel.MethodCallHandler;
import io.flutter.plugin.common.FlutterMethodChannel.Response;
import io.flutter.plugin.common.MethodCall;
public class ExampleActivity extends FlutterActivity {
public class MainActivity extends FlutterActivity {
private static final String CHANNEL = "battery";
@Override
@@ -30,15 +30,19 @@ public class ExampleActivity extends FlutterActivity {
@Override
public void onMethodCall(MethodCall call, Response response) {
if (call.method.equals("getBatteryLevel")) {
getBatteryLevel(response);
} else {
throw new IllegalArgumentException("Unknown method " + call.method);
int batteryLevel = getBatteryLevel();
if (batteryLevel != -1) {
response.success(batteryLevel);
} else {
response.error("UNAVAILABLE", "Battery level not available.", null);
}
}
}
});
}
private void getBatteryLevel(Response response) {
private int getBatteryLevel() {
int batteryLevel = -1;
if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
BatteryManager batteryManager = (BatteryManager) getSystemService(BATTERY_SERVICE);
@@ -50,10 +54,6 @@ public class ExampleActivity extends FlutterActivity {
intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
}
if (batteryLevel != -1) {
response.success(batteryLevel);
} else {
response.error("UNAVAILABLE", "Battery level not available.", null);
}
return batteryLevel;
}
}