Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fbd0bdd
MembersWantsToJoinActivity and ViewQuestionMembersFragment comments/c…
shibrady Jun 4, 2015
54083f1
MemberWantsToJoin, ViewQuestionLocation, ViewQuestionMembers done
shibrady Jun 5, 2015
3029ee5
ViewQuestionFragment code cleanup complete
shibrady Jun 6, 2015
0b5ace3
Question Activity/Fragment Comments
Deamon12 Jun 6, 2015
81dc6fc
ViewQuestionActivity code cleanup completed.
shibrady Jun 6, 2015
9bf05e2
Merge remote-tracking branch 'origin/code_cleanup' into code_cleanup
Deamon12 Jun 6, 2015
9ba9e96
Main Activity comments
Deamon12 Jun 6, 2015
8dd6c76
ViewProfileFragment code cleanup complete.
shibrady Jun 6, 2015
c74f9e1
Main Activity comments
Deamon12 Jun 6, 2015
1ae4ade
Merge remote-tracking branch 'origin/code_cleanup' into code_cleanup
Deamon12 Jun 6, 2015
37fbbf8
Student code cleanup completed.
shibrady Jun 6, 2015
9453fc8
Merge branch 'code_cleanup' of https://github.com/shibrady/SaveOurStu…
shibrady Jun 6, 2015
9a901a5
SignupActivity code cleanup complete
shibrady Jun 6, 2015
906e641
SettingsActivity code cleanup complete
shibrady Jun 6, 2015
0a9fe0c
Singleton
Deamon12 Jun 6, 2015
b0ad028
Merge remote-tracking branch 'origin/code_cleanup' into code_cleanup
Deamon12 Jun 6, 2015
ef0d73b
Singleton
Deamon12 Jun 6, 2015
7111c8e
Comments
Deamon12 Jun 6, 2015
0538cfe
Comments
Deamon12 Jun 6, 2015
1e9ff88
Change of Repo
Deamon12 Jan 17, 2016
138c183
Adjusted dependency versions
Deamon12 Jun 22, 2017
01f2a68
Merge branch 'master' into code_cleanup
Deamon12 Jun 22, 2017
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
20 changes: 9 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ android {
storePassword 'sospassword'
}
}
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 25
buildToolsVersion "25.0.1"
defaultConfig {
applicationId "com.sos.saveourstudents"
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 25
versionCode 2
versionName "1.0"
signingConfig signingConfigs.SOSRelease
Expand All @@ -35,16 +35,14 @@ repositories {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:22.0.0'
compile 'com.android.support:appcompat-v7:22.1.0'
compile 'com.android.support:support-v4:22.0.0'
compile 'com.android.support:cardview-v7:22.0.0'
compile 'com.android.support:recyclerview-v7:22.0.0'
compile 'com.mcxiaoke.volley:library:1.0.+'
compile 'com.android.support:appcompat-v7:25.2.0'
compile 'com.android.support:support-v4:25.2.0'
compile 'com.android.support:cardview-v7:25.2.0'
compile 'com.android.support:recyclerview-v7:25.2.0'
compile 'com.mcxiaoke.volley:library:1.0.19'
compile 'com.google.android.gms:play-services:7.0.0'
compile 'com.facebook.android:facebook-android-sdk:4.0.0'
compile 'de.hdodenhof:circleimageview:1.2.2'
compile 'com.afollestad:material-dialogs:0.7.4.2'
compile 'com.github.rey5137:material:1.1.0'

compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;


/**
* This activity is only used to initialize CreateQuestionFragment
*/
public class CreateQuestionActivity extends AppCompatActivity {



@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -29,24 +29,13 @@ protected void onCreate(Bundle savedInstanceState) {
getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, theFragToShow).commit();

}

}


@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.menu_question, menu);
return true;
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();

return super.onOptionsItemSelected(item);
}



}
Loading