Skip to content

Commit d2ea174

Browse files
hannesa2niqdev
hannesa2
and
niqdev
authored
Apply common code style (#112)
Co-authored-by: niqdev <niqdev@users.noreply.github.com>
1 parent f68216c commit d2ea174

24 files changed

+468
-487
lines changed

‎app/src/main/java/com/github/niqdev/ipcam/IpCamCustomAppearanceActivity.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.graphics.Color;
44
import android.os.Bundle;
5-
import androidx.appcompat.app.AppCompatActivity;
65
import android.util.Log;
76
import android.view.Menu;
87
import android.view.MenuItem;
@@ -14,6 +13,7 @@
1413
import com.github.niqdev.mjpeg.Mjpeg;
1514
import com.github.niqdev.mjpeg.MjpegView;
1615

16+
import androidx.appcompat.app.AppCompatActivity;
1717
import butterknife.BindView;
1818
import butterknife.ButterKnife;
1919

@@ -43,20 +43,20 @@ private void loadIpCam() {
4343
progressWrapper.setVisibility(View.VISIBLE);
4444

4545
Mjpeg.newInstance()
46-
.open("http://62.176.195.157:80/mjpg/video.mjpg", TIMEOUT)
47-
.subscribe(
48-
inputStream -> {
49-
progressWrapper.setVisibility(View.GONE);
50-
mjpegView.setFpsOverlayBackgroundColor(Color.DKGRAY);
51-
mjpegView.setFpsOverlayTextColor(Color.WHITE);
52-
mjpegView.setSource(inputStream);
53-
mjpegView.setDisplayMode(DisplayMode.BEST_FIT);
54-
mjpegView.showFps(true);
55-
},
56-
throwable -> {
57-
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
58-
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
59-
});
46+
.open("http://62.176.195.157:80/mjpg/video.mjpg", TIMEOUT)
47+
.subscribe(
48+
inputStream -> {
49+
progressWrapper.setVisibility(View.GONE);
50+
mjpegView.setFpsOverlayBackgroundColor(Color.DKGRAY);
51+
mjpegView.setFpsOverlayTextColor(Color.WHITE);
52+
mjpegView.setSource(inputStream);
53+
mjpegView.setDisplayMode(DisplayMode.BEST_FIT);
54+
mjpegView.showFps(true);
55+
},
56+
throwable -> {
57+
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
58+
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
59+
});
6060
}
6161

6262
@Override

‎app/src/main/java/com/github/niqdev/ipcam/IpCamDefaultActivity.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import android.content.res.Configuration;
55
import android.os.Bundle;
66
import android.preference.PreferenceManager;
7-
import androidx.appcompat.app.AppCompatActivity;
87
import android.util.Log;
98
import android.widget.Toast;
109

1110
import com.github.niqdev.mjpeg.DisplayMode;
1211
import com.github.niqdev.mjpeg.Mjpeg;
1312
import com.github.niqdev.mjpeg.MjpegView;
1413

14+
import androidx.appcompat.app.AppCompatActivity;
1515
import butterknife.BindView;
1616
import butterknife.ButterKnife;
1717

@@ -43,7 +43,7 @@ private SharedPreferences getSharedPreferences() {
4343

4444
private String getPreference(String key) {
4545
return getSharedPreferences()
46-
.getString(key, "");
46+
.getString(key, "");
4747
}
4848

4949
private Boolean getBooleanPreference(String key) {
@@ -54,26 +54,26 @@ private Boolean getBooleanPreference(String key) {
5454
private DisplayMode calculateDisplayMode() {
5555
int orientation = getResources().getConfiguration().orientation;
5656
return orientation == Configuration.ORIENTATION_LANDSCAPE ?
57-
DisplayMode.FULLSCREEN : DisplayMode.BEST_FIT;
57+
DisplayMode.FULLSCREEN : DisplayMode.BEST_FIT;
5858
}
5959

6060
private void loadIpCam() {
6161
Mjpeg.newInstance()
62-
.credential(getPreference(PREF_AUTH_USERNAME), getPreference(PREF_AUTH_PASSWORD))
63-
.open(getPreference(PREF_IPCAM_URL), TIMEOUT)
64-
.subscribe(
65-
inputStream -> {
66-
mjpegView.setSource(inputStream);
67-
mjpegView.setDisplayMode(calculateDisplayMode());
68-
mjpegView.flipHorizontal(getBooleanPreference(PREF_FLIP_HORIZONTAL));
69-
mjpegView.flipVertical(getBooleanPreference(PREF_FLIP_VERTICAL));
70-
mjpegView.setRotate(Float.parseFloat(getPreference(PREF_ROTATE_DEGREES)));
71-
mjpegView.showFps(true);
72-
},
73-
throwable -> {
74-
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
75-
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
76-
});
62+
.credential(getPreference(PREF_AUTH_USERNAME), getPreference(PREF_AUTH_PASSWORD))
63+
.open(getPreference(PREF_IPCAM_URL), TIMEOUT)
64+
.subscribe(
65+
inputStream -> {
66+
mjpegView.setSource(inputStream);
67+
mjpegView.setDisplayMode(calculateDisplayMode());
68+
mjpegView.flipHorizontal(getBooleanPreference(PREF_FLIP_HORIZONTAL));
69+
mjpegView.flipVertical(getBooleanPreference(PREF_FLIP_VERTICAL));
70+
mjpegView.setRotate(Float.parseFloat(getPreference(PREF_ROTATE_DEGREES)));
71+
mjpegView.showFps(true);
72+
},
73+
throwable -> {
74+
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
75+
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
76+
});
7777
}
7878

7979
@Override

‎app/src/main/java/com/github/niqdev/ipcam/IpCamNativeActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.github.niqdev.ipcam;
22

33
import android.os.Bundle;
4-
import androidx.appcompat.app.AppCompatActivity;
54

65
import com.github.niqdev.mjpeg.DisplayMode;
76
import com.github.niqdev.mjpeg.Mjpeg;
87
import com.github.niqdev.mjpeg.MjpegView;
98

9+
import androidx.appcompat.app.AppCompatActivity;
1010
import butterknife.BindView;
1111
import butterknife.ButterKnife;
1212

@@ -27,14 +27,14 @@ protected void onCreate(Bundle savedInstanceState) {
2727

2828
private void loadIpcam() {
2929
Mjpeg.newInstance(Mjpeg.Type.NATIVE)
30-
//.credential("", "")
31-
.open("http://wmccpinetop.axiscam.net/mjpg/video.mjpg")
32-
.subscribe(inputStream -> {
33-
mjpegView.setSource(inputStream);
34-
// TODO if (inputStream != null) inputStream.setSkip(1)
35-
mjpegView.setDisplayMode(DisplayMode.BEST_FIT);
36-
mjpegView.showFps(true);
37-
});
30+
//.credential("", "")
31+
.open("http://wmccpinetop.axiscam.net/mjpg/video.mjpg")
32+
.subscribe(inputStream -> {
33+
mjpegView.setSource(inputStream);
34+
// TODO if (inputStream != null) inputStream.setSkip(1)
35+
mjpegView.setDisplayMode(DisplayMode.BEST_FIT);
36+
mjpegView.showFps(true);
37+
});
3838
}
3939

4040
@Override

‎app/src/main/java/com/github/niqdev/ipcam/IpCamSnapshotActivity.java‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.graphics.Bitmap;
55
import android.os.Bundle;
66
import android.preference.PreferenceManager;
7-
import androidx.appcompat.app.AppCompatActivity;
87
import android.util.Log;
98
import android.view.Menu;
109
import android.view.MenuItem;
@@ -16,6 +15,7 @@
1615
import com.github.niqdev.mjpeg.MjpegView;
1716
import com.github.niqdev.mjpeg.OnFrameCapturedListener;
1817

18+
import androidx.appcompat.app.AppCompatActivity;
1919
import butterknife.BindView;
2020
import butterknife.ButterKnife;
2121

@@ -26,14 +26,11 @@
2626
public class IpCamSnapshotActivity extends AppCompatActivity implements OnFrameCapturedListener {
2727

2828
private static final int TIMEOUT = 5;
29-
30-
private Bitmap lastPreview = null;
31-
3229
@BindView(R.id.mjpegViewSnapshot)
3330
MjpegView mjpegView;
34-
3531
@BindView(R.id.imageView)
3632
ImageView imageView;
33+
private Bitmap lastPreview = null;
3734

3835
@Override
3936
protected void onCreate(Bundle savedInstanceState) {
@@ -45,8 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {
4542

4643
private String getPreference(String key) {
4744
return PreferenceManager
48-
.getDefaultSharedPreferences(this)
49-
.getString(key, "");
45+
.getDefaultSharedPreferences(this)
46+
.getString(key, "");
5047
}
5148

5249
private DisplayMode calculateDisplayMode() {
@@ -57,18 +54,18 @@ private DisplayMode calculateDisplayMode() {
5754

5855
private void loadIpCam() {
5956
Mjpeg.newInstance()
60-
.credential(getPreference(PREF_AUTH_USERNAME), getPreference(PREF_AUTH_PASSWORD))
61-
.open(getPreference(PREF_IPCAM_URL), TIMEOUT)
62-
.subscribe(
63-
inputStream -> {
64-
mjpegView.setSource(inputStream);
65-
mjpegView.setDisplayMode(calculateDisplayMode());
66-
mjpegView.showFps(true);
67-
},
68-
throwable -> {
69-
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
70-
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
71-
});
57+
.credential(getPreference(PREF_AUTH_USERNAME), getPreference(PREF_AUTH_PASSWORD))
58+
.open(getPreference(PREF_IPCAM_URL), TIMEOUT)
59+
.subscribe(
60+
inputStream -> {
61+
mjpegView.setSource(inputStream);
62+
mjpegView.setDisplayMode(calculateDisplayMode());
63+
mjpegView.showFps(true);
64+
},
65+
throwable -> {
66+
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
67+
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
68+
});
7269
}
7370

7471
@Override

‎app/src/main/java/com/github/niqdev/ipcam/IpCamTwoActivity.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.github.niqdev.ipcam;
22

33
import android.os.Bundle;
4-
import androidx.appcompat.app.AppCompatActivity;
54
import android.util.Log;
65
import android.widget.Toast;
76

87
import com.github.niqdev.mjpeg.DisplayMode;
98
import com.github.niqdev.mjpeg.Mjpeg;
109
import com.github.niqdev.mjpeg.MjpegView;
1110

11+
import androidx.appcompat.app.AppCompatActivity;
1212
import butterknife.BindView;
1313
import butterknife.ButterKnife;
1414

@@ -31,32 +31,32 @@ protected void onCreate(Bundle savedInstanceState) {
3131

3232
private void loadIpCam1() {
3333
Mjpeg.newInstance()
34-
.open("http://50.244.186.65:8081/mjpg/video.mjpg", TIMEOUT)
35-
.subscribe(
36-
inputStream -> {
37-
mjpegView1.setSource(inputStream);
38-
mjpegView1.setDisplayMode(DisplayMode.BEST_FIT);
39-
mjpegView1.showFps(true);
40-
},
41-
throwable -> {
42-
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
43-
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
44-
});
34+
.open("http://50.244.186.65:8081/mjpg/video.mjpg", TIMEOUT)
35+
.subscribe(
36+
inputStream -> {
37+
mjpegView1.setSource(inputStream);
38+
mjpegView1.setDisplayMode(DisplayMode.BEST_FIT);
39+
mjpegView1.showFps(true);
40+
},
41+
throwable -> {
42+
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
43+
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
44+
});
4545
}
4646

4747
private void loadIpCam2() {
4848
Mjpeg.newInstance()
49-
.open("http://iris.not.iac.es/axis-cgi/mjpg/video.cgi?resolution=320x240", TIMEOUT)
50-
.subscribe(
51-
inputStream -> {
52-
mjpegView2.setSource(inputStream);
53-
mjpegView2.setDisplayMode(DisplayMode.BEST_FIT);
54-
mjpegView2.showFps(true);
55-
},
56-
throwable -> {
57-
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
58-
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
59-
});
49+
.open("http://iris.not.iac.es/axis-cgi/mjpg/video.cgi?resolution=320x240", TIMEOUT)
50+
.subscribe(
51+
inputStream -> {
52+
mjpegView2.setSource(inputStream);
53+
mjpegView2.setDisplayMode(DisplayMode.BEST_FIT);
54+
mjpegView2.showFps(true);
55+
},
56+
throwable -> {
57+
Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
58+
Toast.makeText(this, "Error", Toast.LENGTH_LONG).show();
59+
});
6060
}
6161

6262
@Override

‎app/src/main/java/com/github/niqdev/ipcam/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import android.os.Build;
66
import android.os.Bundle;
77
import android.preference.PreferenceManager;
8-
import androidx.appcompat.app.AppCompatActivity;
98
import android.text.TextUtils;
109
import android.widget.Button;
1110
import android.widget.Toast;
1211

1312
import com.github.niqdev.ipcam.settings.SettingsActivity;
1413

14+
import androidx.appcompat.app.AppCompatActivity;
1515
import butterknife.BindView;
1616
import butterknife.ButterKnife;
1717
import butterknife.OnClick;

‎app/src/main/java/com/github/niqdev/ipcam/settings/AppCompatPreferenceActivity.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
import android.content.res.Configuration;
44
import android.os.Bundle;
55
import android.preference.PreferenceActivity;
6+
import android.view.MenuInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
610
import androidx.annotation.LayoutRes;
711
import androidx.annotation.Nullable;
812
import androidx.appcompat.app.ActionBar;
913
import androidx.appcompat.app.AppCompatDelegate;
1014
import androidx.appcompat.widget.Toolbar;
11-
import android.view.MenuInflater;
12-
import android.view.View;
13-
import android.view.ViewGroup;
1415

1516
/**
1617
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls

‎app/src/main/java/com/github/niqdev/ipcam/settings/SettingsActivity.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,21 @@
1111
import android.preference.PreferenceCategory;
1212
import android.preference.PreferenceFragment;
1313
import android.preference.PreferenceManager;
14-
import androidx.core.app.NavUtils;
15-
import androidx.appcompat.app.ActionBar;
1614
import android.text.TextUtils;
1715
import android.view.MenuItem;
1816

1917
import com.github.niqdev.ipcam.R;
2018

2119
import java.util.List;
2220

21+
import androidx.appcompat.app.ActionBar;
22+
import androidx.core.app.NavUtils;
23+
2324
public class SettingsActivity extends AppCompatPreferenceActivity {
2425

2526
public static final String PREF_IPCAM_URL = "com.github.niqdev.ipcam.settings.SettingsActivity.IPCAM_URL";
2627
public static final String PREF_FLIP_HORIZONTAL = "com.github.niqdev.ipcam.settings.SettingsActivity.FLIP_HORIZONTAL";
27-
public static final String PREF_FLIP_VERTICAL= "com.github.niqdev.ipcam.settings.SettingsActivity.FLIP_VERTICAL";
28+
public static final String PREF_FLIP_VERTICAL = "com.github.niqdev.ipcam.settings.SettingsActivity.FLIP_VERTICAL";
2829
public static final String PREF_ROTATE_DEGREES = "com.github.niqdev.ipcam.settings.SettingsActivity.ROTATE_DEGREES";
2930
public static final String PREF_AUTH_USERNAME = "com.github.niqdev.ipcam.settings.SettingsActivity.PREF_AUTH_USERNAME";
3031
public static final String PREF_AUTH_PASSWORD = "com.github.niqdev.ipcam.settings.SettingsActivity.PREF_AUTH_PASSWORD";
@@ -96,9 +97,9 @@ private static void bindPreferenceSummaryToValue(Preference preference) {
9697

9798
// Trigger the listener immediately with the preference's current value.
9899
sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
99-
PreferenceManager
100-
.getDefaultSharedPreferences(preference.getContext())
101-
.getString(preference.getKey(), ""));
100+
PreferenceManager
101+
.getDefaultSharedPreferences(preference.getContext())
102+
.getString(preference.getKey(), ""));
102103
}
103104

104105
@Override

0 commit comments

Comments
 (0)