Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
b8e882fb
Commit
b8e882fb
authored
5 months ago
by
Pierre Nicolas
Committed by
Adrien Béraud
5 months ago
Browse files
Options
Downloads
Patches
Plain Diff
linkdevice: improve import UI
Change-Id: I14f7217ae713f9300e35cf8e9b61d2973b794337
parent
7d929929
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
jami-android/app/src/main/res/layout/frag_acc_summary.xml
+2
-0
2 additions, 0 deletions
jami-android/app/src/main/res/layout/frag_acc_summary.xml
jami-android/app/src/main/res/layout/fragment_import_side_step_2.xml
+23
-6
23 additions, 6 deletions
...d/app/src/main/res/layout/fragment_import_side_step_2.xml
with
25 additions
and
6 deletions
jami-android/app/src/main/res/layout/frag_acc_summary.xml
+
2
−
0
View file @
b8e882fb
...
@@ -164,6 +164,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
...
@@ -164,6 +164,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:hint=
"@string/registered_username"
android:hint=
"@string/registered_username"
android:textColorHint=
"@color/settings_submenu_header"
android:textColorHint=
"@color/settings_submenu_header"
style=
"?attr/textInputFilledStyle"
app:hintEnabled=
"true"
app:hintEnabled=
"true"
app:hintTextColor=
"@color/settings_submenu_header"
app:hintTextColor=
"@color/settings_submenu_header"
android:enabled=
"false"
>
android:enabled=
"false"
>
...
@@ -223,6 +224,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
...
@@ -223,6 +224,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:hint=
"@string/ring_account_identity"
android:hint=
"@string/ring_account_identity"
android:textColorHint=
"@color/settings_submenu_header"
android:textColorHint=
"@color/settings_submenu_header"
style=
"?attr/textInputFilledStyle"
app:hintEnabled=
"true"
app:hintEnabled=
"true"
app:hintTextColor=
"@color/settings_submenu_header"
>
app:hintTextColor=
"@color/settings_submenu_header"
>
...
...
This diff is collapsed.
Click to expand it.
jami-android/app/src/main/res/layout/fragment_import_side_step_2.xml
+
23
−
6
View file @
b8e882fb
...
@@ -3,19 +3,36 @@
...
@@ -3,19 +3,36 @@
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
android:paddingHorizontal=
"16dp"
>
<androidx.cardview.widget.CardView
<TextView
android:id=
"@+id/title"
style=
"@style/TextAppearance.Material3.HeadlineSmall"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginVertical=
"16dp"
android:text=
"Confirm account import"
android:textAlignment=
"center"
app:layout_constraintBottom_toTopOf=
"@+id/identityContainer"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_chainStyle=
"packed"
/>
<com.google.android.material.card.MaterialCardView
android:id=
"@+id/identityContainer"
android:id=
"@+id/identityContainer"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginHorizontal=
"8dp"
android:layout_marginHorizontal=
"8dp"
android:layout_marginTop=
"8dp"
app:layout_constrainedWidth=
"true"
app:layout_constrainedWidth=
"true"
app:layout_constraintBottom_toTopOf=
"@id/passwordContainer"
app:layout_constraintBottom_toTopOf=
"@id/passwordContainer"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/title"
app:layout_constraintVertical_chainStyle=
"packed"
>
app:layout_constraintVertical_chainStyle=
"packed"
app:cardElevation=
"2dp"
>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
@@ -74,13 +91,13 @@
...
@@ -74,13 +91,13 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</
androidx.cardview.widget.
CardView>
</
com.google.android.material.card.Material
CardView>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/passwordContainer"
android:id=
"@+id/passwordContainer"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"
32
dp"
android:layout_marginTop=
"
64
dp"
app:layout_constraintBottom_toTopOf=
"@id/connect"
app:layout_constraintBottom_toTopOf=
"@id/connect"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment