Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tabs #1

Merged
merged 24 commits into from
Sep 1, 2015
Merged

Tabs #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c7682ca
Integrated database.
samidhtalsania Jan 10, 2015
bae7d41
Fixed loading screen/Refresh bug.
samidhtalsania Jan 11, 2015
471ef78
Fixed most of the UI and on load application bugs.
samidhtalsania Jan 12, 2015
dafdb47
Added alarm switch boolean field in database.
samidhtalsania Jan 19, 2015
e43a0c3
Fixed switch bug. Added notification and on click activity for notifi…
samidhtalsania Feb 1, 2015
d182c85
Fixe Scroll bug. Added ads only in MainActivity. Changed layout of Ma…
samidhtalsania Feb 21, 2015
73e75fa
Changed Theme to blue.
samidhtalsania Feb 22, 2015
dc9235c
Listview state now maintained on configuration change or when navigat…
samidhtalsania Feb 22, 2015
34589de
Fixed swipe bug(bug #2). Changed MatchDetailsActivity title based on …
samidhtalsania Feb 23, 2015
8647c51
Added settings. Changed a bit if UI.
samidhtalsania Mar 1, 2015
2c9db46
UI refactor. Added support for user based time notification.
samidhtalsania Mar 1, 2015
2792f5d
Added ads on details page.
samidhtalsania Mar 2, 2015
9573986
Restored list position when moving back to main activity.Another bug …
samidhtalsania Mar 5, 2015
563ea2a
Added searching for matches
samidhtalsania Mar 7, 2015
538e70e
Added rate this app and share buttons on settings screen.
samidhtalsania Mar 20, 2015
250d0c6
Fixed search issue
samidhtalsania Mar 21, 2015
a379fc8
Added logo.Added notification small and big icons.Minor UI changes.
samidhtalsania Apr 14, 2015
4424812
Fixed search onClick bug. Converted Lists to arraylists.
samidhtalsania Apr 19, 2015
127c26a
Fixed landscape layout in matchDetailsActivity,added scrollView and n…
samidhtalsania Apr 19, 2015
2467165
added new icons for unknown teams
samidhtalsania Apr 24, 2015
dec6944
added proguard config for release build
samidhtalsania Apr 24, 2015
a5c33f1
Fixed proguard config.
samidhtalsania Apr 26, 2015
ecf6a40
added tabbed layout for upcoming and live. Added live matches list.
samidhtalsania May 2, 2015
ea28c72
Added tabbed layout for main page. Added tabbed layout for game detai…
samidhtalsania May 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions Dota2Ticker.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
Expand Down
6 changes: 3 additions & 3 deletions MyDaoGenerator/MyDaoGenerator.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Dota2Ticker" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -17,10 +17,10 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
Expand Down
7 changes: 5 additions & 2 deletions MyDaoGenerator/src/main/java/pl/surecase/eu/MyDaoGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@
public class MyDaoGenerator {

public static void main(String args[]) throws Exception {
Schema schema = new Schema(3, "greendao");
Schema schema = new Schema(1, "greendao");
schema.enableKeepSectionsByDefault();

Entity box = schema.addEntity("Match");
box.addIdProperty();
box.addStringProperty("t1");
box.addStringProperty("t2");
box.addStringProperty("t1c");
box.addStringProperty("t2c");
box.addStringProperty("ETA");
box.addLongProperty("ETA");
box.addBooleanProperty("alarm_set");
new DaoGenerator().generateAll(schema, args[0]);
}
}
17 changes: 11 additions & 6 deletions app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Dota2Ticker" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand All @@ -9,6 +9,7 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
Expand All @@ -24,6 +25,7 @@
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
Expand Down Expand Up @@ -84,17 +86,20 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
<orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="okhttp-urlconnection-2.2.0" level="project" />
<orderEntry type="library" exported="" name="joda-time-2.6" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.8.0" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="otto-1.3.5" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="joda-time-2.6" level="project" />
</component>
</module>

9 changes: 7 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ android {
applicationId "com.bluealeaf.dota2ticker"
minSdkVersion 15
targetSdkVersion 21
versionCode 1
versionCode 3
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -28,6 +28,7 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.squareup.retrofit:retrofit:1.8.0'
compile 'com.squareup.okhttp:okhttp:2.2.0'
Expand All @@ -36,4 +37,8 @@ dependencies {
compile 'joda-time:joda-time:2.6'
compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'
compile 'de.greenrobot:greendao:1.3.7'
compile 'com.google.android.gms:play-services:6.5.87'
compile 'com.android.support:support-v4:21.0.3'
compile 'com.squareup.picasso:picasso:2.5.2'
compile "com.android.support:cardview-v7:21.0.2"
}
Loading