Skip to content

Commit 3ddee35

Browse files
qiujuerqiujuer
committed
Merge pull request #2 from PowerBack/dev
Dev to Master
2 parents 9e3a2b0 + b8526d4 commit 3ddee35

99 files changed

Lines changed: 3338 additions & 314 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Built application files
2-
*.apk
32
*.ap_
43

54
# Files for the Dalvik VM

‎AnKey/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ dependencies {
2424
compile fileTree(include: ['*.jar'], dir: 'libs')
2525
testCompile 'junit:junit:4.12'
2626
compile 'com.android.support:appcompat-v7:23.1.0'
27-
compile 'com.android.support:recyclerview-v7:23.1.0'
27+
compile 'com.android.support:cardview-v7:23.1.0'
2828
compile project(':presenter')
2929
}

‎AnKey/app/keystore.jks‎

2.19 KB
Binary file not shown.

‎AnKey/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
<activity
2727
android:name=".ui.activity.CreateActivity"
2828
android:label="@string/activity_title_create"
29-
android:screenOrientation="portrait" />
29+
android:screenOrientation="portrait"
30+
android:windowSoftInputMode="stateHidden|adjustPan" />
3031
<activity
3132
android:name=".ui.activity.EditActivity"
3233
android:label="@string/activity_title_edit"

‎AnKey/app/src/main/java/net/qiujuer/powerback/ankey/ui/activity/CreateActivity.java‎

Lines changed: 76 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
package net.qiujuer.powerback.ankey.ui.activity;
22

3+
import android.graphics.drawable.Drawable;
34
import android.os.Bundle;
5+
import android.view.View;
46

57
import net.qiujuer.genius.ui.widget.EditText;
8+
import net.qiujuer.genius.ui.widget.FloatActionButton;
69
import net.qiujuer.powerback.ankey.R;
710
import net.qiujuer.powerback.ankey.presenter.CreatePresenter;
811
import net.qiujuer.powerback.ankey.presenter.view.CreateView;
912
import net.qiujuer.powerback.ankey.ui.SuperBackActivity;
13+
import net.qiujuer.powerback.ankey.widget.drawable.Drawables;
1014

