xuning / livekitAndroidXuningTest

转到一个项目
Toggle navigation Toggle navigation pinning
David Liu
e38dc673 1 parent 2b330400

More initial commit

内嵌 并排对比
正在显示 10 个修改的文件 包含 198 行增加 和 90 行删除
1 <component name="ProjectCodeStyleConfiguration"> 1 <component name="ProjectCodeStyleConfiguration">
2 <code_scheme name="Project" version="173"> 2 <code_scheme name="Project" version="173">
  3 + <JetCodeStyleSettings>
  4 + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
  5 + </JetCodeStyleSettings>
3 <codeStyleSettings language="XML"> 6 <codeStyleSettings language="XML">
4 <indentOptions> 7 <indentOptions>
5 <option name="CONTINUATION_INDENT_SIZE" value="4" /> 8 <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -112,5 +115,8 @@ @@ -112,5 +115,8 @@
112 </rules> 115 </rules>
113 </arrangement> 116 </arrangement>
114 </codeStyleSettings> 117 </codeStyleSettings>
  118 + <codeStyleSettings language="kotlin">
  119 + <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
  120 + </codeStyleSettings>
115 </code_scheme> 121 </code_scheme>
116 </component> 122 </component>
  1 +<component name="ProjectCodeStyleConfiguration">
  2 + <state>
  3 + <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  4 + </state>
  5 +</component>
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7"> 3 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4 <output url="file://$PROJECT_DIR$/build/classes" /> 4 <output url="file://$PROJECT_DIR$/build/classes" />
5 </component> 5 </component>
6 <component name="ProjectType"> 6 <component name="ProjectType">
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 package="io.livekit.android"> 2 package="io.livekit.android">
3 3
4 - <application android:allowBackup="true"  
5 - android:label="@string/app_name" 4 + <application
  5 + android:allowBackup="true"
6 android:icon="@mipmap/ic_launcher" 6 android:icon="@mipmap/ic_launcher"
  7 + android:label="@string/app_name"
7 android:roundIcon="@mipmap/ic_launcher_round" 8 android:roundIcon="@mipmap/ic_launcher_round"
8 android:supportsRtl="true" 9 android:supportsRtl="true"
9 - android:theme="@style/AppTheme"/> 10 + android:theme="@style/AppTheme" />
10 </manifest> 11 </manifest>
@@ -2,13 +2,13 @@ @@ -2,13 +2,13 @@
2 xmlns:aapt="http://schemas.android.com/aapt" 2 xmlns:aapt="http://schemas.android.com/aapt"
3 android:width="108dp" 3 android:width="108dp"
4 android:height="108dp" 4 android:height="108dp"
5 - android:viewportHeight="108"  
6 - android:viewportWidth="108"> 5 + android:viewportWidth="108"
  6 + android:viewportHeight="108">
7 <path 7 <path
8 android:fillType="evenOdd" 8 android:fillType="evenOdd"
9 android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" 9 android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10 - android:strokeColor="#00000000"  
11 - android:strokeWidth="1"> 10 + android:strokeWidth="1"
  11 + android:strokeColor="#00000000">
12 <aapt:attr name="android:fillColor"> 12 <aapt:attr name="android:fillColor">
13 <gradient 13 <gradient
14 android:endX="78.5885" 14 android:endX="78.5885"
@@ -29,6 +29,6 @@ @@ -29,6 +29,6 @@
29 android:fillColor="#FFFFFF" 29 android:fillColor="#FFFFFF"
30 android:fillType="nonZero" 30 android:fillType="nonZero"
31 android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" 31 android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32 - android:strokeColor="#00000000"  
33 - android:strokeWidth="1" /> 32 + android:strokeWidth="1"
  33 + android:strokeColor="#00000000" />
