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

Commit8c7d15b

Browse files
committed
allow refunding
1 parent7f4f4e3 commit8c7d15b

File tree

24 files changed

+449
-54
lines changed

24 files changed

+449
-54
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ before_install:
1212
-chmod +x gradlew
1313
-export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
1414
-export JAVA_HOME=$JAVA8_HOME
15+
-echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
16+
-echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
1517
after_success:
1618
-chmod +x ./generate-apk-release.sh
1719
-"./generate-apk-release.sh"

‎CTF/CTF.iml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,22 +102,23 @@
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/androidTest/res"type="java-test-resource" />
106-
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/resources"type="java-test-resource" />
107-
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/assets"type="java-test-resource" />
108-
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/aidl"isTestSource="true" />
109-
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/java"isTestSource="true" />
110-
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/rs"isTestSource="true" />
111-
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/shaders"isTestSource="true" />
112105
<sourceFolderurl="file://$MODULE_DIR$/src/test/res"type="java-test-resource" />
113106
<sourceFolderurl="file://$MODULE_DIR$/src/test/resources"type="java-test-resource" />
114107
<sourceFolderurl="file://$MODULE_DIR$/src/test/assets"type="java-test-resource" />
115108
<sourceFolderurl="file://$MODULE_DIR$/src/test/aidl"isTestSource="true" />
116109
<sourceFolderurl="file://$MODULE_DIR$/src/test/java"isTestSource="true" />
117110
<sourceFolderurl="file://$MODULE_DIR$/src/test/rs"isTestSource="true" />
118111
<sourceFolderurl="file://$MODULE_DIR$/src/test/shaders"isTestSource="true" />
112+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/res"type="java-test-resource" />
113+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/resources"type="java-test-resource" />
114+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/assets"type="java-test-resource" />
115+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/aidl"isTestSource="true" />
116+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/java"isTestSource="true" />
117+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/rs"isTestSource="true" />
118+
<sourceFolderurl="file://$MODULE_DIR$/src/androidTest/shaders"isTestSource="true" />
119119
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/assets" />
120120
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/blame" />
121+
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/builds" />
121122
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/classes" />
122123
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/incremental" />
123124
<excludeFolderurl="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -165,6 +166,7 @@
165166
<orderEntrytype="library"exported=""name="support-annotations-25.3.0"level="project" />
166167
<orderEntrytype="library"exported=""name="support-vector-drawable-25.3.0"level="project" />
167168
<orderEntrytype="library"exported=""name="stetho-okhttp3-1.4.2"level="project" />
169+
<orderEntrytype="library"exported=""name="constraint-layout-1.0.2"level="project" />
168170
<orderEntrytype="library"exported=""name="design-25.3.0"level="project" />
169171
<orderEntrytype="library"exported=""name="cardview-v7-25.3.0"level="project" />
170172
<orderEntrytype="library"exported=""name="crashlytics-core-2.3.14"level="project" />
@@ -181,6 +183,7 @@
181183
<orderEntrytype="library"exported=""name="google-material-typeface-3.0.1.0.original"level="project" />
182184
<orderEntrytype="library"exported=""name="butterknife-annotations-8.5.1"level="project" />
183185
<orderEntrytype="library"exported=""name="kotlin-stdlib-jre7-1.1.1"level="project" />
186+
<orderEntrytype="library"exported=""name="constraint-layout-solver-1.0.2"level="project" />
184187
<orderEntrytype="library"exported=""name="beta-1.2.2"level="project" />
185188
<orderEntrytype="library"exported=""name="annotations-13.0"level="project" />
186189
<orderEntrytype="library"exported=""name="gson-2.7"level="project" />

‎CTF/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ dependencies {
116116
transitive=true;
117117
}
118118

119+
compile'com.android.support.constraint:constraint-layout:1.0.2'
120+
119121
//compile 'com.lapism:searchview:4.0'
120122
compile'com.github.AllanWang:SearchView:d24ad07b9b'
121123

