Skip to content

Create triangle YipingPeng #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
YipingPeng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Create triangle YipingPeng #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions Autobot/Autobot.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Autobot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="jdk" jdkName="JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Autobot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
264 changes: 132 additions & 132 deletions Autobot/app/app.iml
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions ...ermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.autobot"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="15"
android:targetSdkVersion="29" />
<application
android:allowBackup="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"
android:debuggable="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme" >
<activity android:name="com.example.autobot.MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.autobot"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="15"
android:targetSdkVersion="29" />

<application
android:allowBackup="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"
android:debuggable="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme" >
<activity android:name="com.example.autobot.MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
56 changes: 28 additions & 28 deletions Autobot/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.autobot"
android:targetSandboxVersion="2"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="15"
android:targetSdkVersion="29" />
<application
android:allowBackup="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"
android:debuggable="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme" >
<activity android:name="com.example.autobot.MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.autobot"
android:targetSandboxVersion="2"
android:versionCode="1"
android:versionName="1.0" >

<uses-sdk
android:minSdkVersion="15"
android:targetSdkVersion="29" />

<application
android:allowBackup="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"
android:debuggable="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme" >
<activity android:name="com.example.autobot.MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
34 changes: 17 additions & 17 deletions ...uild/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@
6
7 <uses-sdk
8 android:minSdkVersion="15"
8-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml
8-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml
9 android:targetSdkVersion="29" />
9-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml
9-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml
10
11 <application
11-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:5:5-19:19
11-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:5:5-19:19
12 android:allowBackup="true"
12-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:6:9-35
12-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:6:9-35
13 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
13-->[androidx.core:core:1.1.0] C:\androidstudio\.gradle\caches\transforms-2\files-2.1\e9dab9c67c1ee3668e0bbf86c6d8cbd8\core-1.1.0\AndroidManifest.xml:24:18-86
13-->[androidx.core:core:1.1.0] /Users/crispeng/.gradle/caches/transforms-2/files-2.1/e9dab9c67c1ee3668e0bbf86c6d8cbd8/core-1.1.0/AndroidManifest.xml:24:18-86
14 android:debuggable="true"
15 android:icon="@mipmap/ic_launcher"
15-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:7:9-43
15-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:7:9-43
16 android:label="@string/app_name"
16-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:8:9-41
16-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:8:9-41
17 android:roundIcon="@mipmap/ic_launcher_round"
17-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:9:9-54
17-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:9:9-54
18 android:supportsRtl="true"
18-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:10:9-35
18-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:10:9-35
19 android:theme="@style/AppTheme" >
19-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:11:9-40
19-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:11:9-40
20 <activity android:name="com.example.autobot.MainActivity" >
20-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:12:9-18:20
20-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:12:19-47
20-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:12:9-18:20
20-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:12:19-47
21 <intent-filter>
21-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:13:13-17:29
21-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:13:13-17:29
22 <action android:name="android.intent.action.MAIN" />
22-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:14:17-69
22-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:14:25-66
22-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:14:17-69
22-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:14:25-66
23
24 <category android:name="android.intent.category.LAUNCHER" />
24-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:16:17-77
24-->C:\androidstudio\androidprogram\Autobot\app\src\main\AndroidManifest.xml:16:27-74
24-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:16:17-77
24-->/Users/crispeng/CMPUT301W20/Autobot/app/src/main/AndroidManifest.xml:16:27-74
25 </intent-filter>
26 </activity>
27 </application>
Expand Down
Loading