flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2026-08-21 21:32:58 +00:00
Code Issues Releases Wiki Activity

Add a more stylized button for creating account

Browse Source
This commit is contained in:
Loic Blot
2016-01-31 01:05:25 +01:00
parent 7e87253d5f
commit b98758cff3
5 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/unix_experience/owncloud_sms/activities/LoginActivity.java
+15 -5
View File
@@ -35,11 +35,11 @@ import android.view.KeyEvent;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.inputmethod.EditorInfo;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
import com.dd.processbutton.iml.ActionProcessButton;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
@@ -64,6 +64,7 @@ public class LoginActivity extends Activity {
private EditText _loginView;
private EditText _passwordView;
private EditText _serverView;
private ActionProcessButton _signInButton;
private View mProgressView;
private View mLoginFormView;
@@ -91,7 +92,7 @@ public class LoginActivity extends Activity {
}
});
Button _signInButton = (Button) findViewById(R.id.oc_signin_button);
_signInButton = (ActionProcessButton) findViewById(R.id.oc_signin_button);
_signInButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View view) {
@@ -161,12 +162,15 @@ public class LoginActivity extends Activity {
if (cancel) {
// There was an error; don't attempt login and focus the first
// form field with an error.
// reset the button progress
_signInButton.setProgress(0);
if (focusView != null) {
focusView.requestFocus();
}
} else {
// Show a progress spinner, and kick off a background task to
// perform the user login attempt.
_signInButton.setProgress(25);
showProgress(true);
String serverURL = protocol + serverAddr;
mAuthTask = new UserLoginTask(serverURL, login, password);
@@ -259,8 +263,10 @@ public class LoginActivity extends Activity {
protected void onPostExecute(Boolean success) {
mAuthTask = null;
showProgress(false);
_signInButton.setProgress(90);
if (success) {
_signInButton.setProgress(100);
String accountType = getIntent().getStringExtra(UserLoginTask.PARAM_AUTHTOKEN_TYPE);
if (accountType == null) {
accountType = getString(R.string.account_type);
@@ -314,13 +320,17 @@ public class LoginActivity extends Activity {
_passwordView.requestFocus();
break;
case UNKNOWN_ERROR:
_serverView.setError("UNK");
_serverView.requestFocus();
_serverView.setError("UNK");
_serverView.requestFocus();
break;
default:
break;
}
// If not ok, reset the progress
if (_returnCode != LoginReturnCode.OK) {
_signInButton.setProgress(0);
}
}
}
src/main/java/fr/unix_experience/owncloud_sms/activities/remote_account/AccountListActivity.java
+3 -2
View File
@@ -6,6 +6,7 @@ import android.app.ListActivity;
import android.os.Bundle;
import java.util.ArrayList;
import java.util.Collections;
import fr.nrz.androidlib.adapters.AndroidAccountAdapter;
import fr.unix_experience.owncloud_sms.R;
@@ -21,7 +22,7 @@ public class AccountListActivity extends ListActivity {
AccountManager _accountMgr = AccountManager.get(getBaseContext());
setContentView(R.layout.restore_activity_accountlist);
/*
adapter = new AndroidAccountAdapter(this,
android.R.layout.simple_list_item_1,
listItems,
@@ -34,7 +35,7 @@ public class AccountListActivity extends ListActivity {
Collections.addAll(listItems, accountList);
adapter.notifyDataSetChanged();
*/
}
}