CNLive Android Team / CNLiveApp · Commits

Commit 1dbeaaec77274d7476fb85ccb9d39b69912a2abc

Authored by 朱显松
1 parent d0605ec1

资源文件整理

Inline Side-by-side
Showing 59 changed files with 30 additions and 33 deletions
app/src/main/res/drawable-hdpi/ic_camera.png renamed to app/src/main/res/drawable-hdpi/main_camera.png
View file @1dbeaae

1.52 KB
app/src/main/res/drawable-hdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-hdpi/main_camera_sel.png
View file @1dbeaae

2.3 KB
app/src/main/res/drawable-hdpi/ic_home.png renamed to app/src/main/res/drawable-hdpi/main_home.png
View file @1dbeaae

650 Bytes
app/src/main/res/drawable-hdpi/ic_home_sel.png renamed to app/src/main/res/drawable-hdpi/main_home_sel.png
View file @1dbeaae

883 Bytes
app/src/main/res/drawable-hdpi/ic_live_tv.png renamed to app/src/main/res/drawable-hdpi/main_live_tv.png
View file @1dbeaae

732 Bytes
app/src/main/res/drawable-hdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-hdpi/main_live_tv_sel.png
View file @1dbeaae

999 Bytes
app/src/main/res/drawable-hdpi/ic_person.png renamed to app/src/main/res/drawable-hdpi/main_person.png
View file @1dbeaae

681 Bytes
app/src/main/res/drawable-hdpi/ic_person_sel.png renamed to app/src/main/res/drawable-hdpi/main_person_sel.png
View file @1dbeaae

931 Bytes
app/src/main/res/drawable-hdpi/ic_videocam.png renamed to app/src/main/res/drawable-hdpi/main_videocam.png
View file @1dbeaae

518 Bytes
app/src/main/res/drawable-hdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-hdpi/main_videocam_sel.png
View file @1dbeaae

692 Bytes
app/src/main/res/drawable-mdpi/ic_camera.png renamed to app/src/main/res/drawable-mdpi/main_camera.png
View file @1dbeaae

822 Bytes
app/src/main/res/drawable-mdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-mdpi/main_camera_sel.png
View file @1dbeaae

1.18 KB
app/src/main/res/drawable-mdpi/ic_home.png renamed to app/src/main/res/drawable-mdpi/main_home.png
View file @1dbeaae

411 Bytes
app/src/main/res/drawable-mdpi/ic_home_sel.png renamed to app/src/main/res/drawable-mdpi/main_home_sel.png
View file @1dbeaae

564 Bytes
app/src/main/res/drawable-mdpi/ic_live_tv.png renamed to app/src/main/res/drawable-mdpi/main_live_tv.png
View file @1dbeaae

464 Bytes
app/src/main/res/drawable-mdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-mdpi/main_live_tv_sel.png
View file @1dbeaae

632 Bytes
app/src/main/res/drawable-mdpi/ic_person.png renamed to app/src/main/res/drawable-mdpi/main_person.png
View file @1dbeaae

516 Bytes
app/src/main/res/drawable-mdpi/ic_person_sel.png renamed to app/src/main/res/drawable-mdpi/main_person_sel.png
View file @1dbeaae

717 Bytes
app/src/main/res/drawable-mdpi/ic_videocam.png renamed to app/src/main/res/drawable-mdpi/main_videocam.png
View file @1dbeaae

315 Bytes
app/src/main/res/drawable-mdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-mdpi/main_videocam_sel.png
View file @1dbeaae

425 Bytes
app/src/main/res/drawable-xhdpi/ic_camera.png renamed to app/src/main/res/drawable-xhdpi/main_camera.png
View file @1dbeaae

1.82 KB
app/src/main/res/drawable-xhdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-xhdpi/main_camera_sel.png
View file @1dbeaae

2.63 KB
app/src/main/res/drawable-xhdpi/ic_home.png renamed to app/src/main/res/drawable-xhdpi/main_home.png
View file @1dbeaae

702 Bytes
app/src/main/res/drawable-xhdpi/ic_home_sel.png renamed to app/src/main/res/drawable-xhdpi/main_home_sel.png
View file @1dbeaae

910 Bytes
app/src/main/res/drawable-xhdpi/ic_live_tv.png renamed to app/src/main/res/drawable-xhdpi/main_live_tv.png
View file @1dbeaae

874 Bytes
app/src/main/res/drawable-xhdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-xhdpi/main_live_tv_sel.png
View file @1dbeaae

1.16 KB
app/src/main/res/drawable-xhdpi/ic_person.png renamed to app/src/main/res/drawable-xhdpi/main_person.png
View file @1dbeaae

994 Bytes
app/src/main/res/drawable-xhdpi/ic_person_sel.png renamed to app/src/main/res/drawable-xhdpi/main_person_sel.png
View file @1dbeaae

1.3 KB
app/src/main/res/drawable-xhdpi/ic_videocam.png renamed to app/src/main/res/drawable-xhdpi/main_videocam.png
View file @1dbeaae

