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.

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

The first alfa version of application #1

Open
wants to merge 85 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
a9b79fb
Init doing FirebaseLogin in project
kinivi Nov 3, 2017
0de4b05
Processing of project design
kinivi Nov 3, 2017
3da2736
Polish the structure of project
kinivi Nov 4, 2017
2a39493
Merge branch 'FirebaseLogin' into Develop
kinivi Nov 4, 2017
ff7e0b3
Changed Login Page
kinivi Nov 12, 2017
29b7832
Added 3 Fragments
kinivi Nov 13, 2017
bd522ce
Added TabLayout
kinivi Nov 13, 2017
564c276
Added icons to TabLayout
kinivi Nov 14, 2017
63a4611
Uncomment Google authorization
kinivi Nov 14, 2017
9fb798f
Merge branch 'FragmentsAndViewPager' into Develop
kinivi Nov 14, 2017
e3e027a
Added CardLayout
kinivi Nov 14, 2017
c1385c2
Rechanged Card Layout
kinivi Nov 15, 2017
5ab9f73
Merge branch 'CardViewAtDashboard' into origin/Develop
kinivi Nov 15, 2017
58a8f1d
Added card for Chart
kinivi Nov 15, 2017
8a9f211
Design the layout
kinivi Nov 16, 2017
6f2402d
Polish design
kinivi Nov 17, 2017
466aefb
Redisign the layout
kinivi Nov 19, 2017
33f871b
Polish the structure of the code
kinivi Nov 19, 2017
46e9c25
Move CardView for poll into individual layout
kinivi Nov 20, 2017
258ef98
Merge branch 'ChartForDashboard' into Develop
kinivi Nov 20, 2017
f4a4eae
Added asset of icons for application
kinivi Nov 20, 2017
d2a1a4d
Added activity for poll
kinivi Nov 20, 2017
f979677
Added thу template XML layout for QuestionCard
kinivi Nov 24, 2017
805d233
Added button "SEND"
kinivi Nov 24, 2017
64a8c60
Connected results to Firebase
kinivi Nov 25, 2017
d9f8bc8
Optimization the Firebase Database structure
kinivi Nov 26, 2017
a34d307
Added comments and polish structure of the code
kinivi Nov 26, 2017
154dc12
Close activity, when result is sent
kinivi Nov 30, 2017
b84d9e6
Merge branch 'ActivityForPoll' into Develop
kinivi Nov 30, 2017
e734d9c
Created Getter Interface and Class
kinivi Nov 30, 2017
9459ddd
Fix LoginAuth Bug
kinivi Nov 30, 2017
4c278e4
Night commit
kinivi Dec 1, 2017
f4709eb
Added Progress Circle
kinivi Dec 2, 2017
eb01c49
created Subjects layout
dlohvinov Dec 2, 2017
540dc7d
Poll result sending
kinivi Dec 2, 2017
2991cfc
Connected All Charts to Database
kinivi Dec 2, 2017
d8f9363
Added new SplashLogo and rechanched it start
kinivi Dec 2, 2017
efcad98
Merge branch 'ConnectChartsToFirebase' into Develop
kinivi Dec 2, 2017
848bbdb
Enable cashing data
kinivi Dec 3, 2017
ec062c1
Added different splash images
kinivi Dec 3, 2017
9d6f9e9
Added NavigationDrawer and clean code
kinivi Dec 6, 2017
7cc498f
Added progress dialog to Sign In activity
kinivi Dec 7, 2017
0b48660
Night commit
kinivi Dec 7, 2017
2b01bfe
Setting Photo and Name
kinivi Dec 7, 2017
3b3ed07
Move checking Google Sign in into Splash activity
kinivi Dec 8, 2017
00b23ec
Optimize getting childs of database
kinivi Dec 8, 2017
5cc7399
Merge branch 'NavigationDrawer' into Develop
kinivi Dec 8, 2017
107f99f
Added function tha setting listeners to update date on change
kinivi Dec 8, 2017
07eb291
Merge branch 'RealtimeUpdatingCharts' into Develop
kinivi Dec 9, 2017
ea8f083
Optimize using activity
kinivi Dec 9, 2017
21fa801
Move inflating fragments into functions
kinivi Dec 9, 2017
a95f084
added main colors
dlohvinov Dec 10, 2017
504ebc8
Changes in Main colors
kinivi Dec 11, 2017
cc1e1ab
added open_subject fragment layout
dlohvinov Dec 12, 2017
b318a33
Added layout for PollConstructor
kinivi Dec 13, 2017
db4ef38
code for subjects layout added
michael-gursky Dec 14, 2017
05a212e
subjects page added
michael-gursky Dec 14, 2017
a963683
minor bugs fixed
michael-gursky Dec 14, 2017
618dd5e
Added new Library for Survey Constructor
kinivi Dec 15, 2017
5e26527
Implement ListView
kinivi Dec 15, 2017
3f0c17e
Night Commit
kinivi Dec 15, 2017
feb76a5
Chart data and answer data update
kinivi Dec 16, 2017
034bb6f
Edit question card layout and sending data
kinivi Dec 17, 2017
6a2c026
Some structure and UI fixes
kinivi Dec 20, 2017
2fddddc
Repair issue with blank Fragment Adapter
kinivi Dec 23, 2017
bb674f6
Merge branch 'pollConstructor' into Develop
kinivi Dec 23, 2017
3a3a7f9
Added layout for PollList
kinivi Dec 23, 2017
e135575
Added spinner to question card
kinivi Dec 23, 2017
5bca8e9
styled login page
dlohvinov Dec 23, 2017
8ee40ba
Created List of Polls and refactor some code
kinivi Dec 23, 2017
fb08984
Merge remote-tracking branch 'origin/Develop' into Develop
kinivi Dec 23, 2017
122e344
Addedvalidation info in Poll Constructor
kinivi Dec 24, 2017
6e19515
Added deleting question card
kinivi Dec 24, 2017
1a39fd5
Added deleting answers
kinivi Dec 24, 2017
24a9084
rename commit
kinivi Dec 24, 2017
4741c4c
Merge branch 'CreateListOfPolls' into Develop
kinivi Dec 24, 2017
577b9ef
Changed colors on LoginPage
kinivi Dec 24, 2017
0ba8ae1
History of Ukraine
michael-gursky Dec 25, 2017
45a4dd3
OpenSubjectLayout_1
michael-gursky Dec 25, 2017
19f377c
bug repair
kinivi Dec 25, 2017
676e0b3
Merge remote-tracking branch 'origin/Develop' into Develop
kinivi Dec 25, 2017
e83f7e2
Auto stash before merge of "Develop" and "origin/Develop"
kinivi Dec 25, 2017
623f556
Alfa version
kinivi Dec 25, 2017
58321b2
UPD for GitHub readme
kinivi Jan 17, 2018
0ed7ed6
Update README.md
kinivi Jan 17, 2018
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ google-services.json
freeline.py
freeline/
freeline_project_description.json

