Changed auth layout

Fixed crash in change description activity
CoolONEOfficial · Apr 26, 2018 · 588c647 · 588c647
1 parent 11d1bba
commit 588c647
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "ru.coolone.travelquest"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 8
-        versionName "1.7"
+        versionCode 9
+        versionName "1.8"
 
         // Google maps key
         manifestPlaceholders = [googleMapApiKey: GOOGLE_MAPS_API_KEY]

diff --git a/app/src/main/java/ru/coolone/travelquest/ui/activities/AbstractAuthActivity.java b/app/src/main/java/ru/coolone/travelquest/ui/activities/AbstractAuthActivity.java
@@ -70,6 +70,8 @@ abstract public class AbstractAuthActivity
     // --- Ui references ---
     // Auth form
     protected View authFormView;
+    // OAuth form
+    protected View oauthFormView;
     // Progress
     protected RelativeLayout progressLayout;
     protected ProgressBar progressBar;
@@ -239,6 +241,11 @@ private void setProgressVisibility(final boolean visibility) {
                             ? View.GONE
                             : View.VISIBLE
             );
+            oauthFormView.setVisibility(
+                    visibility
+                            ? View.GONE
+                            : View.VISIBLE
+            );
             authFormView
                     .animate()
                     .setDuration(shortAnimTime)
@@ -250,6 +257,11 @@ private void setProgressVisibility(final boolean visibility) {
                     new AnimatorListenerAdapter() {
                         @Override
                         public void onAnimationEnd(Animator animation) {
+                            oauthFormView.setVisibility(
+                                    visibility
+                                            ? View.GONE
+                                            : View.VISIBLE
+                            );
                             authFormView.setVisibility(
                                     visibility
                                             ? View.GONE

diff --git a/app/src/main/java/ru/coolone/travelquest/ui/activities/LoginActivity.java b/app/src/main/java/ru/coolone/travelquest/ui/activities/LoginActivity.java
@@ -31,6 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
         passwordView = findViewById(R.id.login_text_password);
         authButton = findViewById(R.id.login_button_login);
         authFormView = findViewById(R.id.login_form);
+        oauthFormView = findViewById(R.id.oauth_form);
         oauthGoogleView = findViewById(R.id.login_oauth_google);
         progressLayout = findViewById(R.id.login_progress_layout);
         progressBar = findViewById(R.id.login_progress_bar);

diff --git a/app/src/main/java/ru/coolone/travelquest/ui/activities/MainActivity.java b/app/src/main/java/ru/coolone/travelquest/ui/activities/MainActivity.java
@@ -54,6 +54,7 @@
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.ViewById;
 
 import lombok.val;

diff --git a/app/src/main/java/ru/coolone/travelquest/ui/activities/SigninActivity.java b/app/src/main/java/ru/coolone/travelquest/ui/activities/SigninActivity.java
@@ -31,6 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
         passwordView = findViewById(R.id.signin_text_password);
         authButton = findViewById(R.id.signin_button_signin);
         authFormView = findViewById(R.id.signin_form);
+        oauthFormView = findViewById(R.id.oauth_form);
         oauthGoogleView = findViewById(R.id.signin_oauth_google);
         progressLayout = findViewById(R.id.signin_progress_layout);
         progressBar = findViewById(R.id.signin_progress_bar);

diff --git a/...rc/main/java/ru/coolone/travelquest/ui/fragments/quests/details/PlaceDetailsFragment.java b/...rc/main/java/ru/coolone/travelquest/ui/fragments/quests/details/PlaceDetailsFragment.java
@@ -4,6 +4,7 @@
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
@@ -28,9 +29,12 @@
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EFragment;
+import org.androidannotations.annotations.Extra;
 import org.androidannotations.annotations.FragmentArg;
+import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.ViewById;
 
+import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -51,7 +55,7 @@ public class PlaceDetailsFragment extends Fragment {
 
     static final String TAG = PlaceDetailsFragment.class.getSimpleName();
 
-    private FragmentListener fragmentListener;
+    FragmentListener fragmentListener;
 
     @ViewById(R.id.details_details_recycler)
     public RecyclerView detailsRecyclerView;

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -1,4 +1,4 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -90,7 +90,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/login_text_view_signin" />
+    </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/oauth_form"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="bottom">
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -102,9 +109,8 @@
             android:id="@+id/login_oauth_google"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:layout_marginTop="@dimen/content_inset"
             android:src="@drawable/ic_auth_google"
             android:clickable="true"
             android:focusable="true" />
     </LinearLayout>
-</LinearLayout>
+</FrameLayout>