CNLive Android Team / VLionSimple · Commits

Commit 72622d9914f94122f02d7b1ee04ccaa89267af11

Authored by 王琳
2 parents e32d8fa9 a2789f29

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/VLionSimple

Inline Side-by-side
Showing 15 changed files with 6 additions and 5 deletions
app/src/main/AndroidManifest.xml
  View file @72622d9
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
15 android:configChanges="keyboardHidden|screenSize|orientation" 15 android:configChanges="keyboardHidden|screenSize|orientation"
16 android:icon="@mipmap/ic_launcher" 16 android:icon="@mipmap/ic_launcher"
17 android:label="@string/app_name" 17 android:label="@string/app_name"
18 - android:roundIcon="@mipmap/ic_launcher_round"  
19 android:screenOrientation="portrait" 18 android:screenOrientation="portrait"
20 android:supportsRtl="true" 19 android:supportsRtl="true"
21 android:theme="@style/AppTheme"> 20 android:theme="@style/AppTheme">
app/src/main/res/drawable-hdpi/bg_activity.png 0 → 100644
View file @72622d9

24 KB
app/src/main/res/drawable-hdpi/bg_launch.png 0 → 100644
View file @72622d9

247 KB
app/src/main/res/drawable-hdpi/log_max.png 0 → 100644
View file @72622d9

7.81 KB
app/src/main/res/layout/activity_splash.xml
  View file @72622d9
@@ -3,17 +3,18 @@ @@ -3,17 +3,18 @@
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="match_parent"> 4 android:layout_height="match_parent">
5 5
6 - <RelativeLayout 6 + <ImageView
7 android:id="@+id/defaultLayout" 7 android:id="@+id/defaultLayout"
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="match_parent" 9 android:layout_height="match_parent"
10 - android:background="@mipmap/ic_launcher"/> 10 + android:scaleType="centerCrop"
  11 + android:src="@drawable/bg_launch"/>
11 12
12 <RelativeLayout 13 <RelativeLayout
13 android:id="@+id/adLayout" 14 android:id="@+id/adLayout"
14 android:layout_width="match_parent" 15 android:layout_width="match_parent"
15 android:layout_height="match_parent" 16 android:layout_height="match_parent"
16 - android:visibility="gone"> 17 + android:visibility="visible">
17 18
18 <RelativeLayout 19 <RelativeLayout
19 android:id="@+id/splashAdContainer" 20 android:id="@+id/splashAdContainer"
@@ -24,7 +25,8 @@ @@ -24,7 +25,8 @@
24 android:id="@+id/logo" 25 android:id="@+id/logo"
25 android:layout_width="100dp" 26 android:layout_width="100dp"
26 android:layout_height="100dp" 27 android:layout_height="100dp"
27 - android:src="@mipmap/ic_launcher" 28 + android:src="@drawable/log_max"
  29 + android:padding="8dp"
28 android:layout_alignParentBottom="true"/> 30 android:layout_alignParentBottom="true"/>
29 31
30 </RelativeLayout> 32 </RelativeLayout>
app/src/main/res/mipmap-hdpi/ic_launcher.png
View file @72622d9

3.34 KB | W: | H:

3.89 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted 100644 → 0
View file @e32d8fa

4.11 KB
app/src/main/res/mipmap-mdpi/ic_launcher.png
View file @72622d9

2.15 KB | W: | H:

2.43 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted 100644 → 0
View file @e32d8fa

2.5 KB
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file @72622d9

4.73 KB | W: | H:

5.76 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted 100644 → 0
View file @e32d8fa

5.97 KB
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file @72622d9

7.54 KB | W: | H:

10.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted 100644 → 0
View file @e32d8fa

9.82 KB
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file @72622d9

10.2 KB | W: | H:

15.3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted 100644 → 0
View file @e32d8fa

14.4 KB