diff --git a/app/build.gradle b/app/build.gradle index 0ada430..386a876 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "de.sebse.fuplanner" minSdkVersion 15 targetSdkVersion 28 - versionCode 1 - versionName "1.0" + versionCode 3 + versionName "1.1.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -27,24 +27,24 @@ android { dependencies { - implementation 'com.android.support:recyclerview-v7:28.0.0-rc01' + implementation 'com.android.support:recyclerview-v7:28.0.0' implementation fileTree(include: ['*.jar'], dir: 'libs') androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:28.0.0-rc01' - implementation 'com.android.support:preference-v7:28.0.0-rc01' - implementation 'com.android.support:design:28.0.0-rc01' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.volley:volley:1.0.0' //noinspection GradleDependency implementation 'com.google.android.gms:play-services-auth:15.0.0' - implementation 'com.android.support:support-v4:28.0.0-rc01' + implementation 'com.android.support:support-v4:28.0.0' testImplementation 'junit:junit:4.12' implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0-rc01' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' - implementation 'com.android.support:support-v4:28.0.0-rc01' + implementation 'com.android.support:support-v4:28.0.0' implementation 'org.jetbrains:annotations-java5:15.0' //implementation 'com.github.quivr:android-week-view:2.0.2'//com.github.alamkanak:android-week-view:1.2.6 implementation 'com.ms-square:expandableTextView:0.1.4' diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 40dcf60..56c3c79 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -269,6 +269,7 @@ public class MainActivity extends AppCompatActivity } private void toLoginState(String fullname, String email, int newFragment, String newData, boolean onlineMode) { + log.d(currentPage, newFragment); changeFragment(newFragment, newData); View header = mNavigationView.getHeaderView(0); @@ -406,7 +407,7 @@ public class MainActivity extends AppCompatActivity }, log::e); } - if (newFragment != FRAGMENT_STARTUP && newFragment != FRAGMENT_NONE) { + if (newFragment != FRAGMENT_STARTUP && newFragment != FRAGMENT_NONE && newFragment != FRAGMENT_LOGIN) { this.fragmentPage = newFragment; this.fragmentData = newData; }