Louvorg/ReaderforSelfoss
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Updated to androidx."

Browse Source 
This reverts commit d47ba2c820.
This commit is contained in:
Amine
2018-09-25 20:27:27 +02:00
parent d47ba2c820
commit 21be7357b5
49 changed files with 240 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layout/activity_login.xml
View File

@ -6,18 +6,18 @@
android:gravity="center_horizontal"
android:orientation="vertical"
tools:context="apps.amine.bou.readerforselfoss.LoginActivity">
<com.google.android.material.appbar.AppBarLayout
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.Toolbar
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:theme="@style/ToolBarStyle"
app:popupTheme="?attr/toolbarPopupTheme" />
</com.google.android.material.appbar.AppBarLayout>
</android.support.design.widget.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/urlLayout"
@ -60,7 +60,7 @@
android:inputType="textUri"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<Switch
android:text="@string/withLoginSwitch"
@ -69,7 +69,7 @@
android:id="@+id/withLogin"
android:layout_weight="1"/>
<com.google.android.material.textfield.TextInputLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/loginLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -83,9 +83,9 @@
android:inputType="text"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/passwordLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -99,7 +99,7 @@
android:inputType="textPassword"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<Switch
android:id="@+id/withHttpLogin"
@ -108,7 +108,7 @@
android:layout_weight="1"
android:text="@string/withHttpLoginSwitch" />
<com.google.android.material.textfield.TextInputLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/httpLoginInput"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -120,9 +120,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_http_login" />
</com.google.android.material.textfield.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/httpPasswordInput"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -134,7 +134,7 @@
android:layout_height="wrap_content"
android:hint="@string/prompt_http_password"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<Switch
android:id="@+id/withSelfhostedCert"