some refactoring, no functionality change

tibbi · tibbi · commit f6ae35dd094e · 2016-06-19T10:59:24.000+02:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".activities.MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -20,7 +20,7 @@
         </activity>
 
         <activity
-            android:name=".MyWidgetConfigure"
+            android:name=".activities.WidgetConfigureActivity"
             android:screenOrientation="portrait"
             android:theme="@style/MyWidgetConfigTheme">
             <intent-filter>
@@ -29,12 +29,12 @@
         </activity>
 
         <activity
-            android:name=".AboutActivity"
+            android:name=".activities.AboutActivity"
             android:label="@string/about"
             android:screenOrientation="portrait"/>
 
         <activity
-            android:name=".LicenseActivity"
+            android:name=".activities.LicenseActivity"
             android:label="@string/third_party_licences"
             android:screenOrientation="portrait"/>
 
diff --git a/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java b/app/src/main/java/com/simplemobiletools/notes/MyWidgetProvider.java
@@ -9,39 +9,41 @@
 import android.graphics.Color;
 import android.widget.RemoteViews;
 
+import com.simplemobiletools.notes.activities.MainActivity;
+
 public class MyWidgetProvider extends AppWidgetProvider {
-    private static SharedPreferences prefs;
-    private RemoteViews remoteViews;
+    private static SharedPreferences mPrefs;
+    private static RemoteViews mRemoteViews;
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
         initVariables(context);
         final int defaultColor = context.getResources().getColor(R.color.dark_grey);
-        final int newBgColor = prefs.getInt(Constants.WIDGET_BG_COLOR, defaultColor);
-        final int newTextColor = prefs.getInt(Constants.WIDGET_TEXT_COLOR, Color.WHITE);
-        remoteViews.setInt(R.id.notes_view, "setBackgroundColor", newBgColor);
-        remoteViews.setInt(R.id.notes_view, "setTextColor", newTextColor);
+        final int newBgColor = mPrefs.getInt(Constants.WIDGET_BG_COLOR, defaultColor);
+        final int newTextColor = mPrefs.getInt(Constants.WIDGET_TEXT_COLOR, Color.WHITE);
+        mRemoteViews.setInt(R.id.notes_view, "setBackgroundColor", newBgColor);
+        mRemoteViews.setInt(R.id.notes_view, "setTextColor", newTextColor);
 
         for (int widgetId : appWidgetIds) {
-            updateWidget(appWidgetManager, widgetId, remoteViews);
+            updateWidget(appWidgetManager, widgetId, mRemoteViews);
         }
         super.onUpdate(context, appWidgetManager, appWidgetIds);
     }
 
     private void initVariables(Context context) {
-        prefs = context.getSharedPreferences(Constants.PREFS, Context.MODE_PRIVATE);
-        remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
+        mPrefs = context.getSharedPreferences(Constants.PREFS, Context.MODE_PRIVATE);
+        mRemoteViews = new RemoteViews(context.getPackageName(), R.layout.widget);
         setupAppOpenIntent(R.id.notes_holder, context);
     }
 
     private void setupAppOpenIntent(int id, Context context) {
         final Intent intent = new Intent(context, MainActivity.class);
         final PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
-        remoteViews.setOnClickPendingIntent(id, pendingIntent);
+        mRemoteViews.setOnClickPendingIntent(id, pendingIntent);
     }
 
     private void updateWidget(AppWidgetManager widgetManager, int widgetId, RemoteViews remoteViews) {
-        final String text = prefs.getString(Constants.TEXT, "");
+        final String text = mPrefs.getString(Constants.TEXT, "");
         remoteViews.setTextViewText(R.id.notes_view, text);
         widgetManager.updateAppWidget(widgetId, remoteViews);
     }
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/AboutActivity.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes;
+package com.simplemobiletools.notes.activities;
 
 import android.content.Intent;
 import android.content.res.Resources;
