Change package name to org.developfreedom.logmein

DevelopFreedom · Oct 11, 2014 · 667c731 · 667c731
1 parent 97c596a
commit 667c731
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 58 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "20.0.0"
 
     defaultConfig {
-        applicationId "com.developfreedom.logmein"
+        applicationId "org.developfreedom.logmein"
         minSdkVersion 9
         targetSdkVersion 19
         versionCode 59

diff --git a/...velopfreedom/logmein/ApplicationTest.java → ...velopfreedom/logmein/ApplicationTest.java b/...velopfreedom/logmein/ApplicationTest.java → ...velopfreedom/logmein/ApplicationTest.java
@@ -1,4 +1,4 @@
-package com.developfreedom.logmein;
+package org.developfreedom.logmein;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.developfreedom.logmein"
+    package="org.developfreedom.logmein"
     android:installLocation="auto"
     android:versionCode="59"
     android:versionName="0.5.9" >
@@ -17,7 +17,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".ui.MainActivity"
+            android:name="org.developfreedom.logmein.ui.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -27,13 +27,13 @@
         </activity>
 
         <service
-            android:name=".LoginService"
+            android:name="org.developfreedom.logmein.LoginService"
             android:enabled="true"
             android:exported="true" >
         </service>
 
         <activity
-            android:name=".ui.SettingsActivity"
+            android:name="org.developfreedom.logmein.ui.SettingsActivity"
             android:label="@string/title_activity_settings" >
         </activity>
     </application>

diff --git a/...evelopfreedom/logmein/DatabaseEngine.java → ...evelopfreedom/logmein/DatabaseEngine.java b/...evelopfreedom/logmein/DatabaseEngine.java → ...evelopfreedom/logmein/DatabaseEngine.java
@@ -21,7 +21,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein;
+package org.developfreedom.logmein;
 
 import android.content.ContentValues;
 import android.content.Context;

diff --git a/...opfreedom/logmein/DatabaseOpenHelper.java → ...opfreedom/logmein/DatabaseOpenHelper.java b/...opfreedom/logmein/DatabaseOpenHelper.java → ...opfreedom/logmein/DatabaseOpenHelper.java
@@ -21,7 +21,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein;
+package org.developfreedom.logmein;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;

diff --git a/.../developfreedom/logmein/LoginService.java → .../developfreedom/logmein/LoginService.java b/.../developfreedom/logmein/LoginService.java → .../developfreedom/logmein/LoginService.java
@@ -18,7 +18,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.developfreedom.logmein;
+package org.developfreedom.logmein;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -31,8 +31,8 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.developfreedom.logmein.ui.MainActivity;
-import com.developfreedom.logmein.ui.SettingsActivity;
+import org.developfreedom.logmein.ui.MainActivity;
+import org.developfreedom.logmein.ui.SettingsActivity;
 
 public class LoginService extends Service {
 

diff --git a/...developfreedom/logmein/NetworkEngine.java → ...developfreedom/logmein/NetworkEngine.java b/...developfreedom/logmein/NetworkEngine.java → ...developfreedom/logmein/NetworkEngine.java
@@ -19,7 +19,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein;
+package org.developfreedom.logmein;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -35,7 +35,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import com.developfreedom.logmein.ui.SettingsActivity;
+import org.developfreedom.logmein.ui.SettingsActivity;
 
 public class NetworkEngine {
 

diff --git a/...developfreedom/logmein/UserStructure.java → ...developfreedom/logmein/UserStructure.java b/...developfreedom/logmein/UserStructure.java → ...developfreedom/logmein/UserStructure.java
@@ -20,7 +20,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein;
+package org.developfreedom.logmein;
 
 import java.io.Serializable;
 

diff --git a/...evelopfreedom/logmein/ui/DialogAlert.java → ...evelopfreedom/logmein/ui/DialogAlert.java b/...evelopfreedom/logmein/ui/DialogAlert.java → ...evelopfreedom/logmein/ui/DialogAlert.java
@@ -18,7 +18,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein.ui;
+package org.developfreedom.logmein.ui;
 
 
 import android.app.Activity;
@@ -34,7 +34,7 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 
-import com.developfreedom.logmein.R;
+import org.developfreedom.logmein.R;
 
 /**
  * Created by tanjot on 19/9/14.

diff --git a/...velopfreedom/logmein/ui/MainActivity.java → ...velopfreedom/logmein/ui/MainActivity.java b/...velopfreedom/logmein/ui/MainActivity.java → ...velopfreedom/logmein/ui/MainActivity.java
@@ -20,7 +20,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein.ui;
+package org.developfreedom.logmein.ui;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -46,10 +46,9 @@
 import android.widget.Spinner;
 import android.widget.Toast;
 
-import com.developfreedom.logmein.DatabaseEngine;
-import com.developfreedom.logmein.LoginService;
-import com.developfreedom.logmein.NetworkEngine;
-import com.developfreedom.logmein.R;
+import org.developfreedom.logmein.DatabaseEngine;
+import org.developfreedom.logmein.LoginService;
+import org.developfreedom.logmein.NetworkEngine;
 
 import java.util.ArrayList;
 
@@ -85,30 +84,30 @@ protected void onResume() {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(org.developfreedom.logmein.R.layout.activity_main);
 
         networkEngine = NetworkEngine.getInstance(this);
         databaseEngine = DatabaseEngine.getInstance(this);
 
         preferences = PreferenceManager.getDefaultSharedPreferences(this.getApplicationContext());
 
-        button_login = (ImageButton) findViewById(R.id.button_login);
+        button_login = (ImageButton) findViewById(org.developfreedom.logmein.R.id.button_login);
         button_login.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 login();
             }
         });
 
-        button_logout = (ImageButton) findViewById(R.id.button_logout);
+        button_logout = (ImageButton) findViewById(org.developfreedom.logmein.R.id.button_logout);
         button_logout.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 logout();
             }
         });
 
-        button_web = (ImageButton) findViewById(R.id.button_web);
+        button_web = (ImageButton) findViewById(org.developfreedom.logmein.R.id.button_web);
 
-        button_del = (Button ) findViewById(R.id.button_del);
+        button_del = (Button ) findViewById(org.developfreedom.logmein.R.id.button_del);
         button_del.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if(getSelectedUsername() == null){
@@ -123,7 +122,7 @@ public void onClick(View v) {
             }
         });
 
-        button_add = (Button) findViewById(R.id.button_add);
+        button_add = (Button) findViewById(org.developfreedom.logmein.R.id.button_add);
         button_add.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -133,7 +132,7 @@ public void onClick(View view) {
             }
         });
 
-        button_edit = (Button ) findViewById(R.id.button_edit);
+        button_edit = (Button ) findViewById(org.developfreedom.logmein.R.id.button_edit);
         button_edit.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if(getSelectedUsername() == null){
@@ -150,9 +149,9 @@ public void onClick(View v) {
 
 
         user_list = databaseEngine.userList();
-        adapter = new ArrayAdapter<String>(this, R.layout.spinner_layout, user_list);
+        adapter = new ArrayAdapter<String>(this, org.developfreedom.logmein.R.layout.spinner_layout, user_list);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
-        spinner_user_list = (Spinner) findViewById(R.id.spinner_user_list);
+        spinner_user_list = (Spinner) findViewById(org.developfreedom.logmein.R.id.spinner_user_list);
         spinner_user_list.setAdapter(adapter);
         adapter.notifyDataSetChanged();
         spinnerUpdateFlag = false;
@@ -182,7 +181,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
 
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction()
-                    .add(R.id.container, new PlaceholderFragment()).commit();
+                    .add(org.developfreedom.logmein.R.id.container, new PlaceholderFragment()).commit();
         }
         updateHomescreenData();
 
@@ -211,26 +210,26 @@ public void onNothingSelected(AdapterView<?> adapterView) {
     }//end onCreate
 
     private void startAnimation() {
-        ImageView centerWheel = (ImageView)findViewById(R.id.center_wheel);
-        View infoView = findViewById(R.id.info);
-        Animation rotation = AnimationUtils.loadAnimation(this,R.anim.rotation_start);
+        ImageView centerWheel = (ImageView)findViewById(org.developfreedom.logmein.R.id.center_wheel);
+        View infoView = findViewById(org.developfreedom.logmein.R.id.info);
+        Animation rotation = AnimationUtils.loadAnimation(this, org.developfreedom.logmein.R.anim.rotation_start);
         centerWheel.startAnimation(rotation);
 
 
-        Animation slideLeft = AnimationUtils.loadAnimation(this,R.anim.slide_in_left);
+        Animation slideLeft = AnimationUtils.loadAnimation(this, org.developfreedom.logmein.R.anim.slide_in_left);
         button_logout.startAnimation(slideLeft);
 
 
-        Animation slideRight = AnimationUtils.loadAnimation(this,R.anim.slide_in_right);
+        Animation slideRight = AnimationUtils.loadAnimation(this, org.developfreedom.logmein.R.anim.slide_in_right);
         button_web.startAnimation(slideRight);
 
 
-        Animation slideTop = AnimationUtils.loadAnimation(this,R.anim.slide_in_top);
+        Animation slideTop = AnimationUtils.loadAnimation(this, org.developfreedom.logmein.R.anim.slide_in_top);
         infoView.startAnimation(slideTop);
         button_login.startAnimation(slideTop);
 
 
-        Animation slideBottom = AnimationUtils.loadAnimation(this,R.anim.slide_in_bottom);
+        Animation slideBottom = AnimationUtils.loadAnimation(this, org.developfreedom.logmein.R.anim.slide_in_bottom);
 
 
 
@@ -256,7 +255,7 @@ public void updateHomescreenData() {
                     pos = user_list.size() - 1;
 
                 user_list = databaseEngine.userList();
-                adapter = new ArrayAdapter<String>(this, R.layout.spinner_layout, user_list);
+                adapter = new ArrayAdapter<String>(this, org.developfreedom.logmein.R.layout.spinner_layout, user_list);
                 adapter.setDropDownViewResource(android.R.layout.simple_spinner_item);
                 spinner_user_list.setAdapter(adapter);
                 spinnerUpdateFlag = true;
@@ -299,7 +298,7 @@ public String getSelectedUsername() {
     public boolean onCreateOptionsMenu(Menu menu) {
 
         // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main, menu);
+        getMenuInflater().inflate(org.developfreedom.logmein.R.menu.main, menu);
         return true;
     }
 
@@ -309,7 +308,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
         int id = item.getItemId();
-        if (id == R.id.action_settings) {
+        if (id == org.developfreedom.logmein.R.id.action_settings) {
             //TODO: Calling manage_user until we have some settings
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);

diff --git a/...eedom/logmein/ui/ManagerUserServices.java → ...eedom/logmein/ui/ManagerUserServices.java b/...eedom/logmein/ui/ManagerUserServices.java → ...eedom/logmein/ui/ManagerUserServices.java
@@ -18,7 +18,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein.ui;
+package org.developfreedom.logmein.ui;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -34,9 +34,9 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import com.developfreedom.logmein.DatabaseEngine;
-import com.developfreedom.logmein.R;
-import com.developfreedom.logmein.UserStructure;
+import org.developfreedom.logmein.DatabaseEngine;
+import org.developfreedom.logmein.R;
+import org.developfreedom.logmein.UserStructure;
 
 /**
  * Created by tanjot on 4/10/14.

diff --git a/...pfreedom/logmein/ui/SettingsActivity.java → ...pfreedom/logmein/ui/SettingsActivity.java b/...pfreedom/logmein/ui/SettingsActivity.java → ...pfreedom/logmein/ui/SettingsActivity.java
@@ -17,7 +17,7 @@
  *   along with LogMeIn.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.developfreedom.logmein.ui;
+package org.developfreedom.logmein.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -28,8 +28,6 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 
-import com.developfreedom.logmein.R;
-
 import java.util.List;
 
 /**
@@ -81,13 +79,13 @@ private void setupSimplePreferencesScreen() {
         // use the older PreferenceActivity APIs.
 
         // Add 'general' preferences.
-        addPreferencesFromResource(R.xml.pref_general);
+        addPreferencesFromResource(org.developfreedom.logmein.R.xml.pref_general);
 
         // Add 'notifications' preferences, and a corresponding header.
         PreferenceCategory fakeHeader = new PreferenceCategory(this);
-        fakeHeader.setTitle(R.string.pref_header_notifications);
+        fakeHeader.setTitle(org.developfreedom.logmein.R.string.pref_header_notifications);
         getPreferenceScreen().addPreference(fakeHeader);
-        addPreferencesFromResource(R.xml.pref_notification);
+        addPreferencesFromResource(org.developfreedom.logmein.R.xml.pref_notification);
 
     }
 
@@ -123,7 +121,7 @@ private static boolean isSimplePreferences(Context context) {
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public void onBuildHeaders(List<Header> target) {
         if (!isSimplePreferences(this)) {
-            loadHeadersFromResource(R.xml.pref_headers, target);
+            loadHeadersFromResource(org.developfreedom.logmein.R.xml.pref_headers, target);
         }
     }
 
@@ -136,7 +134,7 @@ public static class GeneralPreferenceFragment extends PreferenceFragment {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_general);
+            addPreferencesFromResource(org.developfreedom.logmein.R.xml.pref_general);
         }
     }
 
@@ -149,7 +147,7 @@ public static class NotificationPreferenceFragment extends PreferenceFragment {
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            addPreferencesFromResource(R.xml.pref_notification);
+            addPreferencesFromResource(org.developfreedom.logmein.R.xml.pref_notification);
         }
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/dark_grey"
-    tools:context="com.developfreedom.logmein.ui.MainActivity"
+    tools:context="org.developfreedom.logmein.ui.MainActivity"
     tools:ignore="MergeRootFrame">
 
     <LinearLayout

diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.developfreedom.logmein.ui.MainActivity">
+    tools:context="org.developfreedom.logmein.ui.MainActivity">
 
     <item
         android:id="@+id/action_settings"