keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Switch import/export activity from cards to a list

Browse Source 
Add touch ripple to items

Closes #6564
// FREEBIE
pull/1/head
Mateo Hernandez 7 years ago committed by Moxie Marlinspike
parent cb670d6783
commit 291dafa5c8
1 changed files with 137 additions and 159 deletions
Show Stats Download Patch File Download Diff File

296
res/layout/import_export_fragment.xml
Unescape Escape View File

@ -2,188 +2,166 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center_vertical"> android:gravity="center_vertical">
<LinearLayout android:orientation="vertical" <LinearLayout android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:gravity="center_vertical"
android:layout_gravity="center_vertical" <TextView
android:padding="8dip"> android:layout_width="match_parent"
android:layout_height="48dp"
<android.support.v7.widget.CardView android:layout_marginLeft="16dp"
android:layout_width="match_parent" android:layout_marginStart="16dp"
android:layout_height="wrap_content" android:gravity="center_vertical"
card_view:cardElevation="3dp" android:text="@string/ImportExportActivity_import"
card_view:cardCornerRadius="3dp" android:textSize="14sp"
card_view:cardUseCompatPadding="true"> android:fontFamily="sans-serif-medium"
android:textColor="@color/signal_primary_dark"/>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" <LinearLayout android:layout_width="wrap_content"
android:orientation="vertical"> android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" <LinearLayout android:id="@+id/import_sms"
android:padding="20dp"> android:clickable="true"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="76dp"
android:gravity="center_vertical"
android:background="?selectableItemBackground">
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="32dp"
android:layout_marginEnd="32dp"
android:src="?import_sms"/>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp">
<TextView android:layout_width="wrap_content" <TextView android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/import_export_fragment__import" android:gravity="start"
android:textSize="20sp"/> style="@style/Registration.Description"
android:text="@string/import_fragment__import_system_sms_database"/>
</FrameLayout> <TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/import_fragment__import_the_database_from_the_default_system"/>
<View </LinearLayout>
android:layout_width="match_parent" </LinearLayout>
android:layout_height="1dp"
android:background="@color/gray10"/>
<LinearLayout android:id="@+id/import_sms" <View
android:clickable="true" android:layout_width="match_parent"
android:orientation="horizontal" android:layout_height="1dp"
android:background="?android:attr/listDivider"/>
<LinearLayout android:id="@+id/import_plaintext_backup"
android:clickable="true"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="76dp"
android:gravity="center_vertical"
android:background="?selectableItemBackground">
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="32dip"
android:layout_marginEnd="32dip"
android:src="?plaintext_backup"/>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:layout_marginRight="16dp"
android:paddingTop="8dip" android:layout_marginEnd="16dp">
android:paddingBottom="8dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip">
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_marginEnd="10dip"
android:src="?import_sms"/>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
style="@style/Registration.Description"
android:text="@string/import_fragment__import_system_sms_database"/>
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/import_fragment__import_the_database_from_the_default_system"/>
</LinearLayout>
</LinearLayout>
<View <TextView android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="1dp" android:gravity="start"
android:background="@color/gray10"/> style="@style/Registration.Description"
android:text="@string/import_fragment__import_plaintext_backup"/>
<LinearLayout android:id="@+id/import_plaintext_backup" <TextView android:layout_width="match_parent"
android:clickable="true"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="start"
android:paddingTop="8dip" android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingBottom="8dip" android:text="@string/import_fragment__import_a_plaintext_backup_file"/>
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip">
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_marginEnd="10dip"
android:src="?plaintext_backup"/>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
style="@style/Registration.Description"
android:text="@string/import_fragment__import_plaintext_backup"/>
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/import_fragment__import_a_plaintext_backup_file"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView> </LinearLayout>
<android.support.v7.widget.CardView <include layout="@layout/preference_divider"/>
android:layout_marginTop="20dp"
card_view:cardElevation="3dp" <TextView
card_view:cardCornerRadius="2dp" android:layout_width="match_parent"
card_view:cardUseCompatPadding="true" android:layout_height="48dp"
android:layout_width="match_parent" android:layout_marginLeft="16dp"
android:layout_height="wrap_content"> android:layout_marginStart="16dp"
android:gravity="center_vertical"
<LinearLayout android:layout_width="wrap_content" android:text="@string/ImportExportActivity_export"
android:layout_height="wrap_content" android:textSize="14sp"
android:orientation="vertical"> android:fontFamily="sans-serif-medium"
android:textColor="@color/signal_primary_dark"/>
<FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content" <LinearLayout android:layout_width="wrap_content"
android:padding="20dp"> android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:layout_width="wrap_content"
<LinearLayout android:id="@+id/export_plaintext_backup"
android:clickable="true"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="76dp"
android:gravity="center_vertical"
android:background="?selectableItemBackground">
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginRight="32dp"
android:layout_marginEnd="32dp"
android:src="?plaintext_backup"/>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/import_export_fragment__export" android:layout_marginRight="16dp"
android:textSize="20sp"/> android:layout_marginEnd="16dp">
</FrameLayout>
<View <TextView android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="1dp" android:gravity="start"
android:background="@color/gray10"/> style="@style/Registration.Description"
android:text="@string/export_fragment__export_plaintext_backup"/>
<LinearLayout android:id="@+id/export_plaintext_backup" <TextView android:layout_width="match_parent"
android:clickable="true"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="start"
android:paddingTop="8dip" android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingBottom="8dip" android:text="@string/export_fragment__export_a_plaintext_backup_compatible_with"/>
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip">
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_marginEnd="10dip"
android:src="?plaintext_backup"/>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
style="@style/Registration.Description"
android:text="@string/export_fragment__export_plaintext_backup"/>
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/export_fragment__export_a_plaintext_backup_compatible_with"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:attr/listDivider"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
Write Preview
Loading…
Cancel
Save