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

Rename restore message to remote_account

Browse Source
This commit is contained in:
Loic Blot 2015-05-23 18:12:09 +02:00
parent 1483b9d516
commit 0277d9eb65
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -107,7 +107,7 @@
android:label="@string/title_activity_login" > android:label="@string/title_activity_login" >
</activity> </activity>
<activity <activity
android:name=".activities.restore_sms.AccountListActivity" android:name="fr.unix_experience.owncloud_sms.activities.remote_account.AccountListActivity"
android:label="@string/title_activity_select_account" > android:label="@string/title_activity_select_account" >
</activity> </activity>
<activity <activity
@ -130,7 +130,7 @@
</activity> </activity>
--> -->
<activity <activity
android:name=".activities.restore_sms.ContactListActivity" android:name="fr.unix_experience.owncloud_sms.activities.remote_account.ContactListActivity"
android:label="@string/title_activity_select_contact" > android:label="@string/title_activity_select_contact" >
</activity> </activity>
</application> </application>

14
res/layout/fragment_mainactivity_gotosettings.xml
View File

@ -104,27 +104,27 @@
android:text="@string/ma_button_sync_accounts_now" /> android:text="@string/ma_button_sync_accounts_now" />
<TextView <TextView
android:id="@+id/tv_restoremsgs" android:id="@+id/tv_remoteaccount"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/main_tv_accounts" android:layout_alignLeft="@+id/main_tv_accounts"
android:layout_alignStart="@+id/main_tv_accounts" android:layout_alignStart="@+id/main_tv_accounts"
android:layout_below="@+id/main_button_sync" android:layout_below="@+id/main_button_sync"
android:layout_marginTop="18dp" android:layout_marginTop="18dp"
android:text="@string/ma_title_restore_messages" android:text="@string/ma_title_remote_account"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<Button <Button
android:id="@+id/main_button_restore_choose_account" android:id="@+id/main_button_choose_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/tv_restoremsgs" android:layout_below="@+id/tv_remoteaccount"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="19dp" android:layout_marginTop="19dp"
android:onClick="selectAccountForRestauration" android:onClick="selectRemoteAccount"
android:background="@drawable/standard_button" android:background="@drawable/standard_button"
style="@style/StandardButton" style="@style/StandardButton"
android:text="@string/ma_button_restore_messages" /> android:text="@string/choose_account" />
<ImageView <ImageView
android:id="@+id/imageView1" android:id="@+id/imageView1"
@ -132,7 +132,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textView1" android:layout_alignLeft="@+id/textView1"
android:layout_alignStart="@+id/textView1" android:layout_alignStart="@+id/textView1"
android:layout_below="@+id/main_button_restore_choose_account" android:layout_below="@+id/main_button_choose_account"
android:layout_marginTop="33dp" android:layout_marginTop="33dp"
android:src="@drawable/next_arrow" /> android:src="@drawable/next_arrow" />

4
res/values/strings.xml
View File

@ -137,8 +137,8 @@
Contributors and issue\'s reporters</string> Contributors and issue\'s reporters</string>
<string name="ma_title_sync_all">Synchronize all messages</string> <string name="ma_title_sync_all">Synchronize all messages</string>
<string name="ma_button_sync_accounts_now">Launch synchronization now</string> <string name="ma_button_sync_accounts_now">Launch synchronization now</string>
<string name="ma_title_restore_messages">Restore messages</string> <string name="ma_title_remote_account">Remote account</string>
<string name="ma_button_restore_messages">Choose account</string> <string name="choose_account">Choose account</string>
<!-- Restauration --> <!-- Restauration -->
<string name="title_activity_select_account">Select account</string> <string name="title_activity_select_account">Select account</string>

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

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

2
src/fr/unix_experience/owncloud_sms/activities/restore_sms/AccountListActivity.java → src/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
View File

@ -1,4 +1,4 @@
package fr.unix_experience.owncloud_sms.activities.restore_sms; package fr.unix_experience.owncloud_sms.activities.remote_account;
import java.util.ArrayList; import java.util.ArrayList;

2
src/fr/unix_experience/owncloud_sms/activities/restore_sms/ContactListActivity.java → src/fr/unix_experience/owncloud_sms/activities/remote_account/ContactListActivity.java
View File

@ -1,4 +1,4 @@
package fr.unix_experience.owncloud_sms.activities.restore_sms; package fr.unix_experience.owncloud_sms.activities.remote_account;
import android.accounts.Account; import android.accounts.Account;
import android.accounts.AccountManager; import android.accounts.AccountManager;