瀏覽代碼

[수정사항]
1. TM 로고 적용.

aaron 9 年之前
父節點
當前提交
56fa1fc647

+ 8 - 8
color_picker/color_picker.iml

@@ -67,14 +67,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

二進制
kneet_v3/src/main/res/drawable-hdpi/ic_launcher.png


二進制
kneet_v3/src/main/res/drawable-hdpi/notification_icon.png


二進制
kneet_v3/src/main/res/drawable-ldpi/ic_launcher.png


二進制
kneet_v3/src/main/res/drawable-ldpi/notification_icon.png


二進制
kneet_v3/src/main/res/drawable-mdpi/ic_launcher.png


二進制
kneet_v3/src/main/res/drawable-mdpi/notification_icon.png


二進制
kneet_v3/src/main/res/drawable-xhdpi/common_menu_fullpopup_logo_top.png


二進制
kneet_v3/src/main/res/drawable-xhdpi/ic_launcher.png


二進制
kneet_v3/src/main/res/drawable-xhdpi/img_intro.png


二進制
kneet_v3/src/main/res/drawable-xhdpi/img_intro_bottom.png


二進制
kneet_v3/src/main/res/drawable-xhdpi/img_login_bg_wide.png


二進制
kneet_v3/src/main/res/drawable-xhdpi/notification_icon.png


二進制
kneet_v3/src/main/res/drawable-xxhdpi/ic_launcher.png


二進制
kneet_v3/src/main/res/drawable-xxhdpi/notification_icon.png


二進制
kneet_v3/src/main/res/drawable-xxxhdpi/ic_launcher.png


二進制
kneet_v3/src/main/res/drawable-xxxhdpi/notification_icon.png


+ 6 - 12
kneet_v3/src/main/res/layout/intro.xml

@@ -8,8 +8,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/img_intro_bg"
-    android:fillViewport="true"
-    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
   <RelativeLayout
@@ -18,23 +16,19 @@
 
     <ImageView
         android:id="@+id/ivLogo"
-        android:layout_width="70dp"
-        android:layout_height="52dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:background="@drawable/img_intro"
+        android:src="@drawable/img_intro"
     />
 
-    <TextView
+    <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="35dp"
-        android:includeFontPadding="false"
-        android:lineSpacingExtra="4dp"
-        android:text="@string/layout_intro_01"
-        android:textColor="@color/color_text_03"
-        android:textSize="@dimen/size_font_06"/>
+        android:layout_marginBottom="40dp"
+        android:src="@drawable/img_intro_bottom"/>
   </RelativeLayout>
 
 </LinearLayout>

+ 4 - 3
kneet_v3/src/main/res/layout/main_more.xml

@@ -37,9 +37,10 @@
             android:paddingTop="60dp">
 
           <ImageView
-              android:layout_width="200dp"
-              android:layout_height="115dp"
-              android:background="@drawable/common_menu_fullpopup_logo_top"/>
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:background="@drawable/common_menu_fullpopup_logo_top"
+                  android:id="@+id/imageView2"/>
 
           <LinearLayout
               android:id="@+id/llSettingMenu"