34 </vector> 34 </vector>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<vector  
3 - android:height="108dp" 2 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
4 android:width="108dp" 3 android:width="108dp"
5 - android:viewportHeight="108" 4 + android:height="108dp"
6 android:viewportWidth="108" 5 android:viewportWidth="108"
7 - xmlns:android="http://schemas.android.com/apk/res/android">  
8 - <path android:fillColor="#008577"  
9 - android:pathData="M0,0h108v108h-108z"/>  
10 - <path android:fillColor="#00000000" android:pathData="M9,0L9,108"  
11 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
12 - <path android:fillColor="#00000000" android:pathData="M19,0L19,108"  
13 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
14 - <path android:fillColor="#00000000" android:pathData="M29,0L29,108"  
15 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
16 - <path android:fillColor="#00000000" android:pathData="M39,0L39,108"  
17 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
18 - <path android:fillColor="#00000000" android:pathData="M49,0L49,108"  
19 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
20 - <path android:fillColor="#00000000" android:pathData="M59,0L59,108"  
21 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
22 - <path android:fillColor="#00000000" android:pathData="M69,0L69,108"  
23 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
24 - <path android:fillColor="#00000000" android:pathData="M79,0L79,108"  
25 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
26 - <path android:fillColor="#00000000" android:pathData="M89,0L89,108"  
27 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
28 - <path android:fillColor="#00000000" android:pathData="M99,0L99,108"  
29 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
30 - <path android:fillColor="#00000000" android:pathData="M0,9L108,9"  
31 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
32 - <path android:fillColor="#00000000" android:pathData="M0,19L108,19"  
33 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
34 - <path android:fillColor="#00000000" android:pathData="M0,29L108,29"  
35 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
36 - <path android:fillColor="#00000000" android:pathData="M0,39L108,39"  
37 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
38 - <path android:fillColor="#00000000" android:pathData="M0,49L108,49"  
39 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
40 - <path android:fillColor="#00000000" android:pathData="M0,59L108,59"  
41 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
42 - <path android:fillColor="#00000000" android:pathData="M0,69L108,69"  
43 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
44 - <path android:fillColor="#00000000" android:pathData="M0,79L108,79"  
45 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
46 - <path android:fillColor="#00000000" android:pathData="M0,89L108,89"  
47 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
48 - <path android:fillColor="#00000000" android:pathData="M0,99L108,99"  
49 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
50 - <path android:fillColor="#00000000" android:pathData="M19,29L89,29"  
51 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
52 - <path android:fillColor="#00000000" android:pathData="M19,39L89,39"  
53 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
54 - <path android:fillColor="#00000000" android:pathData="M19,49L89,49"  
55 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
56 - <path android:fillColor="#00000000" android:pathData="M19,59L89,59"  
57 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
58 - <path android:fillColor="#00000000" android:pathData="M19,69L89,69"  
59 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
60 - <path android:fillColor="#00000000" android:pathData="M19,79L89,79"  
61 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
62 - <path android:fillColor="#00000000" android:pathData="M29,19L29,89"  
63 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
64 - <path android:fillColor="#00000000" android:pathData="M39,19L39,89"  
65 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
66 - <path android:fillColor="#00000000" android:pathData="M49,19L49,89"  
67 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
68 - <path android:fillColor="#00000000" android:pathData="M59,19L59,89"  
69 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
70 - <path android:fillColor="#00000000" android:pathData="M69,19L69,89"  
71 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>  
72 - <path android:fillColor="#00000000" android:pathData="M79,19L79,89"  
73 - android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> 6 + android:viewportHeight="108">
  7 + <path
  8 + android:fillColor="#008577"
  9 + android:pathData="M0,0h108v108h-108z" />
  10 + <path
  11 + android:fillColor="#00000000"
  12 + android:pathData="M9,0L9,108"
  13 + android:strokeWidth="0.8"
  14 + android:strokeColor="#33FFFFFF" />
  15 + <path
  16 + android:fillColor="#00000000"
  17 + android:pathData="M19,0L19,108"
  18 + android:strokeWidth="0.8"
  19 + android:strokeColor="#33FFFFFF" />
  20 + <path
  21 + android:fillColor="#00000000"
  22 + android:pathData="M29,0L29,108"
  23 + android:strokeWidth="0.8"
  24 + android:strokeColor="#33FFFFFF" />
  25 + <path
  26 + android:fillColor="#00000000"
  27 + android:pathData="M39,0L39,108"
  28 + android:strokeWidth="0.8"
  29 + android:strokeColor="#33FFFFFF" />
  30 + <path
  31 + android:fillColor="#00000000"
  32 + android:pathData="M49,0L49,108"
  33 + android:strokeWidth="0.8"
  34 + android:strokeColor="#33FFFFFF" />
  35 + <path
  36 + android:fillColor="#00000000"
  37 + android:pathData="M59,0L59,108"
  38 + android:strokeWidth="0.8"
  39 + android:strokeColor="#33FFFFFF" />
  40 + <path
  41 + android:fillColor="#00000000"
  42 + android:pathData="M69,0L69,108"
  43 + android:strokeWidth="0.8"
  44 + android:strokeColor="#33FFFFFF" />
  45 + <path
  46 + android:fillColor="#00000000"
  47 + android:pathData="M79,0L79,108"
  48 + android:strokeWidth="0.8"
  49 + android:strokeColor="#33FFFFFF" />
  50 + <path
  51 + android:fillColor="#00000000"
  52 + android:pathData="M89,0L89,108"
  53 + android:strokeWidth="0.8"
  54 + android:strokeColor="#33FFFFFF" />
  55 + <path
  56 + android:fillColor="#00000000"
  57 + android:pathData="M99,0L99,108"
  58 + android:strokeWidth="0.8"
  59 + android:strokeColor="#33FFFFFF" />
  60 + <path
  61 + android:fillColor="#00000000"
  62 + android:pathData="M0,9L108,9"
  63 + android:strokeWidth="0.8"
  64 + android:strokeColor="#33FFFFFF" />
  65 + <path
  66 + android:fillColor="#00000000"
  67 + android:pathData="M0,19L108,19"
  68 + android:strokeWidth="0.8"
  69 + android:strokeColor="#33FFFFFF" />
  70 + <path
  71 + android:fillColor="#00000000"
  72 + android:pathData="M0,29L108,29"
  73 + android:strokeWidth="0.8"
  74 + android:strokeColor="#33FFFFFF" />
  75 + <path
  76 + android:fillColor="#00000000"
  77 + android:pathData="M0,39L108,39"
  78 + android:strokeWidth="0.8"
  79 + android:strokeColor="#33FFFFFF" />
  80 + <path
  81 + android:fillColor="#00000000"
  82 + android:pathData="M0,49L108,49"
  83 + android:strokeWidth="0.8"
  84 + android:strokeColor="#33FFFFFF" />
  85 + <path
  86 + android:fillColor="#00000000"
  87 + android:pathData="M0,59L108,59"
  88 + android:strokeWidth="0.8"
  89 + android:strokeColor="#33FFFFFF" />
  90 + <path
  91 + android:fillColor="#00000000"
  92 + android:pathData="M0,69L108,69"
  93 + android:strokeWidth="0.8"
  94 + android:strokeColor="#33FFFFFF" />
  95 + <path
  96 + android:fillColor="#00000000"
  97 + android:pathData="M0,79L108,79"
  98 + android:strokeWidth="0.8"
  99 + android:strokeColor="#33FFFFFF" />
  100 + <path
  101 + android:fillColor="#00000000"
  102 + android:pathData="M0,89L108,89"
  103 + android:strokeWidth="0.8"
  104 + android:strokeColor="#33FFFFFF" />
  105 + <path
  106 + android:fillColor="#00000000"
  107 + android:pathData="M0,99L108,99"
  108 + android:strokeWidth="0.8"
  109 + android:strokeColor="#33FFFFFF" />
  110 + <path
  111 + android:fillColor="#00000000"
  112 + android:pathData="M19,29L89,29"
  113 + android:strokeWidth="0.8"
  114 + android:strokeColor="#33FFFFFF" />
  115 + <path
  116 + android:fillColor="#00000000"
  117 + android:pathData="M19,39L89,39"
  118 + android:strokeWidth="0.8"
  119 + android:strokeColor="#33FFFFFF" />
  120 + <path
  121 + android:fillColor="#00000000"
  122 + android:pathData="M19,49L89,49"
  123 + android:strokeWidth="0.8"
  124 + android:strokeColor="#33FFFFFF" />
  125 + <path
  126 + android:fillColor="#00000000"
  127 + android:pathData="M19,59L89,59"
  128 + android:strokeWidth="0.8"
  129 + android:strokeColor="#33FFFFFF" />
  130 + <path
  131 + android:fillColor="#00000000"
  132 + android:pathData="M19,69L89,69"
  133 + android:strokeWidth="0.8"
  134 + android:strokeColor="#33FFFFFF" />
  135 + <path
  136 + android:fillColor="#00000000"
  137 + android:pathData="M19,79L89,79"
  138 + android:strokeWidth="0.8"
  139 + android:strokeColor="#33FFFFFF" />
  140 + <path
  141 + android:fillColor="#00000000"
  142 + android:pathData="M29,19L29,89"
  143 + android:strokeWidth="0.8"
  144 + android:strokeColor="#33FFFFFF" />
  145 + <path
  146 + android:fillColor="#00000000"
  147 + android:pathData="M39,19L39,89"
  148 + android:strokeWidth="0.8"
  149 + android:strokeColor="#33FFFFFF" />
  150 + <path
  151 + android:fillColor="#00000000"
  152 + android:pathData="M49,19L49,89"
  153 + android:strokeWidth="0.8"
  154 + android:strokeColor="#33FFFFFF" />
  155 + <path
  156 + android:fillColor="#00000000"
  157 + android:pathData="M59,19L59,89"
  158 + android:strokeWidth="0.8"
  159 + android:strokeColor="#33FFFFFF" />
  160 + <path
  161 + android:fillColor="#00000000"
  162 + android:pathData="M69,19L69,89"
  163 + android:strokeWidth="0.8"
  164 + android:strokeColor="#33FFFFFF" />
  165 + <path
  166 + android:fillColor="#00000000"
  167 + android:pathData="M79,19L79,89"
  168 + android:strokeWidth="0.8"
  169 + android:strokeColor="#33FFFFFF" />
