Merge branch 'page-gaotong' into page-humingsen
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/assets/fonts/iconfont.ttf # app/src/main/res/values/strings.xml
Showing
674 Bytes
4.34 KB
1.7 KB
4.41 KB
2.48 KB
app/src/main/res/drawable-xxxhdpi/h1.png
0 → 100644
1.81 KB
app/src/main/res/drawable-xxxhdpi/h2.png
0 → 100644
2.62 KB
app/src/main/res/drawable-xxxhdpi/h3.png
0 → 100644
2.51 KB
app/src/main/res/drawable-xxxhdpi/h4.png
0 → 100644
1.87 KB
app/src/main/res/drawable-xxxhdpi/h5.png
0 → 100644
1.95 KB
app/src/main/res/drawable-xxxhdpi/h6.png
0 → 100644
2.27 KB
1.9 KB
1.86 KB
1.93 KB
12.9 KB
2.27 KB
16.4 KB
1.41 KB
12.1 KB
1.54 KB
2.05 KB
2.07 KB
3.78 KB
4.53 KB
4.59 KB
2.41 KB
app/src/main/res/layout/activity_login.xml
0 → 100644
app/src/main/res/layout/fragment_emoji.xml
0 → 100644
app/src/main/res/layout/fragment_font.xml
0 → 100644
app/src/main/res/layout/fragment_more.xml
0 → 100644
app/src/main/res/layout/fragment_other.xml
0 → 100644
app/src/main/res/layout/fragment_picture.xml
0 → 100644
Please
register
or
sign in
to comment