This commit is contained in:
Amine
2017-11-12 17:05:36 +01:00
parent 9e6602f114
commit f833d73fab
16 changed files with 346 additions and 452 deletions

View File

@ -9,7 +9,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.github.stkent.amplify.prompt.DefaultLayoutPromptView
android:id="@+id/prompt_view"
android:id="@+id/promptView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:prompt_view_user_opinion_question_title="@string/rating_prompt_title"
@ -34,7 +34,7 @@
android:id="@+id/coordLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/prompt_view">
android:layout_below="@id/promptView">
<android.support.design.widget.CoordinatorLayout
android:id="@+id/intern_coordLayout"
@ -51,7 +51,7 @@
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:id="@+id/toolBar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:theme="@style/ToolBarStyle"
@ -89,7 +89,7 @@
android:background="@color/transparent"
android:visibility="gone" />
<android.support.v7.widget.RecyclerView
android:id="@+id/my_recycler_view"
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"

View File

@ -28,7 +28,7 @@
android:paddingTop="@dimen/activity_vertical_margin">
<!-- Login progress -->
<ProgressBar
android:id="@+id/login_progress"
android:id="@+id/loginProgress"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -36,7 +36,7 @@
android:visibility="gone"/>
<ScrollView
android:id="@+id/login_form"
android:id="@+id/loginForm"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -52,14 +52,13 @@
>
<EditText
android:id="@+id/url"
android:id="@+id/urlView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_url"
android:imeOptions="actionUnspecified"
android:inputType="textUri"
android:maxLines="1"
/>
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
@ -77,13 +76,12 @@
android:visibility="gone">
<AutoCompleteTextView
android:id="@+id/login"
android:id="@+id/loginView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_login"
android:inputType="text"
android:maxLines="1"
/>
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
@ -94,13 +92,12 @@
android:visibility="gone">
<EditText
android:id="@+id/password"
android:id="@+id/passwordView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_password"
android:inputType="textPassword"
android:maxLines="1"
/>
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
@ -118,7 +115,7 @@
android:visibility="gone">
<EditText
android:id="@+id/httpLogin"
android:id="@+id/httpLoginView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_http_login" />
@ -131,11 +128,11 @@
android:visibility="gone">
<EditText
android:id="@+id/httpPassword"
android:id="@+id/httpPasswordView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:hint="@string/prompt_http_password" />
android:hint="@string/prompt_http_password"
android:inputType="textPassword" />
</android.support.design.widget.TextInputLayout>
<Switch
@ -153,7 +150,7 @@
android:visibility="gone" />
<Button
android:id="@+id/email_sign_in_button"
android:id="@+id/signInButton"
style="?android:textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@ -41,7 +41,7 @@
app:layout_constraintTop_toBottomOf="@+id/imageView" />
<TextView
android:id="@+id/title"
android:id="@+id/titleView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
@ -70,7 +70,7 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
app:layout_constraintTop_toBottomOf="@+id/titleView" />
<!--<org.sufficientlysecure.htmltextview.HtmlTextView
android:id="@+id/content"
@ -85,7 +85,7 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />-->
app:layout_constraintTop_toBottomOf="@+id/titleView" />-->
</android.support.constraint.ConstraintLayout>

View File

@ -22,7 +22,7 @@
</android.support.design.widget.AppBarLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/activity_sources"
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"