@@ -8,48 +8,52 @@
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
+import com.simplemobiletools.notes.BuildConfig;
+import com.simplemobiletools.notes.R;
+
 import java.util.Calendar;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class AboutActivity extends AppCompatActivity {
-    @BindView(R.id.about_copyright) TextView copyright;
-    @BindView(R.id.about_version) TextView version;
-    @BindView(R.id.about_email) TextView emailTV;
-    private Resources res;
+    @BindView(R.id.about_copyright) TextView mCopyright;
+    @BindView(R.id.about_version) TextView mVersion;
+    @BindView(R.id.about_email) TextView mEmailTV;
+
+    private static Resources mRes;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
-        res = getResources();
+        mRes = getResources();
 
         setupEmail();
         setupVersion();
         setupCopyright();
     }
 
     private void setupEmail() {
-        final String email = res.getString(R.string.email);
-        final String appName = res.getString(R.string.app_name);
+        final String email = mRes.getString(R.string.email);
+        final String appName = mRes.getString(R.string.app_name);
         final String href = "<a href=\"mailto:" + email + "?subject=" + appName + "\">" + email + "</a>";
-        emailTV.setText(Html.fromHtml(href));
-        emailTV.setMovementMethod(LinkMovementMethod.getInstance());
+        mEmailTV.setText(Html.fromHtml(href));
+        mEmailTV.setMovementMethod(LinkMovementMethod.getInstance());
     }
 
     private void setupVersion() {
         final String versionName = BuildConfig.VERSION_NAME;
-        final String versionText = String.format(res.getString(R.string.version), versionName);
-        version.setText(versionText);
+        final String versionText = String.format(mRes.getString(R.string.version), versionName);
+        mVersion.setText(versionText);
     }
 
     private void setupCopyright() {
         final int year = Calendar.getInstance().get(Calendar.YEAR);
-        final String copyrightText = String.format(res.getString(R.string.copyright), year);
-        copyright.setText(copyrightText);
+        final String copyrightText = String.format(mRes.getString(R.string.copyright), year);
+        mCopyright.setText(copyrightText);
     }
 
     @OnClick(R.id.about_license)
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/LicenseActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/LicenseActivity.java
@@ -1,14 +1,17 @@
-package com.simplemobiletools.notes;
+package com.simplemobiletools.notes.activities;
 
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
+import com.simplemobiletools.notes.R;
+
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class LicenseActivity extends AppCompatActivity {
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.notes;
+package com.simplemobiletools.notes.activities;
 
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
@@ -8,34 +8,37 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.simplemobiletools.notes.Constants;
+import com.simplemobiletools.notes.MyWidgetProvider;
+import com.simplemobiletools.notes.R;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class MainActivity extends AppCompatActivity {
-    private SharedPreferences prefs;
-    @BindView(R.id.notes_view) EditText notesView;
+    @BindView(R.id.notes_view) EditText mNotesView;
+
+    private SharedPreferences mPrefs;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         ButterKnife.bind(this);
 
-        prefs = getSharedPreferences(Constants.PREFS, Context.MODE_PRIVATE);
-        final String text = prefs.getString(Constants.TEXT, "");
-        notesView.setText(text);
+        mPrefs = getSharedPreferences(Constants.PREFS, Context.MODE_PRIVATE);
+        final String text = mPrefs.getString(Constants.TEXT, "");
+        mNotesView.setText(text);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu, menu);
+        getMenuInflater().inflate(R.menu.menu, menu);
         return true;
     }
 
@@ -55,8 +58,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void saveText() {
-        final String text = notesView.getText().toString().trim();
-        prefs.edit().putString(Constants.TEXT, text).apply();
+        final String text = mNotesView.getText().toString().trim();
+        mPrefs.edit().putString(Constants.TEXT, text).apply();
 
         Toast.makeText(this, getResources().getString(R.string.text_saved), Toast.LENGTH_SHORT).show();
         hideKeyboard();
@@ -65,7 +68,7 @@ private void saveText() {
 
     private void hideKeyboard() {
         final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(notesView.getWindowToken(), 0);
+        imm.hideSoftInputFromWindow(mNotesView.getWindowToken(), 0);
     }
 
     private void updateWidget() {
diff --git a/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java b/app/src/main/java/com/simplemobiletools/notes/activities/WidgetConfigureActivity.java
diff --git a/app/src/main/res/xml/widget_info.xml b/app/src/main/res/xml/widget_info.xml
