diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2019-10-01 22:14:28 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 22:14:28 +0530 |
| commit | 073346c157ec34b750d175c8543f346e6eae94de (patch) | |
| tree | a55d24ef43563f3a2d03d7938a1e96c1f5cd1caf /app/src/main/res/layout/activity_git_clone.xml | |
| parent | c9dc4034f12b62f4470f92fb13ecd72871f4a5b7 (diff) | |
| download | HardenedPass-073346c157ec34b750d175c8543f346e6eae94de.tar.gz HardenedPass-073346c157ec34b750d175c8543f346e6eae94de.zip | |
Redesign UI and introduce dark theme (#519)
Caveats:
- The openpgp preference had to be removed because the open-intents developers are too lazy to update their libraries. Over the coming weeks I will be reimplementing a local solution for this instead.
- The autofill dialog is broken but I since it is being worked on in #410 already I'm not going to bother fixing it.
Diffstat (limited to 'app/src/main/res/layout/activity_git_clone.xml')
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 358 |
1 files changed, 167 insertions, 191 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index c96a6201..c4612765 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -1,211 +1,187 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:padding="@dimen/activity_horizontal_margin" tools:context="com.zeapo.pwdstore.git.GitActivity" - android:background="@android:color/white"> - - <LinearLayout + android:background="?android:attr/windowBackground"> + + <androidx.appcompat.widget.AppCompatTextView + style="@style/TextAppearance.MaterialComponents.Headline5" + android:id="@+id/server_label" + android:textStyle="bold" + android:textSize="24sp" + android:text="@string/server_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_margin="8dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/server_name" - android:textStyle="bold" - style="@android:style/TextAppearance.Large" - android:gravity="start" - android:paddingBottom="6dp" - android:textColor="@color/blue_grey_500" - android:background="@drawable/bottom_line"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_protocol" - android:id="@+id/label_server_protocol" - android:layout_centerVertical="true" - android:layout_alignParentStart="true" /> - - <Spinner - android:id="@+id/clone_protocol" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_toEndOf="@+id/label_server_protocol" /> - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_user" - android:id="@+id/label_server_user" - android:layout_centerVertical="true" - android:paddingBottom="8dp" - android:layout_alignParentStart="true" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/server_user_hint" - android:id="@+id/server_user" - android:layout_marginStart="8dp" - android:layout_toEndOf="@+id/label_server_user" - android:layout_alignParentEnd="true" - android:inputType="textWebEmailAddress"/> - </RelativeLayout> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_url" - android:paddingBottom="8dp" - android:id="@+id/label_server_url" - android:layout_centerVertical="true" - android:layout_alignParentStart="true" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/server_url_hint" - android:id="@+id/server_url" - android:layout_marginStart="8dp" - android:layout_toEndOf="@+id/label_server_url" - android:layout_toStartOf="@+id/label_server_port" - android:inputType="textWebEmailAddress" - tools:ignore="TextFields" /> - - <TextView - android:id="@+id/label_server_port" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toStartOf="@+id/server_port" - android:paddingBottom="8dp" - android:text=":" - tools:ignore="HardcodedText" /> - - <EditText - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:hint="@string/server_port_hint" - android:id="@+id/server_port" - android:layout_alignParentEnd="true" - android:inputType="number"/> - - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_path" - android:paddingBottom="8dp" - android:id="@+id/label_server_path" - android:layout_centerVertical="true" - android:layout_alignParentStart="true" /> - - <EditText - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/server_path_hint" - android:layout_marginStart="8dp" - android:id="@+id/server_path" - android:layout_toEndOf="@+id/label_server_path" - android:layout_alignParentEnd="true" - android:inputType="textWebEmailAddress"/> - </RelativeLayout> - - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="@string/server_resulting_url" - android:textStyle="bold" - style="@android:style/TextAppearance.Large" - android:gravity="start" - android:paddingBottom="6dp" - android:textColor="@color/blue_grey_500" - android:background="@drawable/bottom_line"/> - - <EditText - android:id="@+id/clone_uri" + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/label_server_protocol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_protocol" + android:layout_margin="8dp" + app:layout_constraintTop_toBottomOf="@id/server_label" + app:layout_constraintStart_toStartOf="parent" /> + + <Spinner + android:id="@+id/clone_protocol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + app:layout_constraintTop_toBottomOf="@id/server_label" + app:layout_constraintStart_toEndOf="@id/label_server_protocol" /> + + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/server_user_layout" + android:hint="@string/server_user" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + app:hintEnabled="true" + app:layout_constraintTop_toBottomOf="@id/label_server_protocol"> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/server_user" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/repository_uri" - android:inputType="textWebEmailAddress" - tools:ignore="TextFields" /> + android:inputType="textWebEmailAddress" /> + </com.google.android.material.textfield.TextInputLayout> - <TextView + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/label_server_url" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/server_url" + app:hintEnabled="true" + app:layout_constraintTop_toBottomOf="@id/server_user_layout" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/label_server_port"> + + <com.google.android.material.textfield.TextInputEditText android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/red_rectangle" - android:textColor="@android:color/white" - android:visibility="gone" - android:id="@+id/warn_url"/> + android:id="@+id/server_url" + android:inputType="textWebEmailAddress" /> - <RelativeLayout + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/label_server_port" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/server_port_hint" + app:hintEnabled="true" + app:layout_constraintStart_toEndOf="@id/label_server_url" + app:layout_constraintTop_toBottomOf="@id/server_user_layout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintDimensionRatio="1:0.8"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/server_port" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_gravity="center_vertical"> - - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/connection_mode" - android:id="@+id/label_connection_mode" - android:layout_centerVertical="true" - android:layout_alignParentStart="true" /> - - <Spinner - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/connection_mode" - android:layout_toEndOf="@+id/label_connection_mode" /> - </RelativeLayout> - - <Button - android:id="@+id/clone_button" - android:text="@string/clone_button" + android:inputType="number" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/label_server_path" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/server_path" + app:hintEnabled="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_server_url"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/server_path" android:layout_width="match_parent" android:layout_height="wrap_content" - android:onClick="cloneRepository"/> - <Button - android:id="@+id/save_button" - android:text="@string/crypto_save" + android:inputType="textWebEmailAddress"/> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + style="@style/TextInputLayoutBase" + android:id="@+id/label_clone_uri" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/repository_uri" + android:editable="false" + android:layout_margin="8dp" + app:hintEnabled="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_server_path"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/clone_uri" android:layout_width="match_parent" android:layout_height="wrap_content" - android:onClick="saveConfiguration"/> - </LinearLayout> + android:inputType="textWebEmailAddress"/> -</ScrollView> + </com.google.android.material.textfield.TextInputLayout> + + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/red_rectangle" + android:textColor="@android:color/white" + android:visibility="gone" + android:id="@+id/warn_url" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_clone_uri"/> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/label_connection_mode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/connection_mode" + android:layout_margin="16dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/warn_url" /> + + <Spinner + android:id="@+id/connection_mode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + app:layout_constraintTop_toBottomOf="@id/warn_url" + app:layout_constraintStart_toEndOf="@id/label_connection_mode" /> + + <com.google.android.material.button.MaterialButton + style="@style/Widget.MaterialComponents.Button" + android:id="@+id/clone_button" + android:text="@string/clone_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="cloneRepository" + android:textColor="?android:attr/windowBackground" + android:layout_marginTop="8dp" + app:backgroundTint="?attr/colorSecondary" + app:layout_constraintTop_toBottomOf="@id/label_connection_mode" + app:layout_constraintStart_toStartOf="parent" /> + + <com.google.android.material.button.MaterialButton + style="@style/Widget.MaterialComponents.Button" + android:id="@+id/save_button" + android:text="@string/crypto_save" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:onClick="saveConfiguration" + android:textColor="?android:attr/windowBackground" + android:layout_marginTop="8dp" + app:backgroundTint="?attr/colorSecondary" + app:layout_constraintTop_toBottomOf="@id/label_connection_mode" + app:layout_constraintStart_toStartOf="parent" /> +</androidx.constraintlayout.widget.ConstraintLayout> |