74 </vector> 170 </vector>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> 2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 - <background android:drawable="@drawable/ic_launcher_background"/>  
4 - <foreground android:drawable="@drawable/ic_launcher_foreground"/> 3 + <background android:drawable="@drawable/ic_launcher_background" />
  4 + <foreground android:drawable="@drawable/ic_launcher_foreground" />
5 </adaptive-icon> 5 </adaptive-icon>
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> 2 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3 - <background android:drawable="@drawable/ic_launcher_background"/>  
4 - <foreground android:drawable="@drawable/ic_launcher_foreground"/> 3 + <background android:drawable="@drawable/ic_launcher_background" />
  4 + <foreground android:drawable="@drawable/ic_launcher_foreground" />
5 </adaptive-icon> 5 </adaptive-icon>
1 # Project-wide Gradle settings. 1 # Project-wide Gradle settings.
2 -  
3 # IDE (e.g. Android Studio) users: 2 # IDE (e.g. Android Studio) users:
4 # Gradle settings configured through the IDE *will override* 3 # Gradle settings configured through the IDE *will override*
5 # any settings specified in this file. 4 # any settings specified in this file.
6 -  
7 # For more details on how to configure your build environment visit 5 # For more details on how to configure your build environment visit
8 # http://www.gradle.org/docs/current/userguide/build_environment.html 6 # http://www.gradle.org/docs/current/userguide/build_environment.html
9 -  
10 # Specifies the JVM arguments used for the daemon process. 7 # Specifies the JVM arguments used for the daemon process.
11 # The setting is particularly useful for tweaking memory settings. 8 # The setting is particularly useful for tweaking memory settings.
12 org.gradle.jvmargs=-Xmx1536m 9 org.gradle.jvmargs=-Xmx1536m
13 -  
14 # When configured, Gradle will run in incubating parallel mode. 10 # When configured, Gradle will run in incubating parallel mode.
15 # This option should only be used with decoupled projects. More details, visit 11 # This option should only be used with decoupled projects. More details, visit
16 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects 12 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
17 # org.gradle.parallel=true 13 # org.gradle.parallel=true
18 -  
19 # AndroidX package structure to make it clearer which packages are bundled with the 14 # AndroidX package structure to make it clearer which packages are bundled with the
20 # Android operating system, and which are packaged with your app's APK 15 # Android operating system, and which are packaged with your app's APK
21 # https://developer.android.com/topic/libraries/support-library/androidx-rn 16 # https://developer.android.com/topic/libraries/support-library/androidx-rn
22 android.useAndroidX=true 17 android.useAndroidX=true
23 # Automatically convert third-party libraries to use AndroidX 18 # Automatically convert third-party libraries to use AndroidX
24 android.enableJetifier=true 19 android.enableJetifier=true
25 -  
26 # Kotlin code style for this project: "official" or "obsolete": 20 # Kotlin code style for this project: "official" or "obsolete":
27 kotlin.code.style=official 21 kotlin.code.style=official