Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
whats-open-android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
whats-open-android
Commits
e0a8c8bc
Commit
e0a8c8bc
authored
Jan 04, 2018
by
Robert Hitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated API version
- Also changed some model files to Kotlin
parent
b18d3456
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
186 additions
and
279 deletions
+186
-279
app/build.gradle
app/build.gradle
+3
-0
app/src/main/java/srct/whatsopen/model/Facility.java
app/src/main/java/srct/whatsopen/model/Facility.java
+0
-99
app/src/main/java/srct/whatsopen/model/Facility.kt
app/src/main/java/srct/whatsopen/model/Facility.kt
+41
-0
app/src/main/java/srct/whatsopen/model/Location.kt
app/src/main/java/srct/whatsopen/model/Location.kt
+9
-0
app/src/main/java/srct/whatsopen/model/MainSchedule.java
app/src/main/java/srct/whatsopen/model/MainSchedule.java
+0
-51
app/src/main/java/srct/whatsopen/model/MainSchedule.kt
app/src/main/java/srct/whatsopen/model/MainSchedule.kt
+45
-0
app/src/main/java/srct/whatsopen/model/OpenTimes.java
app/src/main/java/srct/whatsopen/model/OpenTimes.java
+0
-72
app/src/main/java/srct/whatsopen/model/OpenTimes.kt
app/src/main/java/srct/whatsopen/model/OpenTimes.kt
+38
-0
app/src/main/java/srct/whatsopen/model/SpecialSchedule.java
app/src/main/java/srct/whatsopen/model/SpecialSchedule.java
+0
-51
app/src/main/java/srct/whatsopen/model/SpecialSchedule.kt
app/src/main/java/srct/whatsopen/model/SpecialSchedule.kt
+42
-0
app/src/main/java/srct/whatsopen/presenters/FacilityPresenter.java
...ain/java/srct/whatsopen/presenters/FacilityPresenter.java
+1
-1
app/src/main/java/srct/whatsopen/presenters/MainPresenter.java
...rc/main/java/srct/whatsopen/presenters/MainPresenter.java
+1
-1
app/src/main/java/srct/whatsopen/util/WhatsOpenService.java
app/src/main/java/srct/whatsopen/util/WhatsOpenService.java
+1
-1
app/src/main/java/srct/whatsopen/views/activities/DetailActivity.java
.../java/srct/whatsopen/views/activities/DetailActivity.java
+2
-2
app/src/main/java/srct/whatsopen/views/adapters/FacilityListAdapter.java
...va/srct/whatsopen/views/adapters/FacilityListAdapter.java
+1
-1
build.gradle
build.gradle
+2
-0
No files found.
app/build.gradle
View file @
e0a8c8bc
...
...
@@ -8,10 +8,12 @@ buildscript {
}
}
apply
plugin:
'com.android.application'
apply
plugin:
'kotlin-android'
apply
plugin:
'io.fabric'
repositories
{
maven
{
url
'https://maven.fabric.io/public'
}
mavenCentral
()
}
apply
plugin:
'realm-android'
...
...
@@ -72,4 +74,5 @@ dependencies {
compile
(
'com.crashlytics.sdk.android:crashlytics:2.6.6@aar'
)
{
transitive
=
true
;
}
compile
"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
}
app/src/main/java/srct/whatsopen/model/Facility.java
deleted
100644 → 0
View file @
b18d3456
package
srct.whatsopen.model
;
import
com.google.gson.annotations.SerializedName
;
import
io.realm.RealmList
;
import
io.realm.RealmObject
;
import
io.realm.annotations.PrimaryKey
;
public
class
Facility
extends
RealmObject
{
public
Facility
(
String
name
,
String
location
,
MainSchedule
mainSchedule
,
RealmList
<
SpecialSchedule
>
specialSchedules
,
boolean
isOpen
,
boolean
isFavorited
,
String
statusDuration
)
{
mName
=
name
;
mLocation
=
location
;
mMainSchedule
=
mainSchedule
;
mSpecialSchedules
=
specialSchedules
;
this
.
isOpen
=
isOpen
;
this
.
isFavorited
=
isFavorited
;
this
.
statusDuration
=
statusDuration
;
}
public
Facility
()
{
}
@PrimaryKey
@SerializedName
(
"name"
)
private
String
mName
;
@SerializedName
(
"location"
)
private
String
mLocation
;
@SerializedName
(
"main_schedule"
)
private
MainSchedule
mMainSchedule
;
@SerializedName
(
"special_schedules"
)
private
RealmList
<
SpecialSchedule
>
mSpecialSchedules
;
private
boolean
isOpen
;
private
boolean
isFavorited
;
private
String
statusDuration
;
public
String
getStatusDuration
()
{
return
statusDuration
;
}
public
void
setStatusDuration
(
String
statusDuration
)
{
this
.
statusDuration
=
statusDuration
;
}
public
RealmList
<
SpecialSchedule
>
getSpecialSchedules
()
{
return
mSpecialSchedules
;
}
public
void
setSpecialSchedules
(
RealmList
<
SpecialSchedule
>
specialSchedules
)
{
mSpecialSchedules
=
specialSchedules
;
}
public
boolean
isOpen
()
{
return
isOpen
;
}
public
void
setOpen
(
boolean
open
)
{
isOpen
=
open
;
}
public
String
getName
()
{
return
mName
;
}
public
void
setName
(
String
name
)
{
this
.
mName
=
name
;
}
public
boolean
isFavorited
()
{
return
isFavorited
;
}
public
void
setFavorited
(
boolean
favorited
)
{
isFavorited
=
favorited
;
}
public
String
getLocation
()
{
return
mLocation
;
}
public
void
setLocation
(
String
location
)
{
mLocation
=
location
;
}
public
MainSchedule
getMainSchedule
()
{
return
mMainSchedule
;
}
public
void
setMainSchedule
(
MainSchedule
mainSchedule
)
{
mMainSchedule
=
mainSchedule
;
}
}
app/src/main/java/srct/whatsopen/model/Facility.kt
0 → 100644
View file @
e0a8c8bc
package
srct.whatsopen.model
import
com.google.gson.annotations.SerializedName
import
io.realm.RealmList
import
io.realm.RealmObject
import
io.realm.annotations.PrimaryKey
open
class
Facility
:
RealmObject
{
@PrimaryKey
@SerializedName
(
"facility_name"
)
var
name
:
String
?
=
null
@SerializedName
(
"facility_location"
)
var
location
:
Location
?
=
null
@SerializedName
(
"main_schedule"
)
var
mainSchedule
:
MainSchedule
?
=
null
@SerializedName
(
"special_schedules"
)
var
specialSchedules
:
RealmList
<
SpecialSchedule
>?
=
null
var
isOpen
:
Boolean
=
false
var
isFavorited
:
Boolean
=
false
var
statusDuration
:
String
?
=
null
constructor
(
name
:
String
,
location
:
Location
,
mainSchedule
:
MainSchedule
,
specialSchedules
:
RealmList
<
SpecialSchedule
>,
isOpen
:
Boolean
,
isFavorited
:
Boolean
,
statusDuration
:
String
)
{
this
.
name
=
name
this
.
location
=
location
this
.
mainSchedule
=
mainSchedule
this
.
specialSchedules
=
specialSchedules
this
.
isOpen
=
isOpen
this
.
isFavorited
=
isFavorited
this
.
statusDuration
=
statusDuration
}
constructor
()
{}
}
app/src/main/java/srct/whatsopen/model/Location.kt
0 → 100644
View file @
e0a8c8bc
package
srct.whatsopen.model
import
com.google.gson.annotations.SerializedName
import
io.realm.RealmObject
import
io.realm.annotations.PrimaryKey
open
class
Location
(
@PrimaryKey
@SerializedName
(
"building"
)
var
building
:
String
=
""
)
:
RealmObject
()
app/src/main/java/srct/whatsopen/model/MainSchedule.java
deleted
100644 → 0
View file @
b18d3456
package
srct.whatsopen.model
;
import
com.google.gson.annotations.SerializedName
;
import
io.realm.RealmList
;
import
io.realm.RealmObject
;
public
class
MainSchedule
extends
RealmObject
implements
Schedule
{
public
MainSchedule
(
RealmList
<
OpenTimes
>
openTimesList
,
String
validStart
,
String
validEnd
)
{
mOpenTimesList
=
openTimesList
;
this
.
validStart
=
validStart
;
this
.
validEnd
=
validEnd
;
}
public
MainSchedule
()
{
}
@SerializedName
(
"open_times"
)
private
RealmList
<
OpenTimes
>
mOpenTimesList
;
@SerializedName
(
"valid_start"
)
private
String
validStart
;
@SerializedName
(
"valid_end"
)
private
String
validEnd
;
public
String
getValidStart
()
{
return
validStart
;
}
public
void
setValidStart
(
String
validStart
)
{
this
.
validStart
=
validStart
;
}
public
String
getValidEnd
()
{
return
validEnd
;
}
public
void
setValidEnd
(
String
validEnd
)
{
this
.
validEnd
=
validEnd
;
}
public
RealmList
<
OpenTimes
>
getOpenTimesList
()
{
return
mOpenTimesList
;
}
public
void
setOpenTimesList
(
RealmList
<
OpenTimes
>
openTimesList
)
{
mOpenTimesList
=
openTimesList
;
}
}
app/src/main/java/srct/whatsopen/model/MainSchedule.kt
0 → 100644
View file @
e0a8c8bc
package
srct.whatsopen.model
import
com.google.gson.annotations.SerializedName
import
io.realm.RealmList
import
io.realm.RealmObject
open
class
MainSchedule
:
RealmObject
,
Schedule
{
@SerializedName
(
"open_times"
)
private
var
mOpenTimesList
:
RealmList
<
OpenTimes
>?
=
null
@SerializedName
(
"valid_start"
)
var
validStart
:
String
?
=
null
@SerializedName
(
"valid_end"
)
private
var
validEnd
:
String
?
=
null
@SerializedName
(
"twenty_four_hours"
)
var
openTwentyFourHours
:
Boolean
?
=
null
constructor
(
openTimesList
:
RealmList
<
OpenTimes
>,
validStart
:
String
,
validEnd
:
String
)
{
mOpenTimesList
=
openTimesList
this
.
validStart
=
validStart
this
.
validEnd
=
validEnd
}
constructor
()
{}
override
fun
getValidEnd
():
String
?
{
return
validEnd
}
fun
setValidEnd
(
validEnd
:
String
)
{
this
.
validEnd
=
validEnd
}
override
fun
getOpenTimesList
():
RealmList
<
OpenTimes
>?
{
return
mOpenTimesList
}
fun
setOpenTimesList
(
openTimesList
:
RealmList
<
OpenTimes
>)
{
mOpenTimesList
=
openTimesList
}
}
app/src/main/java/srct/whatsopen/model/OpenTimes.java
deleted
100644 → 0
View file @
b18d3456
package
srct.whatsopen.model
;
import
com.google.gson.annotations.SerializedName
;
import
io.realm.RealmObject
;
public
class
OpenTimes
extends
RealmObject
{
public
OpenTimes
(
int
startDay
,
int
endDay
,
String
startTime
,
String
endTime
)
{
this
.
startDay
=
startDay
;
this
.
endDay
=
endDay
;
this
.
startTime
=
startTime
;
this
.
endTime
=
endTime
;
}
public
OpenTimes
()
{
}
@Override
public
String
toString
()
{
return
"OpenTimes{"
+
"startDay="
+
startDay
+
", endDay="
+
endDay
+
", startTime='"
+
startTime
+
'\''
+
", endTime='"
+
endTime
+
'\''
+
'}'
;
}
@SerializedName
(
"start_day"
)
private
int
startDay
;
@SerializedName
(
"end_day"
)
private
int
endDay
;
@SerializedName
(
"start_time"
)
private
String
startTime
;
@SerializedName
(
"end_time"
)
private
String
endTime
;
public
int
getEndDay
()
{
return
endDay
;
}
public
void
setEndDay
(
int
endDay
)
{
this
.
endDay
=
endDay
;
}
public
int
getStartDay
()
{
return
startDay
;
}
public
void
setStartDay
(
int
startDay
)
{
this
.
startDay
=
startDay
;
}
public
String
getStartTime
()
{
return
startTime
;
}
public
void
setStartTime
(
String
startTime
)
{
this
.
startTime
=
startTime
;
}
public
String
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
String
endTime
)
{
this
.
endTime
=
endTime
;
}
}
app/src/main/java/srct/whatsopen/model/OpenTimes.kt
0 → 100644
View file @
e0a8c8bc
package
srct.whatsopen.model
import
com.google.gson.annotations.SerializedName
import
io.realm.RealmObject
open
class
OpenTimes
:
RealmObject
{
@SerializedName
(
"start_day"
)
var
startDay
:
Int
=
0
@SerializedName
(
"end_day"
)
var
endDay
:
Int
=
0
@SerializedName
(
"start_time"
)
var
startTime
:
String
?
=
null
@SerializedName
(
"end_time"
)
var
endTime
:
String
?
=
null
constructor
(
startDay
:
Int
,
endDay
:
Int
,
startTime
:
String
,
endTime
:
String
)
{
this
.
startDay
=
startDay
this
.
endDay
=
endDay
this
.
startTime
=
startTime
this
.
endTime
=
endTime
}
constructor
()
{}
override
fun
toString
():
String
{
return
"OpenTimes{"
+
"startDay="
+
startDay
+
", endDay="
+
endDay
+
", startTime='"
+
startTime
+
'\''
+
", endTime='"
+
endTime
+
'\''
+
'}'
}
}
app/src/main/java/srct/whatsopen/model/SpecialSchedule.java
deleted
100644 → 0
View file @
b18d3456
package
srct.whatsopen.model
;
import
com.google.gson.annotations.SerializedName
;
import
io.realm.RealmList
;
import
io.realm.RealmObject
;
public
class
SpecialSchedule
extends
RealmObject
implements
Schedule
{
public
SpecialSchedule
(
RealmList
<
OpenTimes
>
openTimesList
,
String
validStart
,
String
validEnd
)
{
mOpenTimesList
=
openTimesList
;
this
.
validStart
=
validStart
;
this
.
validEnd
=
validEnd
;
}
public
SpecialSchedule
()
{
}
@SerializedName
(
"open_times"
)
private
RealmList
<
OpenTimes
>
mOpenTimesList
;
@SerializedName
(
"valid_start"
)
private
String
validStart
;
@SerializedName
(
"valid_end"
)
private
String
validEnd
;
public
String
getValidStart
()
{
return
validStart
;
}
public
void
setValidStart
(
String
validStart
)
{
this
.
validStart
=
validStart
;
}
public
String
getValidEnd
()
{
return
validEnd
;
}
public
void
setValidEnd
(
String
validEnd
)
{
this
.
validEnd
=
validEnd
;
}
public
RealmList
<
OpenTimes
>
getOpenTimesList
()
{
return
mOpenTimesList
;
}
public
void
setOpenTimesList
(
RealmList
<
OpenTimes
>
openTimesList
)
{
mOpenTimesList
=
openTimesList
;
}
}
app/src/main/java/srct/whatsopen/model/SpecialSchedule.kt
0 → 100644
View file @
e0a8c8bc
package
srct.whatsopen.model
import
com.google.gson.annotations.SerializedName
import
io.realm.RealmList
import
io.realm.RealmObject
open
class
SpecialSchedule
:
RealmObject
,
Schedule
{
@SerializedName
(
"open_times"
)
private
var
mOpenTimesList
:
RealmList
<
OpenTimes
>?
=
null
@SerializedName
(
"valid_start"
)
var
validStart
:
String
?
=
null
@SerializedName
(
"valid_end"
)
private
var
validEnd
:
String
?
=
null
constructor
(
openTimesList
:
RealmList
<
OpenTimes
>,
validStart
:
String
,
validEnd
:
String
)
{
mOpenTimesList
=
openTimesList
this
.
validStart
=
validStart
this
.
validEnd
=
validEnd
}
constructor
()
{}
override
fun
getValidEnd
():
String
?
{
return
validEnd
}
fun
setValidEnd
(
validEnd
:
String
)
{
this
.
validEnd
=
validEnd
}
override
fun
getOpenTimesList
():
RealmList
<
OpenTimes
>?
{
return
mOpenTimesList
}
fun
setOpenTimesList
(
openTimesList
:
RealmList
<
OpenTimes
>)
{
mOpenTimesList
=
openTimesList
}
}
app/src/main/java/srct/whatsopen/presenters/FacilityPresenter.java
View file @
e0a8c8bc
...
...
@@ -59,7 +59,7 @@ public class FacilityPresenter {
realm
.
executeTransactionAsync
(
bgRealm
->
{
// have to re-query for the object as it was created on a separate thread
Facility
f
=
bgRealm
.
where
(
Facility
.
class
)
.
equalTo
(
"
mN
ame"
,
facilityName
).
findFirst
();
.
equalTo
(
"
n
ame"
,
facilityName
).
findFirst
();
f
.
setFavorited
(
status
);
editor
.
putBoolean
(
facilityName
+
"FavoriteStatus"
,
status
);
...
...
app/src/main/java/srct/whatsopen/presenters/MainPresenter.java
View file @
e0a8c8bc
...
...
@@ -123,7 +123,7 @@ public class MainPresenter {
private
void
removeFacilityFromRealm
(
Facility
facility
)
{
final
String
name
=
facility
.
getName
();
mRealm
.
executeTransactionAsync
((
bgRealm
)
->
{
RealmResults
<
Facility
>
results
=
bgRealm
.
where
(
Facility
.
class
).
equalTo
(
"
mN
ame"
,
name
)
RealmResults
<
Facility
>
results
=
bgRealm
.
where
(
Facility
.
class
).
equalTo
(
"
n
ame"
,
name
)
.
findAll
();
results
.
deleteAllFromRealm
();
...
...
app/src/main/java/srct/whatsopen/util/WhatsOpenService.java
View file @
e0a8c8bc
...
...
@@ -19,7 +19,7 @@ public class WhatsOpenService {
private
static
volatile
Retrofit
sRetrofit
=
null
;
private
static
WhatsOpenApi
mService
;
private
static
final
String
BASE_URL
=
"https://
whatsopen.gmu.edu/api
/"
;
private
static
final
String
BASE_URL
=
"https://
api.srct.gmu.edu/whatsopen/v2
/"
;
public
WhatsOpenService
()
{
}
...
...
app/src/main/java/srct/whatsopen/views/activities/DetailActivity.java
View file @
e0a8c8bc
...
...
@@ -164,7 +164,7 @@ public class DetailActivity extends AppCompatActivity implements FacilityView,
// Queries Realm for the facility matching the key
private
void
getFacility
(
String
key
)
{
mFacility
=
mRealm
.
where
(
Facility
.
class
).
equalTo
(
"
mN
ame"
,
key
).
findFirst
();
mFacility
=
mRealm
.
where
(
Facility
.
class
).
equalTo
(
"
n
ame"
,
key
).
findFirst
();
}
// Configures the toolbar title, actions, etc
...
...
@@ -203,7 +203,7 @@ public class DetailActivity extends AppCompatActivity implements FacilityView,
openDurationTextView
.
setText
(
mFacility
.
getStatusDuration
());
locationTextView
.
setText
(
mFacility
.
getLocation
());
locationTextView
.
setText
(
mFacility
.
getLocation
()
.
getBuilding
()
);
Calendar
now
=
Calendar
.
getInstance
();
Schedule
currentSchedule
=
mPresenter
.
getActiveSchedule
(
mFacility
,
now
);
...
...
app/src/main/java/srct/whatsopen/views/adapters/FacilityListAdapter.java
View file @
e0a8c8bc
...
...
@@ -161,7 +161,7 @@ public class FacilityListAdapter extends
if
(
constraint
!=
null
&&
getData
()
!=
null
)
{
RealmResults
<
Facility
>
results
=
getData
().
where
()
.
contains
(
"
mN
ame"
,
constraint
.
toString
(),
Case
.
INSENSITIVE
)
.
contains
(
"
n
ame"
,
constraint
.
toString
(),
Case
.
INSENSITIVE
)
.
findAll
();
updateData
(
results
);
}
...
...
build.gradle
View file @
e0a8c8bc
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript
{
ext
.
kotlin_version
=
'1.2.10'
repositories
{
mavenCentral
()
jcenter
()
...
...
@@ -12,6 +13,7 @@ buildscript {
classpath
'io.realm:realm-gradle-plugin:3.0.0'
classpath
'me.tatarka:gradle-retrolambda:3.3.1'
classpath
'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment