flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-24 00:06:22 +00:00
Code Issues Releases Wiki Activity

Better place for restore activities is a package

Browse Source
This commit is contained in:
Loic Blot 2015-05-15 10:06:28 +02:00
parent 1606568e79
commit a8b3eed9c8
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AndroidManifest.xml
View File

@ -107,7 +107,7 @@
android:label="@string/title_activity_login" >
</activity>
<activity
android:name=".activities.RestoreSMS_AccountListActivity"
android:name=".activities.restore_sms.AccountListActivity"
android:label="@string/title_activity_select_account" >
</activity>
<activity
@ -130,8 +130,8 @@
</activity>
-->
<activity
android:name=".activities.RestoreSMS_ContactListActivity"
android:label="@string/title_activity_restore_sms__contact_list" >
android:name=".activities.restore_sms.ContactListActivity"
android:label="@string/title_activity_select_contact" >
</activity>
</application>

5
res/values/strings.xml
View File

@ -142,6 +142,7 @@ Contributors and issue\'s reporters</string>
<!-- Restauration -->
<string name="title_activity_select_account">Select account</string>
<string name="title_activity_select_contact">Select contact</string>
<!-- Notifications -->
<string name="sync_title">Sync process</string>
@ -169,8 +170,4 @@ Contributors and issue\'s reporters</string>
<string name="title_section1">Section 1</string>
<string name="title_section2">Section 2</string>
<string name="title_section3">Section 3</string>
<string name="title_activity_main_activity2">MainActivity2</string>
<string name="title_activity_restore_sms__contact_list">RestoreSMS_ContactListActivity</string>
<string name="hello_world">Hello world!</string>
</resources>

3
src/fr/unix_experience/owncloud_sms/activities/MainActivity.java
View File

@ -46,6 +46,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Toast;
import fr.unix_experience.owncloud_sms.R;
import fr.unix_experience.owncloud_sms.activities.restore_sms.AccountListActivity;
import fr.unix_experience.owncloud_sms.engine.ASyncTask.SyncTask;
import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor;
import fr.unix_experience.owncloud_sms.engine.SmsFetcher;
@ -182,7 +183,7 @@ public class MainActivity extends Activity {
}
public void selectAccountForRestauration(final View view) {
startActivity(new Intent(this, RestoreSMS_AccountListActivity.class));
startActivity(new Intent(this, AccountListActivity.class));
}
public void openGooglePlayStore(final View view) {

6
src/fr/unix_experience/owncloud_sms/activities/RestoreSMS_AccountListActivity.java → src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java
View File

@ -1,4 +1,4 @@
package fr.unix_experience.owncloud_sms.activities;
package fr.unix_experience.owncloud_sms.activities.restore_sms;
import java.util.ArrayList;
@ -9,7 +9,7 @@ import android.os.Bundle;
import fr.nrz.androidlib.adapters.AndroidAccountAdapter;
import fr.unix_experience.owncloud_sms.R;
public class RestoreSMS_AccountListActivity extends ListActivity {
public class AccountListActivity extends ListActivity {
ArrayList<Account> listItems = new ArrayList<Account>();
AndroidAccountAdapter adapter;
@ -28,7 +28,7 @@ public class RestoreSMS_AccountListActivity extends ListActivity {
android.R.layout.simple_list_item_1,
listItems,
R.layout.account_list_item,
R.id.accountname, RestoreSMS_ContactListActivity.class);
R.id.accountname, ContactListActivity.class);
setListAdapter(adapter);
final Account[] myAccountList = _accountMgr.getAccountsByType(_accountType);

4
src/fr/unix_experience/owncloud_sms/activities/RestoreSMS_ContactListActivity.java → src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java
View File

@ -1,9 +1,9 @@
package fr.unix_experience.owncloud_sms.activities;
package fr.unix_experience.owncloud_sms.activities.restore_sms;
import android.app.ListActivity;
import android.os.Bundle;
public class RestoreSMS_ContactListActivity extends ListActivity {
public class ContactListActivity extends ListActivity {
@Override
protected void onCreate(final Bundle savedInstanceState) {