561 Bytes
app/src/main/res/drawable-xhdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-xhdpi/main_videocam_sel.png
View file @1dbeaae

729 Bytes
app/src/main/res/drawable-xxhdpi/ic_camera.png renamed to app/src/main/res/drawable-xxhdpi/main_camera.png
View file @1dbeaae

3.39 KB
app/src/main/res/drawable-xxhdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-xxhdpi/main_camera_sel.png
View file @1dbeaae

4.77 KB
app/src/main/res/drawable-xxhdpi/ic_home.png renamed to app/src/main/res/drawable-xxhdpi/main_home.png
View file @1dbeaae

1.24 KB
app/src/main/res/drawable-xxhdpi/ic_home_sel.png renamed to app/src/main/res/drawable-xxhdpi/main_home_sel.png
View file @1dbeaae

1.56 KB
app/src/main/res/drawable-xxhdpi/ic_live_tv.png renamed to app/src/main/res/drawable-xxhdpi/main_live_tv.png
View file @1dbeaae

1.56 KB
app/src/main/res/drawable-xxhdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-xxhdpi/main_live_tv_sel.png
View file @1dbeaae

2.07 KB
app/src/main/res/drawable-xxhdpi/ic_person.png renamed to app/src/main/res/drawable-xxhdpi/main_person.png
View file @1dbeaae

1.39 KB
app/src/main/res/drawable-xxhdpi/ic_person_sel.png renamed to app/src/main/res/drawable-xxhdpi/main_person_sel.png
View file @1dbeaae

1.79 KB
app/src/main/res/drawable-xxhdpi/ic_videocam.png renamed to app/src/main/res/drawable-xxhdpi/main_videocam.png
View file @1dbeaae

1.04 KB
app/src/main/res/drawable-xxhdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-xxhdpi/main_videocam_sel.png
View file @1dbeaae

1.29 KB
app/src/main/res/drawable-xxxhdpi/ic_camera.png renamed to app/src/main/res/drawable-xxxhdpi/main_camera.png
View file @1dbeaae

4 KB
app/src/main/res/drawable-xxxhdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-xxxhdpi/main_camera_sel.png
View file @1dbeaae

5.42 KB
app/src/main/res/drawable-xxxhdpi/ic_home.png renamed to app/src/main/res/drawable-xxxhdpi/main_home.png
View file @1dbeaae

1.56 KB
app/src/main/res/drawable-xxxhdpi/ic_home_sel.png renamed to app/src/main/res/drawable-xxxhdpi/main_home_sel.png
View file @1dbeaae

1.96 KB
app/src/main/res/drawable-xxxhdpi/ic_live_tv.png renamed to app/src/main/res/drawable-xxxhdpi/main_live_tv.png
View file @1dbeaae

2.01 KB
app/src/main/res/drawable-xxxhdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-xxxhdpi/main_live_tv_sel.png
View file @1dbeaae

2.49 KB
app/src/main/res/drawable-xxxhdpi/ic_person.png renamed to app/src/main/res/drawable-xxxhdpi/main_person.png
View file @1dbeaae

2.12 KB
app/src/main/res/drawable-xxxhdpi/ic_person_sel.png renamed to app/src/main/res/drawable-xxxhdpi/main_person_sel.png
View file @1dbeaae

2.69 KB
app/src/main/res/drawable-xxxhdpi/ic_videocam.png renamed to app/src/main/res/drawable-xxxhdpi/main_videocam.png
View file @1dbeaae

1.38 KB
app/src/main/res/drawable-xxxhdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-xxxhdpi/main_videocam_sel.png
View file @1dbeaae

1.65 KB
app/src/main/res/drawable/tab_camera_selector.xml
  View file @1dbeaae
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <!-- Non focused states -->
4   - <item android:drawable="@drawable/ic_camera_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
5   - <item android:drawable="@drawable/ic_camera" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
  4 + <item android:drawable="@drawable/main_camera_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
  5 + <item android:drawable="@drawable/main_camera" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
6 6 <!-- Focused states -->
7   - <item android:drawable="@drawable/ic_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
8   - <item android:drawable="@drawable/ic_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
  7 + <item android:drawable="@drawable/main_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
  8 + <item android:drawable="@drawable/main_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
9 9 <!-- Pressed -->
10   - <item android:drawable="@drawable/ic_camera" android:state_pressed="true" android:state_selected="true" />
11   - <item android:drawable="@drawable/ic_camera" android:state_pressed="true" />
  10 + <item android:drawable="@drawable/main_camera" android:state_pressed="true" android:state_selected="true" />
  11 + <item android:drawable="@drawable/main_camera" android:state_pressed="true" />
