Skip to content

Commit

Permalink
update project
Browse files Browse the repository at this point in the history
  • Loading branch information
sucese committed May 3, 2017
1 parent 82ebd85 commit 96f3923
Show file tree
Hide file tree
Showing 17 changed files with 42 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"

defaultConfig {
applicationId "com.guoxiaoxing.android.framework.demo"
minSdkVersion 15
targetSdkVersion 25
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

}
buildTypes {
release {
Expand All @@ -20,12 +23,11 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile project(':library')
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
}
10 changes: 9 additions & 1 deletion demo/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@
# Add any project specific keep options here:

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class text to the JavaScript interface
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
31 changes: 12 additions & 19 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,25 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.guoxiaoxing.android.framework.demo">

<uses-permission android:text="android.permission.ACCESS_NETWORK_STATE" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:text=".MainActivity"
android:process="com.guoxiaoxing.main.process">
<application android:allowBackup="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=".MainActivity">
<intent-filter>
<action android:text="android.intent.action.MAIN" />
<action android:name="android.intent.action.MAIN" />

<category android:text="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:text=".application.ApplicationActivity" />
<activity android:text=".program.ProgramActivity" />
<activity android:text=".system.SystemActivity" />
<activity android:text=".application.activity.StartActivity" />
<activity android:name=".application.ApplicationActivity" />
<activity android:name=".program.ProgramActivity" />
<activity android:name=".system.SystemActivity" />
<activity android:name=".application.activity.StartActivity" />
<activity
android:text=".application.activity.SubInProcessActivity"
android:name=".application.activity.SubInProcessActivity"
android:process="com.guoxiaoxing.main.process" />
<activity
android:text=".application.activity.SubInNewProcessActivity"
android:name=".application.activity.SubInNewProcessActivity"
android:process="com.guoxiaoxing.new.process" />
</application>

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion demo/src/main/res/values-w820dp/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen text="activity_horizontal_margin">64dp</dimen>
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>
6 changes: 3 additions & 3 deletions demo/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color text="colorPrimary">#3F51B5</color>
<color text="colorPrimaryDark">#303F9F</color>
<color text="colorAccent">#FF4081</color>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
</resources>
4 changes: 2 additions & 2 deletions demo/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen text="activity_horizontal_margin">16dp</dimen>
<dimen text="activity_vertical_margin">16dp</dimen>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
</resources>
2 changes: 1 addition & 1 deletion demo/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string text="app_name">android-framework-source-code-analysis</string>
<string name="app_name">android-framework-source-code-analysis</string>
</resources>
10 changes: 5 additions & 5 deletions demo/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<resources>

<!-- Base application theme. -->
<style text="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
Base application theme.
<style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
<!-- Customize your theme here. -->
<item text="colorPrimary">@color/colorPrimary</item>
<item text="colorPrimaryDark">@color/colorPrimaryDark</item>
<item text="colorAccent">@color/colorAccent</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

</resources>
3 changes: 1 addition & 2 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

<application android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
>
android:supportsRtl="true">

</application>

Expand Down
2 changes: 1 addition & 1 deletion library/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string text="app_name">library</string>
<string name="app_name">library</string>
</resources>
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':demo', ':library'
include ':library', ':demo'

0 comments on commit 96f3923

Please sign in to comment.