Skip to content

Commit

Permalink
Merge pull request #500 from enviroCar/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
dewall authored Mar 13, 2020
2 parents 1341caa + e8e16e9 commit f26cbf3
Show file tree
Hide file tree
Showing 55 changed files with 966 additions and 935 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ ext {
compileSdkVersion = 28
targetSdkVersion = 28
buildToolsVersion = '28.0.3'
versionCode = 40
versionName = "1.1.0"
versionCode = 43
versionName = "1.1.3"

javaCompileVersion = JavaVersion.VERSION_1_8

Expand Down
4 changes: 2 additions & 2 deletions org.envirocar.app/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.envirocar.app"
android:installLocation="internalOnly"
android:versionCode="40"
android:versionName="1.1.0">
android:versionCode="43"
android:versionName="1.1.3">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
Expand Down
12 changes: 0 additions & 12 deletions org.envirocar.app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ dependencies {
implementation rootProject.ext.butterKnife
annotationProcessor rootProject.ext.daggerCompiler
annotationProcessor rootProject.ext.butterknifeCompiler
// implementation 'org.glassfish:javax.annotation:10.0-b28'

// Google dependencies
implementation rootProject.ext.gson
Expand All @@ -48,17 +47,6 @@ dependencies {
implementation rootProject.ext.rxBindingCore
implementation rootProject.ext.rxBindingAppCompat

implementation 'pub.devrel:easypermissions:3.0.0'

//implementation rootProject.ext.guava
// implementation(materialDialogs) {
// exclude module: 'appcompat-v7'
// exclude module: 'recyclerview-v7'
// exclude module: 'support-annotations'
// transitive = true
// }


// MapBox SDK
implementation(rootProject.ext.mapbox) {
transitive = true
Expand Down
6 changes: 0 additions & 6 deletions org.envirocar.app/res/layout/activity_help_layout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,6 @@

</LinearLayout>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"
android:text="@string/help_content_2_2"/>

<TextView
style="@style/enviroCar.Help.headline2"
android:layout_marginTop="@dimen/spacing_large"
Expand Down
109 changes: 67 additions & 42 deletions org.envirocar.app/res/layout/activity_signin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,65 +53,75 @@
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:text="@string/sign_in"
android:textColor="@color/white_cario"
android:textSize="26dp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_login_logo" />

<EditText
android:id="@+id/activity_signin_username_input"
style="@style/envirocar.login.edittext"
android:layout_below="@+id/activity_login_logo"
android:layout_centerHorizontal="true"
android:layout_marginTop="80dp"
android:background="@drawable/login_edittext_rounded_corner_shape"
android:drawableLeft="@drawable/ic_action_user"
android:hint="@string/username"
android:singleLine="true"
android:imeOptions="actionNext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />

<EditText
android:id="@+id/activity_login_password_input"
style="@style/envirocar.login.edittext"
android:layout_below="@+id/activity_signin_username_input"
android:layout_marginTop="32dp"
android:drawableLeft="@drawable/ic_action_pass"
android:hint="@string/password"
android:inputType="textPassword"
android:imeOptions="actionDone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.502"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_signin_username_input" />

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/activity_signin_username_input_layout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginTop="40dp"
app:hintEnabled="false"
app:layout_constraintEnd_toEndOf="@id/activity_signin_guideline_right"
app:layout_constraintStart_toStartOf="@id/activity_signin_guideline_left"
app:layout_constraintTop_toBottomOf="@+id/textView6"
app:layout_constraintWidth_max="500dp">

<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/activity_signin_username_input"
style="@style/envirocar.login.edittext"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/login_edittext_rounded_corner_shape"
android:drawableLeft="@drawable/ic_action_user"
android:hint="@string/username"
android:imeOptions="actionNext"
android:singleLine="true" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/activity_signin_password_input_layout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_marginTop="40dp"
app:hintEnabled="false"
app:layout_constraintEnd_toEndOf="@id/activity_signin_guideline_right"
app:layout_constraintStart_toStartOf="@id/activity_signin_guideline_left"
app:layout_constraintTop_toBottomOf="@+id/activity_signin_username_input_layout"
app:layout_constraintWidth_max="500dp">

<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/activity_login_password_input"
style="@style/envirocar.login.edittext"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:drawableLeft="@drawable/ic_action_pass"
android:hint="@string/password"
android:imeOptions="actionDone"
android:inputType="textPassword" />

</com.google.android.material.textfield.TextInputLayout>

<androidx.cardview.widget.CardView
android:id="@+id/activity_signin_login_button"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_below="@id/activity_signin_username_input"
android:layout_centerHorizontal="true"
android:layout_marginStart="55dp"
android:layout_marginLeft="55dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="48dp"
android:layout_marginEnd="55dp"
android:layout_marginRight="55dp"
app:cardBackgroundColor="@color/cario_color_primary_dark"
app:cardCornerRadius="25dp"
app:cardElevation="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_login_password_input">
app:layout_constraintEnd_toStartOf="@id/activity_signin_guideline_right"
app:layout_constraintStart_toStartOf="@id/activity_signin_guideline_left"
app:layout_constraintTop_toBottomOf="@+id/activity_signin_password_input_layout">

<TextView
android:layout_width="wrap_content"
Expand Down Expand Up @@ -150,5 +160,20 @@
android:textColor="@color/white_cario" />

</LinearLayout>

<androidx.constraintlayout.widget.Guideline
android:id="@+id/activity_signin_guideline_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.87" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/activity_signin_guideline_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.13" />

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
Loading

0 comments on commit f26cbf3

Please sign in to comment.