‎CTF/src/main/java/ca/mcgill/science/ctf/MainActivity.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939
importca.mcgill.science.ctf.auth.AccountUtil;
4040
importca.mcgill.science.ctf.fragments.BaseFragment;
4141
importca.mcgill.science.ctf.fragments.DashboardFragment;
42-
importca.mcgill.science.ctf.fragments.MyAccountFragment;
42+
importca.mcgill.science.ctf.fragments.AccountFragment;
4343
importca.mcgill.science.ctf.fragments.PreTicketFragment;
44-
importca.mcgill.science.ctf.fragments.ReportProblemFragment;
4544
importca.mcgill.science.ctf.fragments.SettingsFragment;
4645
importca.mcgill.science.ctf.utils.Preferences;
4746
importca.mcgill.science.ctf.utils.Utils;
@@ -164,10 +163,10 @@ protected CDrawerItem[] getDrawerItems() {
164163
returnnewCDrawerItem[]{
165164
newTepidDrawerItem(R.string.dashboard,GoogleMaterial.Icon.gmd_dashboard,DashboardFragment::new),
166165
// new TepidDrawerItem(R.string.roominfo, GoogleMaterial.Icon.gmd_weekend, new RoomMapFragment()),
167-
newTepidDrawerItem(R.string.userinfo,GoogleMaterial.Icon.gmd_person,MyAccountFragment::new),
166+
newTepidDrawerItem(R.string.userinfo,GoogleMaterial.Icon.gmd_person,AccountFragment::new),
168167
newTepidDrawerItem(R.string.ticket,GoogleMaterial.Icon.gmd_bug_report,PreTicketFragment::new),
169-
newTepidDrawerItem(R.string.settings,GoogleMaterial.Icon.gmd_settings,SettingsFragment::new),
170-
newTepidDrawerItem(R.string.reportproblem,GoogleMaterial.Icon.gmd_error,ReportProblemFragment::new)
168+
newTepidDrawerItem(R.string.settings,GoogleMaterial.Icon.gmd_settings,SettingsFragment::new)
169+
// new TepidDrawerItem(R.string.reportproblem, GoogleMaterial.Icon.gmd_error, ReportProblemFragment::new)
171170
};
172171
}
173172

@@ -181,7 +180,7 @@ private class TepidDrawerItem extends DrawerItem {
181180
@Nullable
182181
@Override
183182
publicFragmentgetFragment() {
184-
returnBaseFragment.getFragment(mToken,super.getFragment());
183+
returnBaseFragment.getFragment(mToken,null,super.getFragment());
185184
}
186185
}
187186

‎CTF/src/main/java/ca/mcgill/science/ctf/activities/SearchActivity.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
importca.mcgill.science.ctf.api.SingleCallRequest;
2525
importca.mcgill.science.ctf.api.TEPIDAPI;
2626
importca.mcgill.science.ctf.api.UserQuery;
27+
importca.mcgill.science.ctf.fragments.AccountFragment;
28+
importca.mcgill.science.ctf.fragments.BaseFragment;
2729
importio.reactivex.android.schedulers.AndroidSchedulers;
2830
importio.reactivex.observers.DisposableObserver;
2931
importretrofit2.Call;
@@ -75,28 +77,27 @@ public boolean onQueryTextChange(String newText) {
7577
});
7678

