Skip to content

Commit 43976e5

Browse files
author
David Graeff
committed
Update to newest android developer stack
Signed-off-by: David Graeff <david.graeff@web.de>
1 parent 2eda50f commit 43976e5

File tree

13 files changed

+140
-362
lines changed

13 files changed

+140
-362
lines changed

‎app/app.iml

Lines changed: 89 additions & 54 deletions
Large diffs are not rendered by default.

‎app/build.gradle

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 27
5+
buildToolsVersion "26.0.2"
66

77
// productFlavors {
88
// //noinspection GroovyMissingReturnStatement
@@ -15,12 +15,12 @@ android {
1515

1616
defaultConfig {
1717
minSdkVersion 17
18-
targetSdkVersion 22
19-
versionCode 128
20-
versionName "8.6.2"
18+
targetSdkVersion 27
19+
versionCode 129
20+
versionName "9.0"
2121
applicationId appID
2222
testApplicationId "oly.netpowerctrl.tests"
23-
testInstrumentationRunner "android.test.InstrumentationTestRunner"
23+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2424
resConfig "de"
2525
}
2626

@@ -30,8 +30,8 @@ android {
3030
}
3131

3232
compileOptions {
33-
sourceCompatibility JavaVersion.VERSION_1_7
34-
targetCompatibility JavaVersion.VERSION_1_7
33+
sourceCompatibility JavaVersion.VERSION_1_8
34+
targetCompatibility JavaVersion.VERSION_1_8
3535
}
3636

3737
def getRevision = { ->
@@ -93,16 +93,17 @@ dependencies {
9393
//compile fileTree(dir: 'libs', include: ['*.jar']) :5.2.08 5.0.89
9494
//compile 'com.google.android.gms:play-services:5.2.08'
9595
//noinspection GradleDependency
96-
compile 'com.android.support:appcompat-v7:22.0.0'
97-
compile 'com.android.support:support-v13:22.2.0'
98-
compile 'com.android.support:recyclerview-v7:22.2.0'
99-
compile 'com.android.support:palette-v7:22.2.0'
100-
compile 'com.android.support:cardview-v7:22.2.0'
96+
compile 'com.android.support:appcompat-v7:27.0.0'
97+
compile 'com.android.support:support-v13:27.0.0'
98+
compile 'com.android.support:recyclerview-v7:27.0.0'
99+
compile 'com.android.support:palette-v7:27.0.0'
100+
compile 'com.android.support:cardview-v7:27.0.0'
101+
compile 'com.afollestad:material-cab:0.1.12',
101102
compile('com.github.rey5137:material:1.1.0') {
102103
exclude group: 'com.google.android'
103104
exclude group: 'com.android.support'
104105
}
105-
compile 'com.google.code.gson:gson:2.3.1'
106+
compile 'com.google.code.gson:gson:2.8.0'
106107
compile('com.wefika:flowlayout:0.3.4') {
107108
exclude group: 'com.google.android'
108109
exclude group: 'com.android.support'
@@ -130,5 +131,21 @@ dependencies {
130131
exclude group: 'com.google.android'
131132
exclude group: 'com.android.support'
132133
}
133-
androidTestCompile 'junit:junit:4.11'
134+
135+
// AndroidJUnitRunner and JUnit Rules
136+
androidTestCompile 'com.android.support.test:runner:1.0.1'
137+
androidTestCompile 'com.android.support.test:rules:1.0.1'
138+
androidTestCompile 'junit:junit:4.12'
139+
// Espresso dependencies
140+
androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
141+
androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.1'
142+
androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.1'
143+
androidTestCompile 'com.android.support.test.espresso:espresso-accessibility:3.0.1'
144+
androidTestCompile 'com.android.support.test.espresso:espresso-web:3.0.1'
145+
androidTestCompile 'com.android.support.test.espresso.idling:idling-concurrent:3.0.1'
146+
147+
// The following Espresso dependency can be either "compile"
148+
// or "androidTestCompile", depending on your app's implementation
149+
androidTestCompile 'com.android.support.test.espresso:espresso-idling-resource:3.0.1'
150+
androidTestUtil 'com.android.support.test:orchestrator:1.0.1'
134151
}

‎app/src/main/java/oly/netpowerctrl/executables/ExecutablesFragment.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.provider.Settings;
1212
import android.support.v4.content.ContextCompat;
1313
import android.support.v4.widget.SwipeRefreshLayout;
14+
import android.support.v7.app.AppCompatActivity;
1415
import android.support.v7.widget.DefaultItemAnimator;
1516
import android.support.v7.widget.GridLayoutManager;
1617
import android.support.v7.widget.RecyclerView;
@@ -24,6 +25,8 @@
2425
import android.widget.PopupMenu;
2526
import android.widget.TextView;
2627

28+
import com.afollestad.materialcab.MaterialCab;
29+
2730
import oly.netpowerctrl.App;
2831
import oly.netpowerctrl.R;
2932
import oly.netpowerctrl.data.AutomaticSetup;
@@ -51,7 +54,6 @@
5154
import oly.netpowerctrl.ui.EmptyListener;
5255
import oly.netpowerctrl.ui.FragmentUtils;
5356
import oly.netpowerctrl.ui.ItemShadowDecoration;
54-
import oly.netpowerctrl.ui.MaterialCab;
5557
import oly.netpowerctrl.ui.RecyclerItemClickListener;
5658
import oly.netpowerctrl.ui.SimpleListDividerDecoration;
5759
import oly.netpowerctrl.utils.AnimationController;
@@ -180,7 +182,7 @@ public View onCreateView(LayoutInflater inflater, final ViewGroup container,
180182
final View view = inflater.inflate(R.layout.fragment_outlets, container, false);
181183
assert view != null;
182184

183-
cab = new MaterialCab(getActivity(), R.id.cab_stub);
185+
cab = new MaterialCab((AppCompatActivity) getActivity(), R.id.cab_stub);
184186
cab.setMenu(R.menu.outlets_editmode);
185187
cab.setTitleRes(R.string.outlets_edit_mode);
186188

@@ -195,7 +197,7 @@ public void onClick(View view) {
195197
mRecyclerView = (RecyclerView) view.findViewById(android.R.id.list);
196198
mRecyclerView.setItemAnimator(new DefaultItemAnimator());
197199
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
198-
mRecyclerView.addItemDecoration(new ItemShadowDecoration((NinePatchDrawable) ContextCompat.getDrawable(getActivity(), R.drawable.material_shadow_z1)));
200+
mRecyclerView.addItemDecoration(new ItemShadowDecoration((NinePatchDrawable) ContextCompat.getDrawable(getActivity(), R.drawable.material_shadow_z19)));
199201
}
200202
listDividerDecoration = new SimpleListDividerDecoration(ContextCompat.getDrawable(getActivity(), R.drawable.list_divider), true);
201203
mRecyclerView.addOnItemTouchListener(new RecyclerItemClickListener(getActivity(), this, null));
@@ -503,7 +505,8 @@ public boolean onCabItemClicked(MenuItem item) {
503505
}
504506

505507
@Override
506-
public void onCabFinished(MaterialCab cab) {
508+
public boolean onCabFinished(MaterialCab cab) {
507509
setEditMode(false);
510+
return true;
508511
}
509512
}

‎app/src/main/java/oly/netpowerctrl/main/EditActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import android.os.Bundle;
1717
import android.support.v4.content.ContextCompat;
1818
import android.support.v7.app.ActionBar;
19-
import android.support.v7.app.ActionBarActivity;
19+
import android.support.v7.app.AppCompatActivity;
2020
import android.support.v7.graphics.Palette;
2121
import android.support.v7.widget.Toolbar;
2222
import android.text.Editable;
@@ -65,7 +65,7 @@
6565
* This activity is responsible for creating a "executable" either for the executable list
6666
* in the application or for a shortcut intent for the home-screen.
6767
*/
68-
public class EditActivity extends ActionBarActivity implements IconSelected, onNameChangeResult {
68+
public class EditActivity extends AppCompatActivity implements IconSelected, onNameChangeResult {
6969
/**
7070
* We pass arguments to this activity via the intent extra bundle und the result is passed via
7171
* setResult().

‎app/src/main/java/oly/netpowerctrl/main/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import android.graphics.drawable.Drawable;
2424
import android.os.Bundle;
2525
import android.support.v4.widget.SlidingPaneLayout;
26-
import android.support.v7.app.ActionBarActivity;
26+
import android.support.v7.app.AppCompatActivity;
2727
import android.support.v7.widget.Toolbar;
2828
import android.util.TypedValue;
2929
import android.view.LayoutInflater;
@@ -42,7 +42,7 @@
4242
import oly.netpowerctrl.ui.notifications.ChangeLogNotification;
4343
import oly.netpowerctrl.ui.notifications.InAppNotifications;
4444

45-
public class MainActivity extends ActionBarActivity {
45+
public class MainActivity extends AppCompatActivity {
4646
private boolean firstFragment = true;
4747
private SlidingPaneLayout panes = null;
4848

‎app/src/main/java/oly/netpowerctrl/ui/FragmentUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import android.os.Build;
1010
import android.os.Bundle;
1111
import android.support.annotation.IdRes;
12-
import android.support.v7.app.ActionBarActivity;
12+
import android.support.v7.app.AppCompatActivity;
1313
import android.view.Display;
1414
import android.view.Window;
1515
import android.view.WindowManager;
@@ -116,7 +116,7 @@ public static void makeActivityDialog(Activity activity) {
116116
}
117117
}
118118

119-
public static void applyActivityFlags(ActionBarActivity activity) {
119+
public static void applyActivityFlags(AppCompatActivity activity) {
120120
//Remove title bar
121121
activity.supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
122122

0 commit comments

Comments
 (0)