diff options
author | Artur Dryomov <artur.dryomov@gmail.com> | 2013-07-17 03:27:57 +0300 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-25 18:01:57 +0100 |
commit | 927711bf0fff6c3bda4c68c508a8a7fd022c0fbc (patch) | |
tree | bdfba3e40e86701ad52dd884b9537cd615f50106 /android/sdremote | |
parent | cc20292c4d1074a02c740c8411d94cd97c9e2bb6 (diff) |
Change the source code structure a bit.
* Follow usual Android project structure.
* Make the structure more clean.
Change-Id: Ia5b115fe2b8a6417e6d9cfaae46c859c9e4c3c1a
Diffstat (limited to 'android/sdremote')
21 files changed, 61 insertions, 29 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 4a6a1d1e0034..73f3c2319232 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -20,7 +20,7 @@ android:theme="@style/Theme.ImpressRemote"> <activity - android:name=".ComputersActivity" + android:name=".activity.ComputersActivity" android:label="@string/title_computers" android:theme="@style/Theme.ImpressRemote.Computers"> @@ -32,23 +32,23 @@ </activity> <activity - android:name=".ComputerConnectionActivity" + android:name=".activity.ComputerConnectionActivity" android:label="@string/title_connection"> </activity> <activity - android:name=".ComputerCreationActivity" + android:name=".activity.ComputerCreationActivity" android:label="@string/title_creation" android:theme="@style/Theme.ImpressRemote.ComputerCreation"> </activity> <activity - android:name=".SlideShowActivity" + android:name=".activity.SlideShowActivity" android:label="@string/title_slide_show"> </activity> <activity - android:name=".LicensesActivity" + android:name=".activity.LicensesActivity" android:label="@string/title_licenses"> </activity> diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java index 488e206a30c5..279eaae89d63 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java @@ -6,13 +6,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.activity; import android.os.Bundle; import android.support.v4.app.FragmentTransaction; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; +import org.libreoffice.impressremote.fragment.ComputerConnectionFragment; +import org.libreoffice.impressremote.util.Intents; import org.libreoffice.impressremote.communication.Server; public class ComputerConnectionActivity extends SherlockFragmentActivity { @@ -32,7 +34,8 @@ public class ComputerConnectionActivity extends SherlockFragmentActivity { private void setUpComputerConnectionFragment(Server aComputer) { FragmentTransaction aTransaction = getSupportFragmentManager().beginTransaction(); - aTransaction.replace(android.R.id.content, ComputerConnectionFragment.newInstance(aComputer)); + aTransaction.replace(android.R.id.content, ComputerConnectionFragment + .newInstance(aComputer)); aTransaction.commit(); } diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java index 605838eb7371..76f33c6e4ccb 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputerCreationActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.activity; import android.app.Activity; import android.content.Context; @@ -21,6 +21,8 @@ import android.widget.EditText; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; +import org.libreoffice.impressremote.util.Intents; +import org.libreoffice.impressremote.R; public class ComputerCreationActivity extends SherlockFragmentActivity implements View.OnClickListener { @Override @@ -118,7 +120,8 @@ public class ComputerCreationActivity extends SherlockFragmentActivity implement } private void finish(String aIpAddress, String aName) { - Intent aIntent = Intents.buildComputerCreationResultIntent(aIpAddress, aName); + Intent aIntent = Intents + .buildComputerCreationResultIntent(aIpAddress, aName); setResult(Activity.RESULT_OK, aIntent); finish(); diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java index c337c9410b8c..14ace705a644 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputersActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.activity; import android.content.Intent; import android.os.Bundle; @@ -16,6 +16,10 @@ import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; +import org.libreoffice.impressremote.util.ActionBarTabListener; +import org.libreoffice.impressremote.fragment.ComputersFragment; +import org.libreoffice.impressremote.util.Intents; +import org.libreoffice.impressremote.R; public class ComputersActivity extends SherlockFragmentActivity { @Override diff --git a/android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java index f9805aa72c51..5b74de37091e 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/LicensesActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/LicensesActivity.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.activity; import android.content.ContentResolver; import android.os.Bundle; @@ -14,6 +14,7 @@ import android.webkit.WebView; import com.actionbarsherlock.app.SherlockActivity; import com.actionbarsherlock.view.MenuItem; +import org.libreoffice.impressremote.R; public class LicensesActivity extends SherlockActivity { private static final String SCHEME = ContentResolver.SCHEME_FILE; diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java index 77cf70325a36..a1c371b5b19a 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/SlideShowActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java @@ -1,4 +1,4 @@ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.activity; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -7,6 +7,9 @@ import android.support.v4.app.FragmentTransaction; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; +import org.libreoffice.impressremote.R; +import org.libreoffice.impressremote.fragment.SlidesGridFragment; +import org.libreoffice.impressremote.fragment.SlidesPagerFragment; public class SlideShowActivity extends SherlockFragmentActivity { private static enum Mode { diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersAdapter.java index f3080f1c9f43..ea9010af7f09 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputersAdapter.java +++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersAdapter.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.adapter; import java.util.List; @@ -17,6 +17,7 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import android.widget.TextView; +import org.libreoffice.impressremote.R; import org.libreoffice.impressremote.communication.Server; public class ComputersAdapter extends ArrayAdapter<Server> { diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java index 3ccfb51007d6..45ccb55067a7 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridAdapter.java +++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -16,6 +16,7 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; +import org.libreoffice.impressremote.R; import org.libreoffice.impressremote.communication.SlideShow; public class SlidesGridAdapter extends BaseAdapter { @@ -56,7 +57,8 @@ public class SlidesGridAdapter extends BaseAdapter { if (isSlidePreviewAvailable(aPosition)) { aSlideViewHolder.aSlidePreview.setImageBitmap(mSlideShow.getSlidePreview(aPosition)); } else { - aSlideViewHolder.aSlidePreview.setImageResource(R.drawable.slide_unknown); + aSlideViewHolder.aSlidePreview.setImageResource( + R.drawable.slide_unknown); } aSlideViewHolder.aSlideIndex.setText(buildSlideIndex(aPosition)); diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java index bb7065f57ef4..658e4faa7cda 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerAdapter.java +++ b/android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java @@ -1,4 +1,4 @@ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.adapter; import android.content.Context; import android.support.v4.view.PagerAdapter; @@ -7,6 +7,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import org.libreoffice.impressremote.R; import org.libreoffice.impressremote.communication.SlideShow; public class SlidesPagerAdapter extends PagerAdapter { diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java index 7828197c127f..a95573b1422d 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java @@ -22,7 +22,7 @@ import android.content.IntentFilter; import android.os.Handler; import android.support.v4.content.LocalBroadcastManager; -import org.libreoffice.impressremote.Intents; +import org.libreoffice.impressremote.util.Intents; import org.libreoffice.impressremote.communication.Server.Protocol; public class BluetoothServersFinder extends BroadcastReceiver implements ServersFinder, Runnable { diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java index 3bb00c54e23c..3e92091f75c2 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java @@ -17,7 +17,7 @@ import android.os.Binder; import android.os.IBinder; import android.support.v4.content.LocalBroadcastManager; -import org.libreoffice.impressremote.Intents; +import org.libreoffice.impressremote.util.Intents; public class CommunicationService extends Service implements Runnable, MessagesListener { public static enum State { diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java index e6550fbea539..9ab66465f15a 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java @@ -4,7 +4,7 @@ import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.os.Build; -import org.libreoffice.impressremote.Preferences; +import org.libreoffice.impressremote.util.Preferences; public final class PairingProvider { private Context mContext; diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java index d9363d53944b..7f209432cd65 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/ServersManager.java @@ -17,7 +17,7 @@ import java.util.Set; import android.content.Context; -import org.libreoffice.impressremote.Preferences; +import org.libreoffice.impressremote.util.Preferences; public class ServersManager { private final Context mContext; diff --git a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java index ef8f6079dedf..ac0b9f10d345 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java +++ b/android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java @@ -29,7 +29,7 @@ import android.content.Intent; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; -import org.libreoffice.impressremote.Intents; +import org.libreoffice.impressremote.util.Intents; public class TcpServersFinder implements ServersFinder, Runnable { private static final int SEARCH_DELAY_IN_SECONDS = 10; diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java index a9a52a1ab5d4..0f1c89ebde5a 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputerConnectionFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.fragment; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -29,6 +29,8 @@ import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; +import org.libreoffice.impressremote.util.Intents; +import org.libreoffice.impressremote.R; import org.libreoffice.impressremote.communication.CommunicationService; import org.libreoffice.impressremote.communication.Server; diff --git a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java index 20a289a50a55..084e27c96178 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ComputersFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.fragment; import java.util.ArrayList; import java.util.List; @@ -27,8 +27,10 @@ import android.widget.AdapterView; import android.widget.ListView; import com.actionbarsherlock.app.SherlockListFragment; -import com.actionbarsherlock.internal.view.menu.ActionMenu; import com.actionbarsherlock.view.MenuItem; +import org.libreoffice.impressremote.adapter.ComputersAdapter; +import org.libreoffice.impressremote.util.Intents; +import org.libreoffice.impressremote.R; import org.libreoffice.impressremote.communication.CommunicationService; import org.libreoffice.impressremote.communication.Server; diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java index b16b5091a812..6c0fe8795979 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/SlidesGridFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.fragment; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -24,6 +24,9 @@ import android.widget.AdapterView; import android.widget.GridView; import com.actionbarsherlock.app.SherlockFragment; +import org.libreoffice.impressremote.util.Intents; +import org.libreoffice.impressremote.R; +import org.libreoffice.impressremote.adapter.SlidesGridAdapter; import org.libreoffice.impressremote.communication.CommunicationService; public class SlidesGridFragment extends SherlockFragment implements ServiceConnection, AdapterView.OnItemClickListener { diff --git a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java index fd1ea3c4c2ae..c3ebb2c9e6ab 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/SlidesPagerFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.fragment; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -24,6 +24,9 @@ import android.view.View; import android.view.ViewGroup; import com.actionbarsherlock.app.SherlockFragment; +import org.libreoffice.impressremote.util.Intents; +import org.libreoffice.impressremote.R; +import org.libreoffice.impressremote.adapter.SlidesPagerAdapter; import org.libreoffice.impressremote.communication.CommunicationService; public class SlidesPagerFragment extends SherlockFragment implements ServiceConnection, ViewPager.OnPageChangeListener { diff --git a/android/sdremote/src/org/libreoffice/impressremote/ActionBarTabListener.java b/android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java index 66e15b9c1d99..e21911adaee2 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/ActionBarTabListener.java +++ b/android/sdremote/src/org/libreoffice/impressremote/util/ActionBarTabListener.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.util; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; diff --git a/android/sdremote/src/org/libreoffice/impressremote/Intents.java b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java index e517c2dd634a..e83496837b3f 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/Intents.java +++ b/android/sdremote/src/org/libreoffice/impressremote/util/Intents.java @@ -6,11 +6,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.util; import android.content.Context; import android.content.Intent; +import org.libreoffice.impressremote.activity.ComputerConnectionActivity; +import org.libreoffice.impressremote.activity.ComputerCreationActivity; +import org.libreoffice.impressremote.activity.LicensesActivity; +import org.libreoffice.impressremote.activity.SlideShowActivity; import org.libreoffice.impressremote.communication.Server; public final class Intents { diff --git a/android/sdremote/src/org/libreoffice/impressremote/Preferences.java b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java index 937d706e935f..b23e3b67be7f 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/Preferences.java +++ b/android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java @@ -6,7 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.libreoffice.impressremote; +package org.libreoffice.impressremote.util; import java.util.Map; |