diff --git a/DanmakuFlameMaster/build.gradle b/DanmakuFlameMaster/build.gradle index 7f105fb1..07ab0b2c 100644 --- a/DanmakuFlameMaster/build.gradle +++ b/DanmakuFlameMaster/build.gradle @@ -22,11 +22,8 @@ buildscript { classpath 'com.android.tools.build:gradle:0.5+' } } -apply plugin: 'android' - -dependencies { - compile files('libs/android-support-v4.jar') -} +//apply plugin: 'android' +apply plugin: 'android-library' android { compileSdkVersion 17 diff --git a/DanmakuFlameMaster/src/main/project.properties b/DanmakuFlameMaster/src/main/project.properties new file mode 100644 index 00000000..137f19ac --- /dev/null +++ b/DanmakuFlameMaster/src/main/project.properties @@ -0,0 +1,15 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt + +# Project target. +target=android-17 +android.library=true diff --git a/DanmakuFlameMaster/src/main/res/drawable-hdpi/test.jpg b/DanmakuFlameMaster/src/main/res/drawable-hdpi/test.jpg deleted file mode 100644 index e3e09bca..00000000 Binary files a/DanmakuFlameMaster/src/main/res/drawable-hdpi/test.jpg and /dev/null differ diff --git a/Sample/build.gradle b/Sample/build.gradle new file mode 100644 index 00000000..f3a6fb54 --- /dev/null +++ b/Sample/build.gradle @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2013 Chen Hui + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + maven { url 'http://repo1.maven.org/maven2' } + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5+' + } +} +apply plugin: 'android' + +dependencies { + compile project(':DanmakuFlameMaster') +} +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 16 + } +} diff --git a/Sample/src/main/AndroidManifest.xml b/Sample/src/main/AndroidManifest.xml new file mode 100644 index 00000000..d781a33c --- /dev/null +++ b/Sample/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + diff --git a/Sample/src/main/ic_launcher-web.png b/Sample/src/main/ic_launcher-web.png new file mode 100644 index 00000000..4b14629c Binary files /dev/null and b/Sample/src/main/ic_launcher-web.png differ diff --git a/Sample/src/main/java/com/sample/MainActivity.java b/Sample/src/main/java/com/sample/MainActivity.java new file mode 100644 index 00000000..b7ee3b16 --- /dev/null +++ b/Sample/src/main/java/com/sample/MainActivity.java @@ -0,0 +1,23 @@ +package com.sample; + +import android.os.Bundle; +import android.app.Activity; +import android.view.Menu; + +public class MainActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main1); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + +} diff --git a/Sample/src/main/project.properties b/Sample/src/main/project.properties new file mode 100644 index 00000000..8228e589 --- /dev/null +++ b/Sample/src/main/project.properties @@ -0,0 +1,15 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt + +# Project target. +target=android-17 +android.library.reference.1=../../../DanmakuFlameMaster/src/main diff --git a/Sample/src/main/res/drawable-hdpi/ic_launcher.png b/Sample/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 00000000..c1b44ccc Binary files /dev/null and b/Sample/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/Sample/src/main/res/drawable-mdpi/ic_launcher.png b/Sample/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 00000000..a1bf709d Binary files /dev/null and b/Sample/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/Sample/src/main/res/drawable-xhdpi/ic_launcher.png b/Sample/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 00000000..3b5ae5b2 Binary files /dev/null and b/Sample/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/Sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/Sample/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..b7df51b1 Binary files /dev/null and b/Sample/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/Sample/src/main/res/layout/activity_main1.xml b/Sample/src/main/res/layout/activity_main1.xml new file mode 100644 index 00000000..7f6c0eec --- /dev/null +++ b/Sample/src/main/res/layout/activity_main1.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/Sample/src/main/res/menu/main.xml b/Sample/src/main/res/menu/main.xml new file mode 100644 index 00000000..f3b10b6c --- /dev/null +++ b/Sample/src/main/res/menu/main.xml @@ -0,0 +1,6 @@ + + + diff --git a/Sample/src/main/res/values-sw600dp/dimens.xml b/Sample/src/main/res/values-sw600dp/dimens.xml new file mode 100644 index 00000000..886b05fa --- /dev/null +++ b/Sample/src/main/res/values-sw600dp/dimens.xml @@ -0,0 +1,4 @@ + + + diff --git a/Sample/src/main/res/values-sw720dp-land/dimens.xml b/Sample/src/main/res/values-sw720dp-land/dimens.xml new file mode 100644 index 00000000..00059fc5 --- /dev/null +++ b/Sample/src/main/res/values-sw720dp-land/dimens.xml @@ -0,0 +1,5 @@ + + + 128dp + diff --git a/Sample/src/main/res/values-v11/styles.xml b/Sample/src/main/res/values-v11/styles.xml new file mode 100644 index 00000000..3c02242a --- /dev/null +++ b/Sample/src/main/res/values-v11/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/Sample/src/main/res/values-v14/styles.xml b/Sample/src/main/res/values-v14/styles.xml new file mode 100644 index 00000000..a91fd037 --- /dev/null +++ b/Sample/src/main/res/values-v14/styles.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/Sample/src/main/res/values/dimens.xml b/Sample/src/main/res/values/dimens.xml new file mode 100644 index 00000000..47c82246 --- /dev/null +++ b/Sample/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/Sample/src/main/res/values/strings.xml b/Sample/src/main/res/values/strings.xml new file mode 100644 index 00000000..49930e35 --- /dev/null +++ b/Sample/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + + + Sample + Settings + Hello world! + + diff --git a/Sample/src/main/res/values/styles.xml b/Sample/src/main/res/values/styles.xml new file mode 100644 index 00000000..6ce89c7b --- /dev/null +++ b/Sample/src/main/res/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/settings.gradle b/settings.gradle index 8f24f00f..6a2be922 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':DanmakuFlameMaster' +include ':DanmakuFlameMaster', ':Sample'