Browse Source

fix for release

Philippe-Adrien Nousse 3 years ago
parent
commit
2a723e5ef1

+ 3 - 2
app/build.gradle

@@ -6,9 +6,10 @@ android {
         applicationId "fr.wildcodeschool.steeryfit"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 2
-        versionName "0.01"
+        versionCode 4
+        versionName "1.00"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     buildTypes {
         release {

+ 1 - 1
app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2},"path":"app-release.apk","properties":{"packageId":"fr.wildcodeschool.steeryfit","split":"","minSdkVersion":"16"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"app-release.apk","properties":{"packageId":"fr.wildcodeschool.steeryfit","split":"","minSdkVersion":"16"}}]

+ 1 - 2
app/src/main/res/layout/fragment_main.xml

@@ -41,8 +41,7 @@
         android:padding="5dp"
         swipedeck:layout_constraintBottom_toBottomOf="parent"
         swipedeck:layout_constraintLeft_toLeftOf="parent"
-        swipedeck:layout_constraintRight_toRightOf="parent"
-        swipedeck:layout_constraintTop_toBottomOf="@+id/swipeDeckEventCards">
+        swipedeck:layout_constraintRight_toRightOf="parent">
 
         <ImageButton
             android:id="@+id/imageButtonRejectEvent"

+ 1 - 1
app/src/main/res/layout/fragment_search_event.xml

@@ -229,7 +229,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/cardViewSummarySearchEvent"/>
+            app:layout_constraintTop_toBottomOf="@+id/cardViewSelectCityDistanceSearchEvent"/>
 
     </android.support.constraint.ConstraintLayout>
 </android.support.design.widget.CoordinatorLayout>

+ 5 - 10
app/src/main/res/layout/item_recycler_view_events_created.xml

@@ -102,11 +102,10 @@
                 android:layout_height="28dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
                 android:src="@drawable/ic_my_calendar"
                 app:layout_constraintEnd_toStartOf="@+id/imageViewEventClock"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/linearLayoutUserStatut"/>
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/textViewEventDate"
@@ -127,11 +126,10 @@
                 android:layout_height="28dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
                 android:src="@drawable/search_event_time"
                 app:layout_constraintEnd_toStartOf="@+id/imageViewEventSandclock"
                 app:layout_constraintStart_toEndOf="@+id/imageViewEventCalendar"
-                app:layout_constraintTop_toTopOf="@+id/linearLayoutUserStatut"/>
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/textViewEventTime"
@@ -153,11 +151,10 @@
                 android:layout_height="28dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
                 android:src="@drawable/ic_timer"
                 app:layout_constraintEnd_toStartOf="@+id/imageViewEventGender"
                 app:layout_constraintStart_toEndOf="@+id/imageViewEventClock"
-                app:layout_constraintTop_toTopOf="@+id/linearLayoutUserStatut"
+                app:layout_constraintTop_toTopOf="parent"
                 android:layout_marginRight="16dp"
                 android:layout_marginLeft="8dp"/>
 
@@ -181,11 +178,10 @@
                 android:layout_height="28dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
                 android:src="@drawable/event_gender_mixed"
                 app:layout_constraintEnd_toStartOf="@+id/imageViewEventLevel"
                 app:layout_constraintStart_toEndOf="@+id/imageViewEventSandclock"
-                app:layout_constraintTop_toTopOf="@+id/linearLayoutUserStatut"/>
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/textViewEventParticpantsNumber"
@@ -207,11 +203,10 @@
                 android:layout_height="28dp"
                 android:layout_marginEnd="16dp"
                 android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
                 android:src="@drawable/event_level_2"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/imageViewEventGender"
-                app:layout_constraintTop_toTopOf="@+id/linearLayoutUserStatut"/>
+                app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
                 android:id="@+id/textViewEventLevel"