Skip to content

Commit 9686c85

Browse files
authored
Merge pull request #3 from AutSoft/bugfixes
Bugfixes
2 parents ba8172d + cc12cd7 commit 9686c85

File tree

193 files changed

+4892
-4883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+4892
-4883
lines changed

app/src/androidTest/java/hu/axolotl/app/ExampleInstrumentedTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.junit.Test;
88
import org.junit.runner.RunWith;
99

10-
import static org.junit.Assert.*;
10+
import static org.junit.Assert.assertEquals;
1111

1212
/**
1313
* Instrumentation test, which will execute on an Android device.
@@ -16,11 +16,11 @@
1616
*/
1717
@RunWith(AndroidJUnit4.class)
1818
public class ExampleInstrumentedTest {
19-
@Test
20-
public void useAppContext() throws Exception {
21-
// Context of the app under test.
22-
Context appContext = InstrumentationRegistry.getTargetContext();
19+
@Test
20+
public void useAppContext() throws Exception {
21+
// Context of the app under test.
22+
Context appContext = InstrumentationRegistry.getTargetContext();
2323

24-
assertEquals("hu.axolotl.app", appContext.getPackageName());
25-
}
24+
assertEquals("hu.axolotl.app", appContext.getPackageName());
25+
}
2626
}

app/src/main/AndroidManifest.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<manifest package="hu.axolotl.app"
2-
xmlns:android="http://schemas.android.com/apk/res/android">
2+
xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<application
5-
android:name="hu.axolotl.tasklib.sample.app.SampleApplication"
6-
android:allowBackup="true"
7-
android:icon="@mipmap/ic_launcher"
8-
android:label="@string/app_name"
9-
android:supportsRtl="true"
10-
android:theme="@style/AppTheme">
11-
<activity android:name="hu.axolotl.tasklib.sample.app.MainActivity">
12-
<intent-filter>
13-
<action android:name="android.intent.action.MAIN"/>
4+
<application
5+
android:name="hu.axolotl.tasklib.sample.app.SampleApplication"
6+
android:allowBackup="true"
7+
android:icon="@mipmap/ic_launcher"
8+
android:label="@string/app_name"
9+
android:supportsRtl="true"
10+
android:theme="@style/AppTheme">
11+
<activity android:name="hu.axolotl.tasklib.sample.app.MainActivity">
12+
<intent-filter>
13+
<action android:name="android.intent.action.MAIN"/>
1414

15-
<category android:name="android.intent.category.LAUNCHER"/>
16-
</intent-filter>
17-
</activity>
18-
</application>
15+
<category android:name="android.intent.category.LAUNCHER"/>
16+
</intent-filter>
17+
</activity>
18+
</application>
1919

2020
</manifest>

app/src/main/java/hu/axolotl/tasklib/sample/app/BaseActivity.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
*/
1616
package hu.axolotl.tasklib.sample.app;
1717

18-
import hu.axolotl.tasklib.base.BaseTask;
1918
import hu.axolotl.tasklib.GlobalError;
2019
import hu.axolotl.tasklib.android.base.TaskActivity;
20+
import hu.axolotl.tasklib.base.BaseTask;
2121

2222
public abstract class BaseActivity extends TaskActivity {
2323

24-
protected boolean onTaskGlobalError(GlobalError error) {
25-
setTaskStatus(null, "GE onTaskGlobalError");
26-
return true;
27-
}
24+
protected boolean onTaskGlobalError(GlobalError error) {
25+
setTaskStatus(null, "GE onTaskGlobalError");
26+
return true;
27+
}
2828

29-
protected abstract void setTaskStatus(BaseTask task, String message);
29+
protected abstract void setTaskStatus(BaseTask task, String message);
3030
}

app/src/main/java/hu/axolotl/tasklib/sample/app/ButtonMenuLayout.java

+24-24
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@
2525
import android.widget.LinearLayout;
2626

2727
public class ButtonMenuLayout extends LinearLayout {
28-
public ButtonMenuLayout(Context context) {
29-
super(context);
30-
}
31-
32-
public ButtonMenuLayout(Context context, AttributeSet attrs) {
33-
super(context, attrs);
34-
}
35-
36-
public ButtonMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
37-
super(context, attrs, defStyleAttr);
38-
}
39-
40-
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
41-
public ButtonMenuLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
42-
super(context, attrs, defStyleAttr, defStyleRes);
43-
}
44-
45-
public void addMenuItem(String label, View.OnClickListener onClickListener) {
46-
Button button = new Button(getContext());
47-
button.setText(label);
48-
button.setOnClickListener(onClickListener);
49-
LayoutParams lp = new LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
50-
addView(button, lp);
51-
}
28+
public ButtonMenuLayout(Context context) {
29+
super(context);
30+
}
31+
32+
public ButtonMenuLayout(Context context, AttributeSet attrs) {
33+
super(context, attrs);
34+
}
35+
36+
public ButtonMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
37+
super(context, attrs, defStyleAttr);
38+
}
39+
40+
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
41+
public ButtonMenuLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
42+
super(context, attrs, defStyleAttr, defStyleRes);
43+
}
44+
45+
public void addMenuItem(String label, View.OnClickListener onClickListener) {
46+
Button button = new Button(getContext());
47+
button.setText(label);
48+
button.setOnClickListener(onClickListener);
49+
LayoutParams lp = new LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
50+
addView(button, lp);
51+
}
5252

5353

5454
}

0 commit comments

Comments
 (0)