12 12  
13 13 </selector>
14 14 \ No newline at end of file
... ...
app/src/main/res/drawable/tab_home_selector.xml
  View file @1dbeaae
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <!-- Non focused states -->
4   - <item android:drawable="@drawable/ic_home" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
5   - <item android:drawable="@drawable/ic_home_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
  4 + <item android:drawable="@drawable/main_home" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
  5 + <item android:drawable="@drawable/main_home_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
6 6 <!-- Focused states -->
7   - <item android:drawable="@drawable/ic_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
8   - <item android:drawable="@drawable/ic_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
  7 + <item android:drawable="@drawable/main_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
  8 + <item android:drawable="@drawable/main_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
9 9 <!-- Pressed -->
10   - <item android:drawable="@drawable/ic_home_sel" android:state_pressed="true" android:state_selected="true" />
11   - <item android:drawable="@drawable/ic_home_sel" android:state_pressed="true" />
  10 + <item android:drawable="@drawable/main_home_sel" android:state_pressed="true" android:state_selected="true" />
  11 + <item android:drawable="@drawable/main_home_sel" android:state_pressed="true" />
12 12  
13 13 </selector>
14 14 \ No newline at end of file
... ...
app/src/main/res/drawable/tab_live_tv_selector.xml
  View file @1dbeaae
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <!-- Non focused states -->
4   - <item android:drawable="@drawable/ic_live_tv" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
5   - <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
  4 + <item android:drawable="@drawable/main_live_tv" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
  5 + <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
6 6 <!-- Focused states -->
7   - <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
8   - <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
  7 + <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
  8 + <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
9 9 <!-- Pressed -->
10   - <item android:drawable="@drawable/ic_live_tv_sel" android:state_pressed="true" android:state_selected="true" />
11   - <item android:drawable="@drawable/ic_live_tv_sel" android:state_pressed="true" />
  10 + <item android:drawable="@drawable/main_live_tv_sel" android:state_pressed="true" android:state_selected="true" />
  11 + <item android:drawable="@drawable/main_live_tv_sel" android:state_pressed="true" />
12 12  
13 13 </selector>
14 14 \ No newline at end of file
... ...
app/src/main/res/drawable/tab_person_selector.xml
  View file @1dbeaae
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <!-- Non focused states -->
4   - <item android:drawable="@drawable/ic_person" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
5   - <item android:drawable="@drawable/ic_person_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
  4 + <item android:drawable="@drawable/main_person" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
  5 + <item android:drawable="@drawable/main_person_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
6 6 <!-- Focused states -->
7   - <item android:drawable="@drawable/ic_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
8   - <item android:drawable="@drawable/ic_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
  7 + <item android:drawable="@drawable/main_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
  8 + <item android:drawable="@drawable/main_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
9 9 <!-- Pressed -->
10   - <item android:drawable="@drawable/ic_person_sel" android:state_pressed="true" android:state_selected="true" />
11   - <item android:drawable="@drawable/ic_person_sel" android:state_pressed="true" />
  10 + <item android:drawable="@drawable/main_person_sel" android:state_pressed="true" android:state_selected="true" />
  11 + <item android:drawable="@drawable/main_person_sel" android:state_pressed="true" />
12 12  
13 13 </selector>
14 14 \ No newline at end of file
... ...
app/src/main/res/drawable/tab_videocam_selector.xml
  View file @1dbeaae
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
3 3 <!-- Non focused states -->
4   - <item android:drawable="@drawable/ic_videocam" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
5   - <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
  4 + <item android:drawable="@drawable/main_videocam" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
  5 + <item android:drawable="@drawable/main_videocam_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
6 6 <!-- Focused states -->
7   - <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
8   - <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
  7 + <item android:drawable="@drawable/main_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
  8 + <item android:drawable="@drawable/main_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
9 9 <!-- Pressed -->
10   - <item android:drawable="@drawable/ic_videocam_sel" android:state_pressed="true" android:state_selected="true" />
11   - <item android:drawable="@drawable/ic_videocam_sel" android:state_pressed="true" />
  10 + <item android:drawable="@drawable/main_videocam_sel" android:state_pressed="true" android:state_selected="true" />
  11 + <item android:drawable="@drawable/main_videocam_sel" android:state_pressed="true" />
12 12  
13 13 </selector>
14 14 \ No newline at end of file
... ...
user/src/main/res/xml/account_preferences.xml renamed to app/src/main/res/xml/account_preferences.xml
  View file @1dbeaae
user/src/main/res/xml/authenticator.xml renamed to app/src/main/res/xml/authenticator.xml
  View file @1dbeaae
user/src/main/res/mipmap-hdpi/ic_launcher.png deleted 100644 → 0
View file @d0605ec

6.52 KB
user/src/main/res/values/colors.xml
  View file @1dbeaae
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <resources>
3   - <color name="colorPrimary">#3F51B5</color>
4   - <color name="colorPrimaryDark">#303F9F</color>
5   - <color name="colorAccent">#FF4081</color>
6 3  
7 4 <color name="gray_line_color">#dcdcdc</color>
8 5 <color name="config_black_color">#323333</color>
... ...