Skip to content

Commit 43efc83

Browse files
ztc1997ztc1997
committed
clean up
1 parent da35ea9 commit 43efc83

40 files changed

+562
-546
lines changed

‎app/src/main/kotlin/com/rayfantasy/icode/ui/adapter/ReplyListAdapter.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ import android.app.Activity
2020
import android.support.v7.widget.RecyclerView
2121
import android.view.View
2222
import android.view.ViewGroup
23-
import com.amulyakhare.textdrawable.TextDrawable
2423
import com.bumptech.glide.Glide
2524
import com.rayfantasy.icode.R
2625
import com.rayfantasy.icode.extension.inflate
2726
import com.rayfantasy.icode.extension.loadPortrait
28-
import com.rayfantasy.icode.postutil.PostUtil
2927
import com.rayfantasy.icode.postutil.bean.Reply
3028
import com.rayfantasy.icode.ui.activity.UserActivity
3129
import com.rayfantasy.icode.util.ms2RelativeDate

‎app/src/main/kotlin/com/rayfantasy/icode/ui/fragment/MainFragment.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ class MainFragment : FragmentBase() {
2727
companion object {
2828
const val LOAD_ONCE = 10
2929
}
30+
3031
private lateinit var adapter: CodeListAdapter
3132
private val isRefreshing: Boolean
3233
get() = request != null

‎app/src/main/kotlin/com/rayfantasy/icode/util/CheckUserName.kt‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,33 @@ package com.rayfantasy.icode.util
33
/**
44
* Created by qweas on 2016/2/4 0004.
55
*/
6-
fun checkName(username : String): Boolean{
7-
var flag : Int = 1
8-
for(i in username){
9-
if(isChinese(i)){ continue }else{ if(isEnglish(i)){ continue }else{ if(isNumber(i)){ continue }else{ if(isOther(i)){ continue } else {flag = 0; break}}}}
6+
fun checkName(username: String): Boolean {
7+
var flag: Int = 1
8+
for (i in username) {
9+
if (isChinese(i)) {
10+
continue
11+
} else {
12+
if (isEnglish(i)) {
13+
continue
14+
} else {
15+
if (isNumber(i)) {
16+
continue
17+
} else {
18+
if (isOther(i)) {
19+
continue
20+
} else {
21+
flag = 0; break
22+
}
23+
}
24+
}
25+
}
1026

1127
}
12-
if(flag == 0)return false else return true
28+
if (flag == 0) return false else return true
1329
}
1430

15-
fun isChinese(c : Char) : Boolean{
16-
val ub : Character.UnicodeBlock = Character.UnicodeBlock.of(c)
31+
fun isChinese(c: Char): Boolean {
32+
val ub: Character.UnicodeBlock = Character.UnicodeBlock.of(c)
1733
if ( ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
1834
|| ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B
1935
|| ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS
@@ -23,16 +39,17 @@ fun isChinese(c : Char) : Boolean{
2339
return false;
2440
}
2541

26-
fun isEnglish(c: Char) : Boolean{
42+
fun isEnglish(c: Char): Boolean {
2743
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) return true
2844
return false
2945
}
3046

31-
fun isNumber(c : Char) : Boolean{
32-
if(c <='9' && c >= '0') return true
47+
fun isNumber(c: Char): Boolean {
48+
if (c <= '9' && c >= '0') return true
3349
return false
3450
}
35-
fun isOther(c : Char) : Boolean{
51+
52+
fun isOther(c: Char): Boolean {
3653
if ( c == '_') return true
3754
return false
3855
}

‎app/src/main/kotlin/com/rayfantasy/icode/util/ErrorFormat.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@ import com.rayfantasy.icode.R
88
*/
99
fun error(operation: String, rc: Int, activity: Activity): String {
1010

11-
return when (operation) {
11+
return when (operation) {
1212
"insertCodeGood" -> when (rc) {
1313
-1 -> getStringResources(activity, R.string.internet_error)
1414
-2 -> getStringResources(activity, R.string.failed_to_analysis_local_data_error)
1515
-3 -> getStringResources(activity, R.string.failed_to_analysis_server_data_error)
16-
1 -> getStringResources(activity, R.string.server_unknow_exception_error)
16+
1 -> getStringResources(activity, R.string.server_unknow_exception_error)
1717
-4 -> getStringResources(activity, R.string.user_not_login_error)
18-
2 -> getStringResources(activity, R.string.cannot_insert_data_to_database_error)
19-
3 -> getStringResources(activity, R.string.check_user_failed_error)
20-
else -> getStringResources(activity, R.string.unknow_error)
18+
2 -> getStringResources(activity, R.string.cannot_insert_data_to_database_error)
19+
3 -> getStringResources(activity, R.string.check_user_failed_error)
20+
else -> getStringResources(activity, R.string.unknow_error)
2121
}
2222
"addReply" -> when (rc) {
2323
4 -> getStringResources(activity, R.string.check_user_failed_error)
2424
2 -> getStringResources(activity, R.string.cannot_insert_data_to_database_error)
2525
5 -> getStringResources(activity, R.string.sent_code_interval_too_short_error)
26-
-4 ->getStringResources(activity, R.string.user_not_login_error)
26+
-4 -> getStringResources(activity, R.string.user_not_login_error)
2727
3 -> getStringResources(activity, R.string.check_user_failed_error)
28-
else ->getStringResources(activity, R.string.unknow_error)
28+
else -> getStringResources(activity, R.string.unknow_error)
2929
}
3030
"registerUser" -> when (rc) {
3131
2 -> getStringResources(activity, R.string.cannot_insert_data_to_database_error)
3232
3 -> getStringResources(activity, R.string.check_user_failed_error)
3333
4 -> getStringResources(activity, R.string.pwd_too_short)
3434
5 -> getStringResources(activity, R.string.imei_illegal)
3535
6 -> getStringResources(activity, R.string.imei_already_existed)
36-
else -> getStringResources(activity, R.string.unknow_error)
36+
else -> getStringResources(activity, R.string.unknow_error)
3737
}
3838
"loginUser" -> when (rc) {
3939
2 -> getStringResources(activity, R.string.cannot_find_user)
4040
3 -> getStringResources(activity, R.string.pwd_error)
41-
else ->getStringResources(activity, R.string.unknow_error)
41+
else -> getStringResources(activity, R.string.unknow_error)
4242
}
4343
"delete" -> when (rc) {
44-
-4 ->getStringResources(activity, R.string.user_not_login_error)
44+
-4 -> getStringResources(activity, R.string.user_not_login_error)
4545
2 -> getStringResources(activity, R.string.cannot_find_id_in_reply_database_error)
4646
3 -> getStringResources(activity, R.string.check_user_failed_error)
47-
else -> getStringResources(activity, R.string.unknow_error)
47+
else -> getStringResources(activity, R.string.unknow_error)
4848
}
4949
"editCodeGood" -> when (rc) {
5050
-4 -> getStringResources(activity, R.string.user_not_login_error)

‎app/src/main/kotlin/com/rayfantasy/icode/util/SpaceItemDecoration.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import android.view.View
88
* Created by qweas on 2016/2/6 0006.
99
*/
1010

11-
public class SpaceItemDecoration() : RecyclerView.ItemDecoration(){
12-
private var space : Int = 0
11+
public class SpaceItemDecoration() : RecyclerView.ItemDecoration() {
12+
private var space: Int = 0
1313
override fun getItemOffsets(outRect: Rect?, view: View?, parent: RecyclerView?, state: RecyclerView.State?) {
1414
outRect!!.top = space
1515
}

‎app/src/main/res/anim/activity_switcher.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android">
33
<translate
4-
android:fromXDelta="100%p"
5-
android:toXDelta="0%p"
6-
android:duration="500" />
4+
android:fromXDelta="100%p"
5+
android:toXDelta="0%p"
6+
android:duration="500"/>
77
</set>

‎app/src/main/res/anim/scale_down.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<set xmlns:android="http://schemas.android.com/apk/res/android">
22
<scale
3-
android:fromXScale="100%p"
4-
android:toXScale="95%p"
5-
android:fromYScale="100%p"
6-
android:toYScale="95%p"
7-
android:pivotX="50%p"
8-
android:pivotY="50%p"
9-
android:duration="@android:integer/config_shortAnimTime" />
3+
android:fromXScale="100%p"
4+
android:toXScale="95%p"
5+
android:fromYScale="100%p"
6+
android:toYScale="95%p"
7+
android:pivotX="50%p"
8+
android:pivotY="50%p"
9+
android:duration="@android:integer/config_shortAnimTime"/>
1010
</set>

‎app/src/main/res/anim/slide_in_right.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:shareInterpolator="false">
3+
android:shareInterpolator="false">
44
<translate
5-
android:duration="@android:integer/config_mediumAnimTime"
6-
android:fromXDelta="100%"
7-
android:toXDelta="0%" />
5+
android:duration="@android:integer/config_mediumAnimTime"
6+
android:fromXDelta="100%"
7+
android:toXDelta="0%"/>
88
</set>

‎app/src/main/res/anim/slide_out_left.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:shareInterpolator="false">
3+
android:shareInterpolator="false">
44
<translate
5-
android:duration="@android:integer/config_mediumAnimTime"
6-
android:toXDelta="-100%"
7-
android:fromXDelta="00%" />
5+
android:duration="@android:integer/config_mediumAnimTime"
6+
android:toXDelta="-100%"
7+
android:fromXDelta="00%"/>
88
</set>

‎app/src/main/res/anim/slide_up.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<set xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:shareInterpolator="false">
3+
android:shareInterpolator="false">
44
<translate
5-
android:duration="@android:integer/config_shortAnimTime"
6-
android:fromYDelta="100%"
7-
android:toYDelta="0%" />
5+
android:duration="@android:integer/config_shortAnimTime"
6+
android:fromYDelta="100%"
7+
android:toYDelta="0%"/>
88
</set>

0 commit comments

Comments
 (0)