7779
mSearchAdapter =newSearchAdapter(this);
78-
mSearchAdapter.addOnItemClickListener(newSearchAdapter.OnItemClickListener() {
79-
@Override
80-
publicvoidonItemClick(Viewview,intposition) {
81-
if (mQueryResults ==null ||mQueryResults.size() <=position)
82-
return;//no results actually exist
83-
UserQueryquery =mQueryResults.get(position);
84-
//TextView textView = (TextView) view.findViewById(R.id.textView_item_text);
85-
//TODO reroute to actual fragment rather than dialog; this is just for display
86-
newMaterialDialog.Builder(SearchActivity.this)
87-
.title(query.getDisplayName())
88-
.content(query.getShortUser() +"\n" +query.getEmail() +"\nColor printing: " + (query.getColorPrinting() ?"Enabled" :"Disabled"))
89-
.show();
90-
mSearchView.close(false);
91-
}
80+
mSearchAdapter.addOnItemClickListener((view,position) -> {
81+
if (mQueryResults ==null ||mQueryResults.size() <=position)
82+
return;//no results actually exist
83+
UserQueryquery =mQueryResults.get(position);
84+
switchFragment(BaseFragment.getFragment(token,query.getShortUser(),newAccountFragment()));
85+
//TextView textView = (TextView) view.findViewById(R.id.textView_item_text);
86+
//TODO reroute to actual fragment rather than dialog; this is just for display
87+
// new MaterialDialog.Builder(SearchActivity.this)
88+
// .title(query.getDisplayName())
89+
// .content(query.getShortUser() + "\n" + query.getEmail() + "\nColor printing: " + (query.getColorPrinting() ? "Enabled" : "Disabled"))
90+
// .show();
91+
mSearchView.close(false);
9292
});
9393
mSearchView.setAdapter(mSearchAdapter);
9494
}
9595

9696
privateDisposableObserver<TextViewTextChangeEvent>getSearchObserver() {
9797
returnnewDisposableObserver<TextViewTextChangeEvent>() {
9898
@Override
99-
publicvoidonComplete() { }
99+
publicvoidonComplete() {
100+
}
100101

101102
@Override
102103
publicvoidonError(Throwablee) {

‎CTF/src/main/java/ca/mcgill/science/ctf/fragments/MyAccountFragment.java‎renamed to ‎CTF/src/main/java/ca/mcgill/science/ctf/fragments/AccountFragment.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
importjava.util.List;
77

88
importca.allanwang.swiperecyclerview.library.interfaces.ISwipeRecycler;
9-
importca.allanwang.swiperecyclerview.library.items.PairItem;
109
importca.mcgill.science.ctf.R;
1110
importca.mcgill.science.ctf.api.ITEPID;
1211
importca.mcgill.science.ctf.api.PrintData;
12+
importca.mcgill.science.ctf.iitems.PrintJobItem;
1313
importretrofit2.Call;
1414

15-
publicclassMyAccountFragmentextendsBaseFragment<PairItem,List<PrintData>> {
15+
publicclassAccountFragmentextendsBaseFragment<PrintJobItem,List<PrintData>> {
1616

1717
// @BindView(R.id.my_account_quota)
1818
// TextView quotaView;
@@ -23,6 +23,7 @@ public class MyAccountFragment extends BaseFragment<PairItem, List<PrintData>> {
2323
// @BindView(R.id.change_nick)
2424
// Button changeNickView;
2525
// @BindView(R.id.my_account_color)
26+
2627
// AppCompatCheckBox turnColor;
2728

2829
@Override
@@ -37,10 +38,20 @@ protected Call<List<PrintData>> getAPICall(ITEPID api) {
3738

3839
@Override
3940
protectedvoidonResponseReceived(@NonNullList<PrintData>body,ISwipeRecycler.OnRefreshStatusonRefreshStatus) {
40-
List<PairItem>items =newArrayList<>();
41+
List<PrintJobItem>items =newArrayList<>();
4142
for (PrintDataprint :body)
42-
items.add(print.getPairData());
43+
items.add(newPrintJobItem(print));
4344
mAdapter.add(items);
45+
mAdapter.withItemEvent(newPrintJobItem.PrintJobClickEvent());
46+
}
47+
48+
@Override
49+
protectedvoidonSilentResponseReceived(@NonNullList<PrintData>body) {
50+
List<PrintJobItem>items =newArrayList<>();
51+
for (PrintDataprint :body)
52+
items.add(newPrintJobItem(print));
53+
mAdapter.setNewList(items);
54+
mAdapter.withItemEvent(newPrintJobItem.PrintJobClickEvent());
4455
}
4556

4657
}

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ public abstract class BaseFragment<I extends IItem, C> extends CapsuleSRVFragmen
4141

4242
privateUnbinderunbinder;
4343
privateCall<C>mCall;
44-
privatestaticfinalStringTAG_TOKEN ="auth_token";
44+
privatestaticfinalStringTAG_TOKEN ="auth_token",TAG_SHORT_USER ="short_user";
4545
protectedITEPIDapi;
4646

47-
publicstaticFragmentgetFragment(Stringtoken,Fragmentfragment) {
47+
publicstaticFragmentgetFragment(Stringtoken,StringshortUser,Fragmentfragment) {
4848
if (fragment ==null)returnnull;
4949
Bundleargs =newBundle();
5050
args.putString(TAG_TOKEN,token);
51+
args.putString(TAG_SHORT_USER,shortUser);
5152
fragment.setArguments(args);
5253
returnfragment;
5354
}
@@ -57,6 +58,11 @@ public static String getToken(Fragment fragment) {
5758
returnfragment.getArguments().getString(TAG_TOKEN);
5859
}
5960

61+
publicstaticStringgetShortUser(Fragmentfragment) {
62+
if (fragment.getArguments() ==null)returnnull;
63+
returnfragment.getArguments().getString(TAG_SHORT_USER);
64+
}
65+
6066
publicstaticITEPIDgetAPI(Fragmentfragment) {
6167
returnTEPIDAPI.Companion.getInstance(getToken(fragment),fragment.getContext());
6268
}
@@ -95,7 +101,7 @@ protected void configAdapter(AnimationAdapter<I> adapter) {
95101
@Override
96102
@CallSuper
97103
protectedvoidconfigSRV(finalSwipeRecyclerViewsrv) {
98-
srv.getSwipeRefreshLayout().setColorSchemeColors(ContextCompat.getColor(getContext(),R.color.accent));
104+
// srv.getSwipeRefreshLayout().setColorSchemeColors(ContextCompat.getColor(getContext(), R.color.accent));
99105
srv.setOnRefreshStatus(newISwipeRecycler.OnRefreshStatus() {
100106
@Override
101107
publicvoidonSuccess() {
@@ -192,7 +198,8 @@ protected void onSilentResponseReceived(@NonNull C body) {
192198
}
193199

194200
protectedStringgetShortUser() {
195-
returnAccountUtil.getShortUser();
201+
if (BaseFragment.getShortUser(this) ==null)returnAccountUtil.getShortUser();
202+
returnBaseFragment.getShortUser(this);
196203
}
197204

198205
}

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

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

3+
importandroid.content.Context;
34
importandroid.os.Bundle;
45
importandroid.support.annotation.CallSuper;
56
importandroid.support.annotation.Nullable;
@@ -122,8 +123,8 @@ public void onDestroyView() {
122123
}
123124

124125
@Override
125-
publicvoidonResume() {
126-
super.onResume();
126+
publicvoidonAttach(Contextcontext) {
127+
super.onAttach(context);
127128
EventBus.getDefault().post(newCFabEvent(GoogleMaterial.Icon.gmd_send,v -> {
128129
((MainActivity)getContext()).addFragment(TicketFragment.getInstance(user,problemText.getText().toString(),printer));
129130
}));

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
packageca.mcgill.science.ctf.fragments;
22

33
importandroid.app.Activity;
4+
importandroid.content.Context;
45
importandroid.content.res.Configuration;
56
importandroid.os.Build;
67
importandroid.os.Bundle;
78
importandroid.support.v7.preference.Preference;
89
importandroid.support.v7.preference.PreferenceFragmentCompat;
910

11+
importcom.mikepenz.google_material_typeface_library.GoogleMaterial;
12+
13+
importorg.greenrobot.eventbus.EventBus;
14+
1015
importjava.util.Locale;
1116

17+
importca.allanwang.capsule.library.event.CFabEvent;
1218
importca.mcgill.science.ctf.MainActivity;
1319
importca.mcgill.science.ctf.R;
1420
importca.mcgill.science.ctf.api.ITEPID;
@@ -115,4 +121,10 @@ public static void setLocale(Activity activity, String lang) {
115121
activity.getResources().updateConfiguration(config,activity.getResources().getDisplayMetrics());
116122
}
117123

124+
@Override
125+
publicvoidonAttach(Contextcontext) {
126+
super.onAttach(context);
127+
EventBus.getDefault().post(newCFabEvent(false));
128+
}
129+
118130
}

0 commit comments

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