# External
Cloud functions in Firebase/
48 changes: 48 additions & 0 deletions .idea/misc.xml

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

10 changes: 10 additions & 0 deletions .idea/modules.xml

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

12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
# ClusterEducation
Its a project to improve Cluster Education programs with the help of feedback and student surveys

![logo](https://github.com/kinivi/ClusterEducation/blob/Develop/images/ScreenShot_20180117200507.png)

- Key Features

![logo](https://github.com/kinivi/ClusterEducation/blob/Develop/images/ezgif.com-gif-maker.gif)

![logo](https://github.com/kinivi/ClusterEducation/blob/Develop/images/ezgif.com-video-to-gif%20_%20%D1%81%D1%89%D1%82%D1%96%D0%B5%D0%BA.gif)
1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
54 changes: 54 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
defaultConfig {
applicationId "com.projects.deus_ex_machina.clustereducation"
minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:design:26.1.0'
implementation 'com.google.firebase:firebase-database:11.6.2'
implementation 'com.google.firebase:firebase-core:11.6.2'
implementation 'com.google.firebase:firebase-auth:11.6.2'
implementation 'com.android.support:support-v4:26.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
compile 'com.google.android.gms:play-services-auth:11.6.2'
compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
implementation 'com.android.support:cardview-v7:26.1.0'
//Picasso repo
compile 'com.squareup.picasso:picasso:2.5.2'

compile 'com.firebase:firebase-client-android:2.5.0'

compile 'com.firebaseui:firebase-ui-database:3.1.0'

//Survey library
compile 'com.androidadvance.surveylib:surveylib:0.0.1'

//JSON
compile 'com.google.code.gson:gson:2.8.2'
}
apply plugin: 'com.google.gms.google-services'

21 changes: 21 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class value to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file value.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.projects.deus_ex_machina.clustereducation;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.projects.deus_ex_machina.clustereducation", appContext.getPackageName());
}
}
62 changes: 62 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.projects.deus_ex_machina.clustereducation">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

<!-- To auto-complete the email text field in the login form with the user's emails -->
<application
android:name=".CustomApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".ChooserActivity"
android:screenOrientation="portrait"
>
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".BlankContainerActivity"
android:parentActivityName=".MainActivity"
android:windowSoftInputMode="stateHidden"
android:screenOrientation="portrait"
>
<intent-filter>
<action android:name="android.intent.action.ANSWER" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".SplashActivity"
android:theme="@style/SplashTheme"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.androidadvance.androidsurvey.SurveyActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
android:windowSoftInputMode="stateHidden"/>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.projects.deus_ex_machina.clustereducation;

import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;

import javax.xml.namespace.NamespaceContext;

public class BlankContainerActivity extends AppCompatActivity {


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_back_button);
LayoutInflater inflater = this.getLayoutInflater();
View view = inflater.inflate(R.layout.fragment_open_subject, null);

Intent mIntent = this.getIntent();
if(mIntent.getStringExtra("TypeOfFragment").equals("PollFragment")) {
Fragment mFragment = new PollFragment();

this.getSupportFragmentManager().beginTransaction()
.replace(R.id.dynamic_backbutton_container, mFragment).commit();
} else if(mIntent.getStringExtra("TypeOfFragment").equals("FeedbackFragment")) {
getSupportFragmentManager().beginTransaction()
.setTransitionStyle(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.replace(R.id.dynamic_backbutton_container, new FeedbackFragment()).commit();

} else if(mIntent.getStringExtra("TypeOfFragment").equals("OpenSubjectFragment")) {
OpenSubjectFragment openSubjectFragment = new OpenSubjectFragment();
openSubjectFragment.setName_of_a_subject(mIntent.getStringExtra("Name"));
getSupportFragmentManager().beginTransaction()
.setTransitionStyle(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.replace(R.id.dynamic_backbutton_container, openSubjectFragment).commit();
} else if(mIntent.getStringExtra("TypeOfFragment").equals("ConstructorFragment")) {
getSupportFragmentManager().beginTransaction()
.setTransitionStyle(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
.replace(R.id.dynamic_backbutton_container, new PollConstructor()).commit();
}
}
}



Loading