Skip to content

Commit fea1eb7

Browse files
tibbitibbi
committed
some refactoring, no functionality change
1 parent 805211f commit fea1eb7

File tree

8 files changed

+115
-100
lines changed

8 files changed

+115
-100
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:supportsRtl="true"
2121
android:theme="@style/AppTheme">
2222
<activity
23-
android:name=".MainActivity"
23+
android:name=".activities.MainActivity"
2424
android:screenOrientation="portrait">
2525
<intent-filter>
2626
<action android:name="android.intent.action.MAIN"/>
@@ -30,12 +30,12 @@
3030
</activity>
3131

3232
<activity
33-
android:name=".AboutActivity"
33+
android:name=".activities.AboutActivity"
3434
android:label="@string/about"
3535
android:screenOrientation="portrait"/>
3636

3737
<activity
38-
android:name=".LicenseActivity"
38+
android:name=".activities.LicenseActivity"
3939
android:label="@string/third_party_licences"
4040
android:screenOrientation="portrait"/>
4141

‎app/src/main/java/com/simplemobiletools/flashlight/MarshmallowCamera.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
public class MarshmallowCamera {
1111
private static final String TAG = MyCameraImpl.class.getSimpleName();
12+
1213
private MyCamera mCallback;
1314
private Context mContext;
1415

‎app/src/main/java/com/simplemobiletools/flashlight/MyCameraImpl.java‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,100 +6,103 @@
66

77
public class MyCameraImpl {
88
private static final String TAG = MyCameraImpl.class.getSimpleName();
9-
private Camera camera;
10-
private Camera.Parameters params;
11-
private boolean isFlashlightOn;
12-
private MyCamera callback;
13-
private Context context;
14-
private boolean isMarshmallow;
15-
private MarshmallowCamera marshmallowCamera;
9+
private static Camera mCamera;
10+
private static Camera.Parameters mParams;
11+
private static MyCamera mCallback;
12+
private static Context mContext;
13+
private static MarshmallowCamera mMarshmallowCamera;
14+
15+
private static boolean mIsFlashlightOn;
16+
private static boolean mIsMarshmallow;
1617

1718
public MyCameraImpl(MyCamera camera, Context cxt) {
18-
callback = camera;
19-
context = cxt;
20-
isMarshmallow = isMarshmallow();
19+
mCallback = camera;
20+
mContext = cxt;
21+
mIsMarshmallow = isMarshmallow();
2122
handleCameraSetup();
2223
}
2324

2425
public void toggleFlashlight() {
2526
handleCameraSetup();
26-
isFlashlightOn = !isFlashlightOn;
27+
mIsFlashlightOn = !mIsFlashlightOn;
2728

28-
if (isFlashlightOn) {
29+
if (mIsFlashlightOn) {
2930
enableFlashlight();
3031
} else {
3132
disableFlashlight();
3233
}
3334
}
3435

3536
public void handleCameraSetup() {
36-
if (isMarshmallow) {
37+
if (mIsMarshmallow) {
3738
setupMarshmallowCamera();
3839
} else {
3940
setupCamera();
4041
}
4142
}
4243

4344
private void setupMarshmallowCamera() {
44-
if (marshmallowCamera == null) {
45-
marshmallowCamera = new MarshmallowCamera(callback, context);
45+
if (mMarshmallowCamera == null) {
46+
mMarshmallowCamera = new MarshmallowCamera(mCallback, mContext);
4647
}
4748
}
4849

4950
private void setupCamera() {
50-
if (isMarshmallow)
51+
if (mIsMarshmallow)
5152
return;
5253

53-
if (camera == null) {
54+
if (mCamera == null) {
5455
try {
55-
camera = Camera.open();
56-
params = camera.getParameters();
57-
params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
58-
camera.setParameters(params);
56+
mCamera = Camera.open();
57+
mParams = mCamera.getParameters();
58+
mParams.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
59+
mCamera.setParameters(mParams);
5960

60-
if (isFlashlightOn)
61+
if (mIsFlashlightOn)
6162
enableFlashlight();
6263
} catch (Exception e) {
63-
Log.e(TAG, "setup camera " + e.getMessage());
64-
callback.cameraUnavailable();
64+
Log.e(TAG, "setup mCamera " + e.getMessage());
65+
mCallback.cameraUnavailable();
6566
}
6667
}
6768
}
6869

6970
private void enableFlashlight() {
70-
if (isMarshmallow) {
71+
if (mIsMarshmallow) {
7172
toggleMarshmallowFlashlight(true);
7273
} else {
73-
if (camera == null || params == null)
74+
if (mCamera == null || mParams == null) {
7475
return;
76+
}
7577

76-
params.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
77-
camera.setParameters(params);
78+
mParams.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
79+
mCamera.setParameters(mParams);
7880
}
79-
callback.enableFlashlight();
81+
mCallback.enableFlashlight();
8082
}
8183

8284
private void disableFlashlight() {
8385
if (isMarshmallow()) {
8486
toggleMarshmallowFlashlight(false);
8587
} else {
86-
if (camera == null || params == null)
88+
if (mCamera == null || mParams == null) {
8789
return;
90+
}
8891

89-
params.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
90-
camera.setParameters(params);
92+
mParams.setFlashMode(Camera.Parameters.FLASH_MODE_OFF);
93+
mCamera.setParameters(mParams);
9194
}
92-
callback.disableFlashlight();
95+
mCallback.disableFlashlight();
9396
}
9497

9598
private void toggleMarshmallowFlashlight(boolean enable) {
96-
marshmallowCamera.toggleMarshmallowFlashlight(enable);
99+
mMarshmallowCamera.toggleMarshmallowFlashlight(enable);
97100
}
98101

99102
public void releaseCamera() {
100-
if (camera != null) {
101-
camera.release();
102-
camera = null;
103+
if (mCamera != null) {
104+
mCamera.release();
105+
mCamera = null;
103106
}
104107
}
105108

‎app/src/main/java/com/simplemobiletools/flashlight/MyWidgetProvider.java‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,67 +11,66 @@
1111
import android.widget.RemoteViews;
1212

1313
public class MyWidgetProvider extends AppWidgetProvider implements MyCamera {
14-
private static MyCameraImpl cameraImpl;
15-
private static RemoteViews remoteViews;
16-
private static Context cxt;
17-
private static int[] widgetIds;
18-
private static AppWidgetManager widgetManager;
1914
private static final String TOGGLE = "toggle";
20-
private static Bitmap coloredBmp;
15+
private static MyCameraImpl mCameraImpl;
16+
private static RemoteViews mRemoteViews;
17+
private static AppWidgetManager mWidgetManager;
18+
private static Bitmap mColoredBmp;
19+
20+
private static int[] mWidgetIds;
2121

2222
@Override
2323
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
2424
initVariables(context);
25-
appWidgetManager.updateAppWidget(appWidgetIds, remoteViews);
25+
appWidgetManager.updateAppWidget(appWidgetIds, mRemoteViews);
2626
}
2727

2828
private void initVariables(Context context) {
29-
cxt = context;
30-
final ComponentName component = new ComponentName(cxt, MyWidgetProvider.class);
31-
widgetManager = AppWidgetManager.getInstance(context);
32-
widgetIds = widgetManager.getAppWidgetIds(component);
29+
final ComponentName component = new ComponentName(context, MyWidgetProvider.class);
30+
mWidgetManager = AppWidgetManager.getInstance(context);
31+
mWidgetIds = mWidgetManager.getAppWidgetIds(component);
3332

34-
final Intent intent = new Intent(cxt, MyWidgetProvider.class);
33+
final Intent intent = new Intent(context, MyWidgetProvider.class);
3534
intent.setAction(TOGGLE);
3635

37-
final PendingIntent pendingIntent = PendingIntent.getBroadcast(cxt, 0, intent, 0);
38-
remoteViews = new RemoteViews(cxt.getPackageName(), R.layout.widget);
39-
remoteViews.setOnClickPendingIntent(R.id.toggle_btn, pendingIntent);
40-
cameraImpl = new MyCameraImpl(this, cxt);
36+
final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, 0);
37+
mRemoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
38+
mRemoteViews.setOnClickPendingIntent(R.id.toggle_btn, pendingIntent);
39+
mCameraImpl = new MyCameraImpl(this, context);
4140

42-
final Resources res = cxt.getResources();
41+
final Resources res = context.getResources();
4342
final int appColor = res.getColor(R.color.colorPrimary);
44-
coloredBmp = Utils.getColoredIcon(cxt.getResources(), appColor, R.mipmap.flashlight_small);
43+
mColoredBmp = Utils.getColoredIcon(context.getResources(), appColor, R.mipmap.flashlight_small);
4544
}
4645

4746
@Override
4847
public void onReceive(Context context, Intent intent) {
4948
final String action = intent.getAction();
5049
if (action.equals(TOGGLE)) {
51-
if (cameraImpl == null) {
50+
if (mCameraImpl == null) {
5251
initVariables(context);
5352
}
5453

55-
cameraImpl.toggleFlashlight();
54+
mCameraImpl.toggleFlashlight();
5655
} else
5756
super.onReceive(context, intent);
5857
}
5958

6059
@Override
6160
public void enableFlashlight() {
62-
remoteViews.setImageViewBitmap(R.id.toggle_btn, coloredBmp);
63-
for (int widgetId : widgetIds) {
64-
widgetManager.updateAppWidget(widgetId, remoteViews);
61+
mRemoteViews.setImageViewBitmap(R.id.toggle_btn, mColoredBmp);
62+
for (int widgetId : mWidgetIds) {
63+
mWidgetManager.updateAppWidget(widgetId, mRemoteViews);
6564
}
6665
}
6766

6867
@Override
6968
public void disableFlashlight() {
70-
remoteViews.setImageViewResource(R.id.toggle_btn, R.mipmap.flashlight_small);
71-
for (int widgetId : widgetIds) {
72-
widgetManager.updateAppWidget(widgetId, remoteViews);
69+
mRemoteViews.setImageViewResource(R.id.toggle_btn, R.mipmap.flashlight_small);
70+
for (int widgetId : mWidgetIds) {
71+
mWidgetManager.updateAppWidget(widgetId, mRemoteViews);
7372
}
74-
cameraImpl.releaseCamera();
73+
mCameraImpl.releaseCamera();
7574
}
7675

7776
@Override
@@ -85,10 +84,10 @@ public void onDeleted(Context context, int[] appWidgetIds) {
8584
}
8685

8786
private void releaseCamera(Context context) {
88-
if (cameraImpl == null)
87+
if (mCameraImpl == null)
8988
initVariables(context);
9089

9190
disableFlashlight();
92-
cameraImpl.releaseCamera();
91+
mCameraImpl.releaseCamera();
9392
}
9493
}

‎app/src/main/java/com/simplemobiletools/flashlight/Utils.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public static Bitmap getColoredIcon(Resources res, int newTextColor, int id) {
1919
final Paint paint = new Paint();
2020
final ColorFilter filter = new PorterDuffColorFilter(newTextColor, PorterDuff.Mode.SRC_IN);
2121
paint.setColorFilter(filter);
22+
2223
final Canvas canvas = new Canvas(bmp);
2324
canvas.drawBitmap(bmp, 0, 0, paint);
2425
return bmp;

‎app/src/main/java/com/simplemobiletools/flashlight/AboutActivity.java‎ renamed to ‎app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.simplemobiletools.flashlight;
1+
package com.simplemobiletools.flashlight.activities;
22

33
import android.content.Intent;
44
import android.content.res.Resources;
@@ -8,48 +8,52 @@
88
import android.text.method.LinkMovementMethod;
99
import android.widget.TextView;
1010

11+
import com.simplemobiletools.flashlight.BuildConfig;
12+
import com.simplemobiletools.flashlight.R;
13+
1114
import java.util.Calendar;
1215

1316
import butterknife.BindView;
1417
import butterknife.ButterKnife;
1518
import butterknife.OnClick;
1619

1720
public class AboutActivity extends AppCompatActivity {
18-
@BindView(R.id.about_copyright) TextView copyright;
19-
@BindView(R.id.about_version) TextView version;
20-
@BindView(R.id.about_email) TextView emailTV;
21-
private Resources res;
21+
@BindView(R.id.about_copyright) TextView mCopyright;
22+
@BindView(R.id.about_version) TextView mVersion;
23+
@BindView(R.id.about_email) TextView mEmailTV;
24+
25+
private static Resources mRes;
2226

2327
@Override
2428
protected void onCreate(Bundle savedInstanceState) {
2529
super.onCreate(savedInstanceState);
2630
setContentView(R.layout.activity_about);
2731
ButterKnife.bind(this);
28-
res = getResources();
32+
mRes = getResources();
2933

3034
setupEmail();
3135
setupVersion();
3236
setupCopyright();
3337
}
3438

3539
private void setupEmail() {
36-
final String email = res.getString(R.string.email);
37-
final String appName = res.getString(R.string.app_name);
40+
final String email = mRes.getString(R.string.email);
41+
final String appName = mRes.getString(R.string.app_name);
3842
final String href = "<a href=\"mailto:" + email + "?subject=" + appName + "\">" + email + "</a>";
39-
emailTV.setText(Html.fromHtml(href));
40-
emailTV.setMovementMethod(LinkMovementMethod.getInstance());
43+
mEmailTV.setText(Html.fromHtml(href));
44+
mEmailTV.setMovementMethod(LinkMovementMethod.getInstance());
4145
}
4246

4347
private void setupVersion() {
4448
final String versionName = BuildConfig.VERSION_NAME;
45-
final String versionText = String.format(res.getString(R.string.version), versionName);
46-
version.setText(versionText);
49+
final String versionText = String.format(mRes.getString(R.string.version), versionName);
50+
mVersion.setText(versionText);
4751
}
4852

4953
private void setupCopyright() {
5054
final int year = Calendar.getInstance().get(Calendar.YEAR);
51-
final String copyrightText = String.format(res.getString(R.string.copyright), year);
52-
copyright.setText(copyrightText);
55+
final String copyrightText = String.format(mRes.getString(R.string.copyright), year);
56+
mCopyright.setText(copyrightText);
5357
}
5458

5559
@OnClick(R.id.about_license)

‎app/src/main/java/com/simplemobiletools/flashlight/LicenseActivity.java‎ renamed to ‎app/src/main/java/com/simplemobiletools/flashlight/activities/LicenseActivity.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
package com.simplemobiletools.flashlight;
1+
package com.simplemobiletools.flashlight.activities;
22

33
import android.content.Intent;
44
import android.net.Uri;
55
import android.os.Bundle;
66
import android.support.v7.app.AppCompatActivity;
77

8+
import com.simplemobiletools.flashlight.R;
9+
810
import butterknife.ButterKnife;
911
import butterknife.OnClick;
1012

1113
public class LicenseActivity extends AppCompatActivity {
14+
1215
@Override
1316
protected void onCreate(Bundle savedInstanceState) {
1417
super.onCreate(savedInstanceState);

0 commit comments

Comments
 (0)