11-
public class CreateActivity extends SuperBackActivity implements CreateView {
12-
15+
public class CreateActivity extends SuperBackActivity implements CreateView, View.OnClickListener {
1316
private CreatePresenter mPresenter;
1417

1518
@Override
@@ -19,48 +22,107 @@ protected void onCreate(Bundle savedInstanceState) {
1922
setStatusBarColorRes(R.color.colorAccent);
2023
setTitleBackgroundColorRes(R.color.colorAccent);
2124

25+
initFloatActionButton();
26+
27+
initPresenter();
28+
}
29+
30+
protected void initPresenter() {
2231
mPresenter = new CreatePresenter(this);
2332
}
2433

34+
private void initFloatActionButton() {
35+
FloatActionButton actionButton = (FloatActionButton) findViewById(R.id.action_submit);
36+
Drawable drawable = Drawables.getOkDrawable(getResources());
37+
actionButton.setImageDrawable(drawable);
38+
actionButton.setOnClickListener(this);
39+
}
40+
41+
private String getEnterText(int id) {
42+
EditText text = ((EditText) findViewById(id));
43+
if (text != null)
44+
return text.getText().toString();
45+
else
46+
return null;
47+
}
48+
2549
@Override
2650
public String getDescription() {
27-
return getDate(R.id.edit_description);
51+
return getEnterText(R.id.edit_description);
2852
}
2953

3054
@Override
3155
public String getUsername() {
32-
return getDate(R.id.edit_username);
56+
return getEnterText(R.id.edit_username);
3357
}
3458

3559
@Override
3660
public String getPassword() {
37-
return getDate(R.id.edit_password);
61+
return getEnterText(R.id.edit_password);
3862
}
3963

4064
@Override
4165
public String getSite() {
42-
return getDate(R.id.edit_site);
66+
return getEnterText(R.id.edit_site);
4367
}
4468

4569
@Override
4670
public String getEmail() {
47-
return getDate(R.id.edit_email);
71+
return getEnterText(R.id.edit_email);
4872
}
4973

5074
@Override
5175
public String getQQ() {
52-
return getDate(R.id.edit_qq);
76+
return getEnterText(R.id.edit_qq);
5377
}
5478

5579
@Override
5680
public String getCall() {
57-
return getDate(R.id.edit_call);
81+
return getEnterText(R.id.edit_call);
82+
}
83+
84+
@Override
85+
public String getRemarks() {
86+
return getEnterText(R.id.edit_remark);
87+
}
88+
89+
@Override
90+
public int getColor() {
91+
return 0;
92+
}
93+
94+
@Override
95+
public void needKey() {
96+
KeyVerifyActivity.show(this);
97+
}
98+
99+
@Override
100+
public void setError(int error) {
101+
showToast("Error: " + error);
102+
}
103+
104+
@Override
105+
public void setOk() {
106+
finish();
58107
}
59108

60-
private String getDate(int id) {
61-
String date = ((EditText) findViewById(id)).getText().toString();
62-
if (date.equals("")) {
63-
return "no";
64-
} else return date;
109+
@Override
110+
public void showLoading() {
111+
super.showLoading();
112+
}
113+
114+
@Override
115+
public void hideLoading() {
116+
super.hideLoading();
117+
}
118+
119+
@Override
120+
public void onClick(View v) {
121+
CreatePresenter presenter = mPresenter;
122+
if (presenter == null)
123+
return;
124+
if (v.getId() == R.id.action_submit) {
125+
mPresenter.submit();
126+
}
65127
}
66128
}

‎AnKey/app/src/main/java/net/qiujuer/powerback/ankey/ui/activity/EditActivity.java‎

Lines changed: 128 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,140 @@
11
package net.qiujuer.powerback.ankey.ui.activity;
22

3+
import android.content.Context;
4+
import android.content.Intent;
35
import android.os.Bundle;
6+
import android.text.Editable;
7+
import android.text.Selection;
8+
import android.text.TextUtils;
9+
import android.view.View;
410

11+
import net.qiujuer.genius.ui.widget.EditText;
512
import net.qiujuer.powerback.ankey.R;
6-
import net.qiujuer.powerback.ankey.ui.SuperBackActivity;
13+
import net.qiujuer.powerback.ankey.model.AppModel;
14+
import net.qiujuer.powerback.ankey.presenter.EditPresenter;
15+
import net.qiujuer.powerback.ankey.presenter.view.EditView;
716

8-
public class EditActivity extends SuperBackActivity {
17+
import java.util.UUID;
18+
19+
/**
20+
* Created by qiujuer
21+
*/
22+
public class EditActivity extends CreateActivity implements EditView {
23+
private static final String KEY_INFO_ID = "info_id";
24+
private EditPresenter mPresenter;
25+
private UUID mId;
26+
27+
public static void show(Context context, UUID id) {
28+
Intent intent = new Intent(context, EditActivity.class);
29+
intent.putExtra(KEY_INFO_ID, id.toString());
30+
context.startActivity(intent);
31+
}
932

1033
@Override
1134
protected void onCreate(Bundle savedInstanceState) {
1235
super.onCreate(savedInstanceState);
13-
setContentView(R.layout.activity_edit);
36+
37+
if (initId())
38+
mPresenter.load();
39+
else
40+
finish();
41+
}
42+
43+
@Override
44+
protected void initPresenter() {
45+
mPresenter = new EditPresenter(this);
46+
}
47+
48+
private boolean initId() {
49+
Intent intent = getIntent();
50+
String id = intent.getStringExtra(KEY_INFO_ID);
51+
if (TextUtils.isEmpty(id))
52+
return false;
53+
try {
54+
mId = UUID.fromString(id);
55+
} catch (Exception e) {
56+
e.printStackTrace();
57+
return false;
58+
}
59+
return (mId != AppModel.EMPTY_ID);
60+
}
61+
62+
private void setEnterText(int id, String value) {
63+
if (TextUtils.isEmpty(value))
64+
return;
65+
EditText text = ((EditText) findViewById(id));
66+
if (text != null) {
67+
text.requestFocus();
68+
text.setText(value);
69+
70+
Editable editable = text.getText();
71+
Selection.setSelection(editable, editable.length());
72+
}
73+
}
74+
75+
76+
@Override
77+
public void onClick(View v) {
78+
EditPresenter presenter = mPresenter;
79+
if (presenter == null)
80+
return;
81+
if (v.getId() == R.id.action_submit) {
82+
mPresenter.submit();
83+
}
84+
}
85+
86+
@Override
87+
public void setDescription(String value) {
88+
setEnterText(R.id.edit_description, value);
89+
}
90+
91+
@Override
92+
public void setPassword(String value) {
93+
setEnterText(R.id.edit_password, value);
94+
}
95+
96+
@Override
97+
public void setUsername(String value) {
98+
setEnterText(R.id.edit_username, value);
99+
}
100+
101+
@Override
102+
public void setSite(String value) {
103+
setEnterText(R.id.edit_site, value);
104+
}
105+
106+
@Override
107+
public void setEmail(String value) {
108+
setEnterText(R.id.edit_email, value);
109+
}
110+
111+
@Override
112+
public void setQQ(String value) {
113+
setEnterText(R.id.edit_qq, value);
114+
}
115+
116+
@Override
117+
public void setCall(String value) {
118+
setEnterText(R.id.edit_call, value);
119+
}
120+
121+
@Override
122+
public void setRemarks(String value) {
123+
setEnterText(R.id.edit_remark, value);
124+
}
125+
126+
@Override
127+
public void setColor(int color) {
128+
129+
}
130+
131+
@Override
132+
public UUID getInfoId() {
133+
return mId;
134+
}
135+
136+
@Override
137+
public Context getContext() {
138+
return this;
14139
}
15140
}

‎AnKey/app/src/main/java/net/qiujuer/powerback/ankey/ui/activity/KeyCreateActivity.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package net.qiujuer.powerback.ankey.ui.activity;
22

3+
import android.graphics.Typeface;
34
import android.os.Bundle;
45
import android.view.View;
56

7+
import net.qiujuer.genius.ui.Ui;
68
import net.qiujuer.genius.ui.widget.EditText;
79
import net.qiujuer.powerback.ankey.R;
810
import net.qiujuer.powerback.ankey.presenter.KeyCreatePresenter;
911
import net.qiujuer.powerback.ankey.presenter.view.KeyCreateView;
1012
import net.qiujuer.powerback.ankey.ui.SuperBackActivity;
11-
import net.qiujuer.powerback.ankey.util.AnKeyTransformationMethod;
1213

1314
public class KeyCreateActivity extends SuperBackActivity implements KeyCreateView, View.OnClickListener {
14-
1515
private KeyCreatePresenter mPresenter;
1616
private EditText mKey;
1717
private EditText mKeyConfirm;
@@ -29,8 +29,11 @@ protected void onCreate(Bundle savedInstanceState) {
2929
mKey = (EditText) findViewById(R.id.edit_key);
3030
mKeyConfirm = (EditText) findViewById(R.id.edit_key_confirm);
3131

32-
mKey.setTransformationMethod(AnKeyTransformationMethod.getInstance());
33-
mKeyConfirm.setTransformationMethod(AnKeyTransformationMethod.getInstance());
32+
Typeface typeface = Ui.getFont(this, "FZLanTingHeiS-L-GB-Regular.TTF");
33+
mKey.setTypeface(typeface);
34+
mKeyConfirm.setTypeface(typeface);
35+
//mKey.setTransformationMethod(AnKeyTransformationMethod.getInstance());
36+
//mKeyConfirm.setTransformationMethod(AnKeyTransformationMethod.getInstance());
3437
}
3538

3639

@@ -46,14 +49,19 @@ public String getKeyConfirm() {
4649

4750
@Override
4851
public void setError(int status) {
49-
showToast("Error");
52+
showToast("Error: " + status);
5053
}
5154

5255
@Override
5356
public void setOk() {
5457
finish();
5558
}
5659

60+
@Override
61+
public void needKey() {
62+
63+
}
64+
5765
@Override
5866
public void onClick(View v) {
5967
mPresenter.submit();

0 commit comments

Comments
 (0)