Skip to content

Commit 1c4bb95

Browse files
authored
Merge pull request #18 from just4fun/v1.4.0
v1.4.0
2 parents a0a2f38 + bc8946c commit 1c4bb95

Some content is hidden

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

82 files changed

+1903
-530
lines changed

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ An iOS client for http://bbs.uestc.edu.cn/ written in [React Native](https://fac
3636
- [x] Reply comment
3737
- [x] Favor topic
3838
- [x] Upload images
39+
- [ ] Meme
3940
- [ ] Report objectionable content
4041
- [ ] Vote
4142
- [ ] Create vote
@@ -51,7 +52,7 @@ An iOS client for http://bbs.uestc.edu.cn/ written in [React Native](https://fac
5152
- [x] View my recent topics
5253
- [x] View my favorite topics
5354
- [ ] Update password
54-
- [ ] Upload avatar
55+
- [x] Upload avatar
5556

5657
## Try it out
5758

@@ -79,9 +80,7 @@ npm run eslint
7980
- ~~Update UI per new design~~
8081
- ~~Submit to [App Store](https://itunes.apple.com/cn/app/qing-shui-he-pan-stuhome/id1190564355)~~
8182
- ~~Replace [redux-thunk](https://github.com/gaearon/redux-thunk) with [redux-saga](https://github.com/redux-saga/redux-saga)~~ ([#7](https://github.com/just4fun/stuhome/pull/7))
82-
- Fixture data (aka `mock data`)
8383
- ~~Unit Testing Infrastructure~~ ([#8](https://github.com/just4fun/stuhome/pull/8))
84-
- Push notification
8584

8685
## Known issues
8786

android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ android {
127127
}
128128

129129
dependencies {
130+
compile project(':react-native-fetch-blob')
130131
compile project(':react-native-image-crop-picker')
131132
compile project(':react-native-vector-icons')
132133
compile fileTree(dir: "libs", include: ["*.jar"])

android/app/src/main/java/com/stuhome/MainApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Application;
44

55
import com.facebook.react.ReactApplication;
6+
import com.RNFetchBlob.RNFetchBlobPackage;
67
import com.reactnative.ivpusic.imagepicker.PickerPackage;
78
import com.oblador.vectoricons.VectorIconsPackage;
89
import com.facebook.react.ReactNativeHost;
@@ -31,6 +32,7 @@ public boolean getUseDeveloperSupport() {
3132
protected List<ReactPackage> getPackages() {
3233
return Arrays.<ReactPackage>asList(
3334
new MainReactPackage(),
35+
new RNFetchBlobPackage(),
3436
new PickerPackage(),
3537
new VectorIconsPackage()
3638
);

android/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
rootProject.name = 'stuhome'
2+
include ':react-native-fetch-blob'
3+
project(':react-native-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fetch-blob/android')
24
include ':react-native-image-crop-picker'
35
project(':react-native-image-crop-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-crop-picker/android')
46
include ':react-native-vector-icons'

ios/stuhome.xcodeproj/project.pbxproj

Lines changed: 98 additions & 22 deletions
Large diffs are not rendered by default.

ios/stuhome/Base.lproj/LaunchScreen.xib

Lines changed: 0 additions & 42 deletions
This file was deleted.

ios/stuhome/Images.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
22
"images" : [
3+
{
4+
"size" : "20x20",
5+
"idiom" : "iphone",
6+
"filename" : "Icon-App-20x20@2x.png",
7+
"scale" : "2x"
8+
},
9+
{
10+
"size" : "20x20",
11+
"idiom" : "iphone",
12+
"filename" : "Icon-App-20x20@3x.png",
13+
"scale" : "3x"
14+
},
315
{
416
"size" : "29x29",
517
"idiom" : "iphone",
@@ -53,6 +65,18 @@
5365
"filename" : "Icon-App-60x60@3x.png",
5466
"scale" : "3x"
5567
},
68+
{
69+
"size" : "20x20",
70+
"idiom" : "ipad",
71+
"filename" : "Icon-App-20x20@1x.png",
72+
"scale" : "1x"
73+
},
74+
{
75+
"size" : "20x20",
76+
"idiom" : "ipad",
77+
"filename" : "Icon-App-20x20@2x.png",
78+
"scale" : "2x"
79+
},
5680
{
5781
"size" : "29x29",
5882
"idiom" : "ipad",
@@ -95,6 +119,11 @@
95119
"filename" : "Icon-App-83.5x83.5@2x.png",
96120
"scale" : "2x"
97121
},
122+
{
123+
"idiom" : "ios-marketing",
124+
"size" : "1024x1024",
125+
"scale" : "1x"
126+
},
98127
{
99128
"size" : "40x40",
100129
"idiom" : "iphone",
@@ -113,35 +142,11 @@
113142
"filename" : "Icon-App-76x76@1x.png",
114143
"scale" : "1x"
115144
},
116-
{
117-
"size" : "20x20",
118-
"idiom" : "iphone",
119-
"filename" : "Icon-App-20x20@2x.png",
120-
"scale" : "2x"
121-
},
122-
{
123-
"size" : "20x20",
124-
"idiom" : "iphone",
125-
"filename" : "Icon-App-20x20@3x.png",
126-
"scale" : "3x"
127-
},
128145
{
129146
"size" : "76x76",
130147
"idiom" : "ipad",
131148
"filename" : "Icon-App-76x76@3x.png",
132149
"scale" : "3x"
133-
},
134-
{
135-
"size" : "20x20",
136-
"idiom" : "ipad",
137-
"filename" : "Icon-App-20x20@1x.png",
138-
"scale" : "1x"
139-
},
140-
{
141-
"size" : "20x20",
142-
"idiom" : "ipad",
143-
"filename" : "Icon-App-20x20@2x.png",
144-
"scale" : "2x"
145150
}
146151
],
147152
"info" : {
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"images" : [
3+
{
4+
"extent" : "full-screen",
5+
"idiom" : "iphone",
6+
"subtype" : "2436h",
7+
"filename" : "Default1125x2436.png",
8+
"minimum-system-version" : "11.0",
9+
"orientation" : "portrait",
10+
"scale" : "3x"
11+
},
12+
{
13+
"extent" : "full-screen",
14+
"idiom" : "iphone",
15+
"subtype" : "736h",
16+
"filename" : "Default1242x2208.png",
17+
"minimum-system-version" : "8.0",
18+
"orientation" : "portrait",
19+
"scale" : "3x"
20+
},
21+
{
22+
"extent" : "full-screen",
23+
"idiom" : "iphone",
24+
"subtype" : "667h",
25+
"filename" : "Default750x1334.png",
26+
"minimum-system-version" : "8.0",
27+
"orientation" : "portrait",
28+
"scale" : "2x"
29+
},
30+
{
31+
"orientation" : "portrait",
32+
"idiom" : "iphone",
33+
"filename" : "Default640x960.png",
34+
"extent" : "full-screen",
35+
"minimum-system-version" : "7.0",
36+
"scale" : "2x"
37+
},
38+
{
39+
"extent" : "full-screen",
40+
"idiom" : "iphone",
41+
"subtype" : "retina4",
42+
"filename" : "Default640x1136.png",
43+
"minimum-system-version" : "7.0",
44+
"orientation" : "portrait",
45+
"scale" : "2x"
46+
},
47+
{
48+
"orientation" : "portrait",
49+
"idiom" : "iphone",
50+
"filename" : "Default320x480.png",
51+
"extent" : "full-screen",
52+
"scale" : "1x"
53+
},
54+
{
55+
"orientation" : "portrait",
56+
"idiom" : "iphone",
57+
"filename" : "Default640x960-1.png",
58+
"extent" : "full-screen",
59+
"scale" : "2x"
60+
},
61+
{
62+
"orientation" : "portrait",
63+
"idiom" : "iphone",
64+
"filename" : "Default640x1136-1.png",
65+
"extent" : "full-screen",
66+
"subtype" : "retina4",
67+
"scale" : "2x"
68+
},
69+
{
70+
"orientation" : "portrait",
71+
"idiom" : "iphone",
72+
"minimum-system-version" : "7.0",
73+
"scale" : "2x"
74+
},
75+
{
76+
"orientation" : "portrait",
77+
"idiom" : "iphone",
78+
"minimum-system-version" : "7.0",
79+
"subtype" : "retina4",
80+
"scale" : "2x"
81+
}
82+
],
83+
"info" : {
84+
"version" : 1,
85+
"author" : "xcode"
86+
}
87+
}
2.16 MB
Loading
2.24 MB
Loading

0 commit comments

Comments
 (0)