painful app package refactor

Author: basinilya

AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ru.piter.fm"
+          package="ru.piter.fm.prototype"
           android:versionCode="10"
           android:versionName="2.0.5">
 
@@ -15,20 +15,20 @@
     <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.VIBRATE"/>
 
-    <application android:icon="@drawable/icon" android:label="PITER FM" android:name=".App" android:theme="@style/PiterFM.Theme">
+    <application android:icon="@drawable/icon" android:label="PITER FM (testver)" android:name="ru.piter.fm.App" android:theme="@style/PiterFM.Theme">
 
-        <activity android:name=".activities.RadioActivity"
+        <activity android:name="ru.piter.fm.activities.RadioActivity"
                   android:configChanges="keyboardHidden|orientation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
-        <activity android:name=".activities.SettingsActivity"/>
-        <activity android:name=".activities.ChannelActivity"
+        <activity android:name="ru.piter.fm.activities.SettingsActivity"/>
+        <activity android:name="ru.piter.fm.activities.ChannelActivity"
                   android:windowSoftInputMode="stateHidden" android:configChanges="orientation|keyboardHidden"/>
-        <service android:name=".player.PlayerService" />
+        <service android:name="ru.piter.fm.player.PlayerService" />
 
     </application>
 

src/ru/piter/fm/App.java

@@ -15,10 +15,10 @@
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 
 import ru.piter.fm.player.PlayerInterface;
-import ru.piter.fm.R;
 import ru.piter.fm.player.PlayerService;
 import ru.piter.fm.radio.Channel;
-import ru.piter.fm.BuildConfig;
+import ru.piter.fm.prototype.BuildConfig;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.util.DBAdapter;
 import ru.piter.fm.util.GetAllStackTracesTimer;
 import ru.piter.fm.util.SelfLogcatSaver;

src/ru/piter/fm/activities/ChannelActivity.java

@@ -13,12 +13,11 @@
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.*;
-import android.view.MenuItem;
 import android.widget.*;
 import com.actionbarsherlock.app.*;
 import com.actionbarsherlock.app.ActionBar;
 import ru.piter.fm.App;
-import ru.piter.fm.R;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.radio.Channel;
 import ru.piter.fm.radio.Radio;
 import ru.piter.fm.radio.RadioFactory;

src/ru/piter/fm/activities/RadioActivity.java

@@ -24,10 +24,10 @@
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 import ru.piter.fm.App;
-import ru.piter.fm.R;
 import ru.piter.fm.fragments.RadioAdapter;
 import ru.piter.fm.fragments.RadioFragment;
 import ru.piter.fm.player.PlayerInterface;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.radio.RadioFactory;
 import ru.piter.fm.util.Notifications;
 import ru.piter.fm.util.Settings;

src/ru/piter/fm/activities/SettingsActivity.java

@@ -3,7 +3,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.*;
-import ru.piter.fm.R;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.util.Settings;
 import ru.piter.fm.util.Utils;
 

src/ru/piter/fm/fragments/RadioFragment.java

@@ -11,10 +11,10 @@
 import android.widget.*;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import ru.piter.fm.App;
-import ru.piter.fm.R;
 import ru.piter.fm.activities.ChannelActivity;
 import ru.piter.fm.activities.RadioActivity;
 import ru.piter.fm.player.PlayerInterface;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.radio.Channel;
 import ru.piter.fm.radio.Radio;
 import ru.piter.fm.radio.RadioFactory;

src/ru/piter/fm/tasks/BaseTask.java

@@ -7,8 +7,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
-import ru.piter.fm.R;
 import ru.piter.fm.activities.RadioActivity;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.util.Utils;
 
 /**

src/ru/piter/fm/util/Notifications.java

@@ -8,7 +8,7 @@
 import android.os.Build;
 import android.widget.RemoteViews;
 import ru.piter.fm.App;
-import ru.piter.fm.R;
+import ru.piter.fm.prototype.R;
 import ru.piter.fm.radio.Channel;
 import ru.piter.fm.radio.Radio;
 

tests/AndroidManifest.xml

@@ -8,7 +8,7 @@
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="ru.piter.fm" />
+        android:targetPackage="ru.piter.fm.prototype" />
 
     <application
         android:icon="@drawable/ic_launcher"