diff options
author | Thomas <tschneider.ac@gmail.com> | 2022-07-21 16:19:00 +0200 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2022-07-21 16:19:00 +0200 |
commit | 83ad77f3ea47c8aab394da953c6c5692f7ec5653 (patch) | |
tree | f04175e85226127a3793ed255d46a2c66df9358e /app/src/main/res/layout/activity_instance.xml | |
parent | 10fefbe6d9528cfab638515be662cbab7b8a1fd7 (diff) | |
parent | 07a819a9c2c0102f97079b8c483f9babfa46bb37 (diff) |
Merge branch 'develop' into main3.0.10
Diffstat (limited to 'app/src/main/res/layout/activity_instance.xml')
-rw-r--r-- | app/src/main/res/layout/activity_instance.xml | 101 |
1 files changed, 68 insertions, 33 deletions
diff --git a/app/src/main/res/layout/activity_instance.xml b/app/src/main/res/layout/activity_instance.xml index 790c0c630..8661017bc 100644 --- a/app/src/main/res/layout/activity_instance.xml +++ b/app/src/main/res/layout/activity_instance.xml @@ -16,37 +16,32 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="350dp"> + android:layout_height="wrap_content"> - <RelativeLayout + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:id="@+id/main_container" + android:layout_height="420dp" android:padding="@dimen/fab_margin" android:paddingLeft="@dimen/drawer_padding" android:paddingRight="@dimen/drawer_padding"> - <RelativeLayout + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/background" android:layout_width="match_parent" - android:layout_height="300dp" - android:alpha="0.2"> - - <ImageView - android:id="@+id/back_ground_image" - android:layout_width="match_parent" - android:layout_height="300dp" - android:contentDescription="@string/logo_of_the_instance" - android:scaleType="centerCrop" /> - </RelativeLayout> + android:layout_height="match_parent" /> - <LinearLayout + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_height="300dp" android:id="@+id/instance_container" android:layout_width="match_parent" - android:layout_height="match_parent" + app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="20dp" android:orientation="vertical"> <!-- Instance title --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_title" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -55,7 +50,7 @@ android:textSize="20sp" /> <!-- Instance description --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_description" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -64,7 +59,7 @@ android:gravity="center_horizontal" android:textSize="16sp" /> - <LinearLayout + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" @@ -72,7 +67,7 @@ android:gravity="center" android:orientation="horizontal"> <!-- Instance version --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_version" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -80,7 +75,7 @@ android:textSize="14sp" android:textStyle="italic" /> <!-- Instance URI --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/instance_uri" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -88,24 +83,48 @@ android:gravity="center_horizontal" android:textSize="14sp" android:textStyle="italic" /> - </LinearLayout> + </androidx.appcompat.widget.LinearLayoutCompat> + + + + + </androidx.appcompat.widget.LinearLayoutCompat> + + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/max_char_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:visibility="gone" + app:layout_constraintTop_toBottomOf="@+id/instance_container" + tools:visibility="visible"> + + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/set_your_max_char_count" + android:textSize="18sp" /> - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/instance_contact" + <androidx.appcompat.widget.AppCompatEditText + android:id="@+id/max_char" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_margin="@dimen/fab_margin" - android:contentDescription="@string/contact_instance_admin" - android:src="@drawable/ic_baseline_mail_outline_24" - app:backgroundTint="@color/cyanea_accent_dark_reference" /> - </LinearLayout> + android:layout_marginStart="10dp" + android:hint="500" + android:inputType="number" + android:textSize="18sp" + tools:ignore="HardcodedText" /> + </androidx.appcompat.widget.LinearLayoutCompat> + <!-- Main Loader --> <RelativeLayout android:id="@+id/loader" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="420dp" android:gravity="center" + tools:visibility="visible" android:visibility="gone"> <ProgressBar @@ -114,7 +133,23 @@ android:indeterminate="true" /> </RelativeLayout> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/instance_contact" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|end" + android:layout_margin="@dimen/fab_margin" + android:contentDescription="@string/contact_instance_admin" + android:src="@drawable/ic_baseline_mail_outline_24" + app:backgroundTint="@color/cyanea_accent_dark_reference" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> + <androidx.appcompat.widget.AppCompatButton + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/max_char_container" android:id="@+id/close" style="@style/Widget.AppCompat.Button.Colored" android:layout_width="wrap_content" @@ -122,10 +157,10 @@ android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" android:layout_gravity="center" - android:layout_marginTop="20dp" android:text="@string/close" android:textAllCaps="false" android:textColor="@color/white" android:textSize="16sp" /> - </RelativeLayout> + + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView>
\ No newline at end of file |