Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf1c70a9

Browse files
committed
use replace fragments instead of add, fixes #11
1 parent646189f commitf1c70a9

File tree

9 files changed

+28
-30
lines changed

9 files changed

+28
-30
lines changed

‎CTF-Android.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<contenturl="file://$MODULE_DIR$">
5252
<excludeFolderurl="file://$MODULE_DIR$/.gradle" />
5353
</content>
54-
<orderEntrytype="inheritedJdk" />
54+
<orderEntrytype="jdk"jdkName="1.8"jdkType="JavaSDK" />
5555
<orderEntrytype="sourceFolder"forTests="false" />
5656
</component>
5757
</module>

‎CTF/CTF.iml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,20 +102,20 @@
102102
<sourceFolderurl="file://$MODULE_DIR$/src/main/kotlin"isTestSource="false" />
103103
<sourceFolderurl="file://$MODULE_DIR$/src/main/rs"isTestSource="false" />
104104
<sourceFolderurl="file://$MODULE_DIR$/src/main/shaders"isTestSource="false" />
105-
<sourceFolderurl="file://$MODULE_DIR$/src/test/res"type="java-test-resource" />
106-
<sourceFolderurl="file://$MODULE_DIR$/src/test/resources"type="java-test-resource" />
107-
<sourceFolderurl="file://$MODULE_DIR$/src/test/assets"type="java-test-resource" />
108-
<sourceFolderurl="file://$MODULE_DIR$/src/test/aidl"isTestSource="true" />
109-
<sourceFolderurl="file://$MODULE_DIR$/src/test/java"isTestSource="true" />
110-
<sourceFolderurl="file://$MODULE_DIR$/src/test/rs"isTestSource="true" />
111-
<sourceFolderurl="file://$MODULE_DIR$/src/test/shaders"isTestSource="true" />
112105
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/res"type="java-test-resource" />
113106
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/resources"type="java-test-resource" />
114107
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/assets"type="java-test-resource" />
115108
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/aidl"isTestSource="true" />
116109
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/java"isTestSource="true" />
117110
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/rs"isTestSource="true" />
118111
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/shaders"isTestSource="true" />
112+
<sourceFolderurl="file://$MODULE_DIR$/src/test/res"type="java-test-resource" />
113+
<sourceFolderurl="file://$MODULE_DIR$/src/test/resources"type="java-test-resource" />
114+
<sourceFolderurl="file://$MODULE_DIR$/src/test/assets"type="java-test-resource" />
115+
<sourceFolderurl="file://$MODULE_DIR$/src/test/aidl"isTestSource="true" />
116+
<sourceFolderurl="file://$MODULE_DIR$/src/test/java"isTestSource="true" />
117+
<sourceFolderurl="file://$MODULE_DIR$/src/test/rs"isTestSource="true" />
118+
<sourceFolderurl="file://$MODULE_DIR$/src/test/shaders"isTestSource="true" />
119119
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/assets" />
120120
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/blame" />
121121
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -127,9 +127,12 @@
127127
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
128128
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
129129
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
130+
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/jack" />
130131
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/jniLibs" />
131132
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/manifests" />
132133
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/multi-dex" />
134+
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/packaged" />
135+
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
133136
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/reload-dex" />
134137
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/res" />
135138
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -150,6 +153,7 @@
150153
<orderEntrytype="library"exported=""name="materialize-1.0.1"level="project" />
151154
<orderEntrytype="library"exported=""name="rxandroid-2.0.1"level="project" />
152155
<orderEntrytype="library"exported=""name="library-1.3.0"level="project" />
156+
<orderEntrytype="library"exported=""name="capsule-6b9d1df027"level="project" />
153157
<orderEntrytype="library"exported=""scope="TEST"name="multidex-instrumentation-1.0.1"level="project" />
154158
<orderEntrytype="library"exported=""name="SearchView-d24ad07b9b"level="project" />
155159
<orderEntrytype="library"exported=""name="reactive-streams-1.0.0"level="project" />
@@ -197,12 +201,12 @@
197201
<orderEntrytype="library"exported=""scope="TEST"name="hamcrest-core-1.3"level="project" />
198202
<orderEntrytype="library"exported=""name="timber-4.5.1"level="project" />
199203
<orderEntrytype="library"exported=""name="logging-interceptor-3.6.0"level="project" />
200-
<orderEntrytype="library"exported=""name="capsule-bbc85cead1355ed484d06d42dc46a67a47eec495"level="project" />
201204
<orderEntrytype="library"exported=""scope="TEST"name="junit-4.12"level="project" />
202205
<orderEntrytype="library"exported=""name="butterknife-8.5.1"level="project" />
203206
<orderEntrytype="library"exported=""name="recyclerview-v7-25.3.0"level="project" />
204207
<orderEntrytype="library"exported=""name="appcompat-v7-25.3.0"level="project" />
205208
<orderEntrytype="library"exported=""name="animated-vector-drawable-25.3.0"level="project" />
206209
<orderEntrytype="library"exported=""name="iconics-core-2.8.2"level="project" />
210+
<orderEntrytype="library"exported=""name="android-android-25"level="project" />
207211
</component>
208212
</module>

