Skip to content

Commit 8933bb2

Browse files
author
moiling
committed
?
what happened?!
1 parent 5613fda commit 8933bb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2322
-2320
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Disable LF normalization for all files
2+
* -text

‎.gitignore

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
# built application files
2-
*.apk
3-
*.ap_
4-
5-
# files for the dex VM
6-
*.dex
7-
8-
# Java class files
9-
*.class
10-
11-
# generated files
12-
bin/
13-
gen/
14-
15-
# Local configuration file (sdk path, etc)
16-
local.properties
17-
18-
# Eclipse project files
19-
.classpath
20-
.project
21-
22-
# Proguard folder generated by Eclipse
23-
proguard/
24-
25-
# Intellij project files
26-
*.iml
27-
*.ipr
28-
*.iws
1+
# built application files
2+
*.apk
3+
*.ap_
4+
5+
# files for the dex VM
6+
*.dex
7+
8+
# Java class files
9+
*.class
10+
11+
# generated files
12+
bin/
13+
gen/
14+
15+
# Local configuration file (sdk path, etc)
16+
local.properties
17+
18+
# Eclipse project files
19+
.classpath
20+
.project
21+
22+
# Proguard folder generated by Eclipse
23+
proguard/
24+
25+
# Intellij project files
26+
*.iml
27+
*.ipr
28+
*.iws
2929
.idea/

‎.idea/copyright/profiles_settings.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/.gitignore

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# Generated files
2-
bin/
3-
gen/
4-
5-
# Gradle files
6-
.gradle/
7-
build/
8-
9-
# Local configuration file (sdk path, etc)
10-
local.properties
11-
12-
# Proguard folder generated by Eclipse
13-
proguard/
14-
15-
# Log Files
1+
# Generated files
2+
bin/
3+
gen/
4+
5+
# Gradle files
6+
.gradle/
7+
build/
8+
9+
# Local configuration file (sdk path, etc)
10+
local.properties
11+
12+
# Proguard folder generated by Eclipse
13+
proguard/
14+
15+
# Log Files
1616
*.log

‎app/build.gradle

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
apply plugin: 'com.android.application'
2-
3-
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
6-
7-
defaultConfig {
8-
applicationId "com.superbug.moi.cquptlife"
9-
minSdkVersion 14
10-
targetSdkVersion 22
11-
versionCode 1
12-
versionName "1.0"
13-
}
14-
buildTypes {
15-
release {
16-
minifyEnabled false
17-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18-
}
19-
}
20-
}
21-
22-
dependencies {
23-
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
compile 'com.android.support:appcompat-v7:22.2.0'
25-
compile 'com.android.support:cardview-v7:22.2.0'
26-
compile 'com.mcxiaoke.volley:library:1.0.16'
27-
compile 'com.jakewharton:butterknife:6.1.0'
28-
compile files('libs/jsoup-1.8.2.jar')
29-
compile 'com.android.support:design:22.2.0'
30-
compile 'com.balysv:material-ripple:1.0.2'
31-
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
32-
compile 'com.android.support:recyclerview-v7:22.2.0'
33-
}
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 22
5+
buildToolsVersion "22.0.1"
6+
7+
defaultConfig {
8+
applicationId "com.superbug.moi.cquptlife"
9+
minSdkVersion 14
10+
targetSdkVersion 22
11+
versionCode 1
12+
versionName "1.0"
13+
}
14+
buildTypes {
15+
release {
16+
minifyEnabled false
17+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
}
19+
}
20+
}
21+
22+
dependencies {
23+
compile fileTree(include: ['*.jar'], dir: 'libs')
24+
compile 'com.android.support:appcompat-v7:22.2.0'
25+
compile 'com.android.support:cardview-v7:22.2.0'
26+
compile 'com.mcxiaoke.volley:library:1.0.16'
27+
compile 'com.jakewharton:butterknife:6.1.0'
28+
compile files('libs/jsoup-1.8.2.jar')
29+
compile 'com.android.support:design:22.2.0'
30+
compile 'com.balysv:material-ripple:1.0.2'
31+
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
32+
compile 'com.android.support:recyclerview-v7:22.2.0'
33+
}

‎app/proguard-rules.pro

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Add project specific ProGuard rules here.
2-
# By default, the flags in this file are appended to flags specified
3-
# in D:\Tool\SDK\android-sdk/tools/proguard/proguard-android.txt
4-
# You can edit the include path and order by changing the proguardFiles
5-
# directive in build.gradle.
6-
#
7-
# For more details, see
8-
# http://developer.android.com/guide/developing/tools/proguard.html
9-
10-
# Add any project specific keep options here:
11-
12-
# If your project uses WebView with JS, uncomment the following
13-
# and specify the fully qualified class name to the JavaScript interface
14-
# class:
15-
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16-
# public *;
17-
#}
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in D:\Tool\SDK\android-sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}

‎app/src/androidTest/java/com/superbug/moi/cquptlife/ApplicationTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.superbug.moi.cquptlife;
2-
3-
import android.app.Application;
4-
import android.test.ApplicationTestCase;
5-
6-
/**
7-
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
8-
*/
9-
public class ApplicationTest extends ApplicationTestCase<Application> {
10-
public ApplicationTest() {
11-
super(Application.class);
12-
}
1+
package com.superbug.moi.cquptlife;
2+
3+
import android.app.Application;
4+
import android.test.ApplicationTestCase;
5+
6+
/**
7+
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
8+
*/
9+
public class ApplicationTest extends ApplicationTestCase<Application> {
10+
public ApplicationTest() {
11+
super(Application.class);
12+
}
1313
}

‎app/src/main/AndroidManifest.xml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.superbug.moi.cquptlife"
3-
xmlns:android="http://schemas.android.com/apk/res/android">
4-
5-
<uses-permission android:name="android.permission.INTERNET"/>
6-
7-
<application
8-
android:name=".app.APP"
9-
android:allowBackup="true"
10-
android:icon="@mipmap/ic_logo"
11-
android:label="@string/app_name"
12-
android:theme="@style/AppTheme">
13-
<activity
14-
android:name=".ui.activity.StudentActivity"
15-
android:label="@string/title_activity_student"
16-
android:screenOrientation="portrait">
17-
</activity>
18-
<activity
19-
android:name=".ui.activity.StudentInfoActivity"
20-
android:label="@string/title_activity_student_info"
21-
android:screenOrientation="portrait">
22-
</activity>
23-
<activity
24-
android:name=".ui.activity.HomeActivity"
25-
android:label="@string/app_name">
26-
<intent-filter>
27-
<action android:name="android.intent.action.MAIN"/>
28-
29-
<category android:name="android.intent.category.LAUNCHER"/>
30-
</intent-filter>
31-
</activity>
32-
</application>
33-
34-
</manifest>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest package="com.superbug.moi.cquptlife"
3+
xmlns:android="http://schemas.android.com/apk/res/android">
4+
5+
<uses-permission android:name="android.permission.INTERNET"/>
6+
7+
<application
8+
android:name=".app.APP"
9+
android:allowBackup="true"
10+
android:icon="@mipmap/ic_logo"
11+
android:label="@string/app_name"
12+
android:theme="@style/AppTheme">
13+
<activity
14+
android:name=".ui.activity.StudentActivity"
15+
android:label="@string/title_activity_student"
16+
android:screenOrientation="portrait">
17+
</activity>
18+
<activity
19+
android:name=".ui.activity.StudentInfoActivity"
20+
android:label="@string/title_activity_student_info"
21+
android:screenOrientation="portrait">
22+
</activity>
23+
<activity
24+
android:name=".ui.activity.HomeActivity"
25+
android:label="@string/app_name">
26+
<intent-filter>
27+
<action android:name="android.intent.action.MAIN"/>
28+
29+
<category android:name="android.intent.category.LAUNCHER"/>
30+
</intent-filter>
31+
</activity>
32+
</application>
33+
34+
</manifest>

0 commit comments

Comments
 (0)