‎CTF/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ tasks.whenTaskAdded { task ->
3232
android {
3333
compileSdkVersionInteger.parseInt(project.TARGET_SDK)
3434
buildToolsVersion project.BUILD_TOOLS
35-
35+
3636
defaultConfig {
3737
applicationId"${project.APP_GROUP}."+ project.APP_ID.toLowerCase()
3838
minSdkVersionInteger.parseInt(project.MIN_SDK)
@@ -50,7 +50,7 @@ android {
5050
applicationVariants.all {variant->
5151
variant.outputs.each {output->
5252
output.outputFile=newFile(output.outputFile.parent,
53-
"CTF-Android.apk")
53+
"CTF-Android-${variant.buildType.name}.apk")
5454
}
5555
}
5656

@@ -67,23 +67,23 @@ android {
6767
debug {
6868
applicationIdSuffix".debug"
6969
versionNameSuffix"-debug"
70-
resValue"string","authenticator_account_type","ca.mcgill.science.ctf.debug.StudentAccount"
71-
resValue"string","authenticator_token_type","ca.mcgill.science.ctf.debug.TepidToken"
70+
resValue"string","authenticator_account_type","${project.APP_GROUP}."+ project.APP_ID.toLowerCase()+".debug.StudentAccount"
71+
resValue"string","authenticator_token_type","${project.APP_GROUP}."+ project.APP_ID.toLowerCase()+".debug.TepidToken"
7272
resValue"string","app_name","CTF Debug"
7373
}
7474
releaseTest {//just like release, but with our test keys
7575
applicationIdSuffix".test"
7676
signingConfig signingConfigs.test
7777
versionNameSuffix"-test"
78-
resValue"string","authenticator_account_type","ca.mcgill.science.ctf.test.StudentAccount"
79-
resValue"string","authenticator_token_type","ca.mcgill.science.ctf.test.TepidToken"
78+
resValue"string","authenticator_account_type","${project.APP_GROUP}."+ project.APP_ID.toLowerCase()+".test.StudentAccount"
79+
resValue"string","authenticator_token_type","${project.APP_GROUP}."+ project.APP_ID.toLowerCase()+".test.TepidToken"
8080
resValue"string","app_name","CTF Test"
8181
}
8282
release {
8383
minifyEnabledfalse
8484
resValue"string","app_name","CTF"
85-
resValue"string","authenticator_account_type","ca.mcgill.science.ctf.StudentAccount"
86-
resValue"string","authenticator_token_type","ca.mcgill.science.ctf.TepidToken"
85+
resValue"string","authenticator_account_type","${project.APP_GROUP}."+ project.APP_ID.toLowerCase()+".StudentAccount"
86+
resValue"string","authenticator_token_type","${project.APP_GROUP}."+ project.APP_ID.toLowerCase()+".TepidToken"
8787
proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
8888
}
8989
}
@@ -112,7 +112,7 @@ dependencies {
112112
testCompile'junit:junit:4.12'
113113

114114
//Framework lib with android support libraries and eventbus
115-
compile('ca.allanwang:capsule:bbc85cead1355ed484d06d42dc46a67a47eec495@aar') {
115+
compile('ca.allanwang:capsule:6b9d1df027@aar') {
116116
transitive=true;
117117
}
118118

‎CTF/src/main/java/ca/mcgill/science/ctf/fragments/PreTicketFragment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
packageca.mcgill.science.ctf.fragments;
22

3-
importandroid.content.Context;
43
importandroid.os.Bundle;
54
importandroid.support.annotation.CallSuper;
65
importandroid.support.annotation.Nullable;
@@ -123,8 +122,8 @@ public void onDestroyView() {
123122
}
124123

125124
@Override
126-
publicvoidonStart() {
127-
super.onStart();
125+
publicvoidonResume() {
126+
super.onResume();
128127
EventBus.getDefault().post(newCFabEvent(GoogleMaterial.Icon.gmd_send,v -> {
129128
((MainActivity)getContext()).addFragment(TicketFragment.getInstance(user,problemText.getText().toString(),printer));
130129
}));

‎build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ allprojects {
2727
}
2828
}
2929

30-
project.ext.VERSION_CODE=VERSION_NAME.replace(".","")// play it safe; avoid suffixes
31-
3230
taskclean(type:Delete) {
3331
delete rootProject.buildDir
3432
}
54.8 KB
Loading
145 KB
Loading

‎generate-apk-release.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#create a new directory that will contain our generated apk
44
mkdir$HOME/CTFA/
55
# copy generated apk from build folder to the folder just created
6-
cp -R CTF/build/outputs/apk/CTF-Android.apk$HOME/CTFA/
6+
cp -R CTF/build/outputs/apk/CTF-Android-releaseTest.apk$HOME/CTFA/
77

88
# go to home and setup git
99
echo"Clone Git"
@@ -30,6 +30,6 @@ API_JSON=$(printf '{"tag_name": "v%s","target_commitish": "master","name": "v%s"
3030
newRelease=$(curl --data"$API_JSON" https://api.github.com/repos/CTFMcGill/CTFMcGill.github.io/releases?access_token=$GITHUB_API_KEY)
3131
rID=`echo$newRelease| jq".id"`
3232
echo"Push apk to$rID"
33-
curl"https://uploads.github.com/repos/CTFMcGill/CTFMcGill.github.io/releases/${rID}/assets?access_token=${GITHUB_API_KEY}&name=CTFA-Test-v${TRAVIS_BUILD_NUMBER}.apk" --header'Content-Type: application/zip' --upload-file CTFA/CTF-Android.apk -X POST
33+
curl"https://uploads.github.com/repos/CTFMcGill/CTFMcGill.github.io/releases/${rID}/assets?access_token=${GITHUB_API_KEY}&name=CTFA-Test-v${TRAVIS_BUILD_NUMBER}.apk" --header'Content-Type: application/zip' --upload-file CTFA/CTF-Android-releaseTest.apk -X POST
3434

3535
echo -e"Done\n"

‎gradle.properties‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
# Project-wide Gradle settings.
2-
32
# IDE (e.g. Android Studio) users:
43
# Gradle settings configured through the IDE *will override*
54
# any settings specified in this file.
6-
75
# For more details on how to configure your build environment visit
86
# http://www.gradle.org/docs/current/userguide/build_environment.html
9-
107
# Specifies the JVM arguments used for the daemon process.
118
# The setting is particularly useful for tweaking memory settings.
129
# Default value: -Xmx10248m -XX:MaxPermSize=256m
1310
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14-
1511
# When configured, Gradle will run in incubating parallel mode.
1612
# This option should only be used with decoupled projects. More details, visit
1713
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -22,4 +18,5 @@ MIN_SDK=17
2218
TARGET_SDK=25
2319
BUILD_TOOLS=25.0.2
2420
ANDROID_SUPPORT_LIBS=25.3.0
25-
VERSION_NAME=1.2
21+
VERSION_NAME=1.2
22+
VERSION_CODE=5

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp