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

Make PN mode screen scroll

Browse Source
pull/223/head
nielsandriesse 5 years ago
parent ceee4581e4
commit 02ceef278c
2 changed files with 168 additions and 172 deletions
Show Stats Download Patch File Download Diff File

170
res/layout-sw400dp/activity_pn_mode.xml
Unescape Escape View File

@ -1,116 +1,114 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" 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">
android:background="@drawable/default_session_background"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textStyle="bold"
android:textColor="@color/text"
android:text="@string/activity_pn_mode_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="10dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:text="@string/activity_pn_mode_explanation" />
<LinearLayout <LinearLayout
android:id="@+id/fcmOptionView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing" android:background="@drawable/default_session_background"
android:layout_marginTop="@dimen/medium_spacing" android:orientation="vertical">
android:layout_marginRight="@dimen/very_large_spacing"
android:padding="12dp"
android:orientation="vertical"
android:background="@drawable/pn_option_background">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/medium_font_size" android:layout_marginLeft="@dimen/very_large_spacing"
android:textColor="@color/text" android:layout_marginTop="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/very_large_font_size"
android:textStyle="bold" android:textStyle="bold"
android:text="@string/activity_pn_mode_fcm_option_title" /> android:textColor="@color/text"
android:text="@string/activity_pn_mode_title" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textSize="@dimen/very_small_font_size" android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text" android:textColor="@color/text"
android:text="@string/activity_pn_mode_fcm_option_explanation" /> android:text="@string/activity_pn_mode_explanation" />
<TextView <LinearLayout
android:id="@+id/fcmOptionView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textSize="@dimen/very_small_font_size" android:layout_marginTop="20dp"
android:textColor="@color/accent" android:layout_marginRight="@dimen/very_large_spacing"
android:textStyle="bold" android:padding="12dp"
android:text="@string/activity_pn_mode_recommended_option_tag" /> android:orientation="vertical"
android:background="@drawable/pn_option_background">
</LinearLayout> <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:textStyle="bold"
android:text="@string/activity_pn_mode_fcm_option_title" />
<LinearLayout <TextView
android:id="@+id/backgroundPollingOptionView" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="4dp"
android:layout_marginLeft="@dimen/very_large_spacing" android:textSize="@dimen/very_small_font_size"
android:layout_marginTop="@dimen/small_spacing" android:textColor="@color/text"
android:layout_marginRight="@dimen/very_large_spacing" android:text="@string/activity_pn_mode_fcm_option_explanation" />
android:padding="12dp"
android:orientation="vertical"
android:background="@drawable/pn_option_background">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/medium_font_size" android:layout_marginTop="4dp"
android:textColor="@color/text" android:textSize="@dimen/very_small_font_size"
android:textStyle="bold" android:textColor="@color/accent"
android:text="@string/activity_pn_mode_background_polling_option_title" /> android:textStyle="bold"
android:text="@string/activity_pn_mode_recommended_option_tag" />
<TextView </LinearLayout>
<LinearLayout
android:id="@+id/backgroundPollingOptionView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textSize="@dimen/very_small_font_size" android:layout_marginTop="@dimen/small_spacing"
android:textColor="@color/text" android:layout_marginRight="@dimen/very_large_spacing"
android:text="@string/activity_pn_mode_background_polling_option_explanation" /> android:padding="12dp"
android:orientation="vertical"
android:background="@drawable/pn_option_background">
</LinearLayout> <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/medium_font_size"
android:textColor="@color/text"
android:textStyle="bold"
android:text="@string/activity_pn_mode_background_polling_option_title" />
<View <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1"/> android:layout_marginTop="4dp"
android:textSize="@dimen/very_small_font_size"
android:textColor="@color/text"
android:text="@string/activity_pn_mode_background_polling_option_explanation" />
<Button </LinearLayout>
style="@style/MediumProminentFilledButton"
android:id="@+id/registerButton" <Button
android:layout_width="match_parent" style="@style/MediumProminentFilledButton"
android:layout_height="@dimen/medium_button_height" android:id="@+id/registerButton"
android:layout_marginLeft="@dimen/massive_spacing" android:layout_width="match_parent"
android:layout_marginRight="@dimen/massive_spacing" android:layout_height="@dimen/medium_button_height"
android:layout_marginBottom="@dimen/medium_spacing" android:layout_marginLeft="@dimen/massive_spacing"
android:text="Continue" /> android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:text="@string/continue_2" />
</LinearLayout>
</LinearLayout> </ScrollView>

170
res/layout/activity_pn_mode.xml
Unescape Escape View File

@ -1,116 +1,114 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
xmlns:android="http://schemas.android.com/apk/res/android" 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="wrap_content">
android:background="@drawable/default_session_background"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="@color/text"
android:text="@string/activity_pn_mode_title" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing"
android:layout_marginTop="4dp"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="13sp"
android:textColor="@color/text"
android:text="@string/activity_pn_mode_explanation" />
<LinearLayout <LinearLayout
android:id="@+id/fcmOptionView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/very_large_spacing" android:background="@drawable/default_session_background"
android:layout_marginTop="4dp" android:orientation="vertical">
android:layout_marginRight="@dimen/very_large_spacing"
android:padding="10dp"
android:orientation="vertical"
android:background="@drawable/pn_option_background">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textColor="@color/text" android:layout_marginTop="@dimen/very_large_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/large_font_size"
android:textStyle="bold" android:textStyle="bold"
android:text="@string/activity_pn_mode_fcm_option_title" /> android:textColor="@color/text"
android:text="@string/activity_pn_mode_title" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textSize="@dimen/very_small_font_size" android:layout_marginTop="@dimen/small_spacing"
android:layout_marginRight="@dimen/very_large_spacing"
android:textSize="@dimen/small_font_size"
android:textColor="@color/text" android:textColor="@color/text"
android:text="@string/activity_pn_mode_fcm_option_explanation" /> android:text="@string/activity_pn_mode_explanation" />
<TextView <LinearLayout
android:id="@+id/fcmOptionView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textSize="@dimen/very_small_font_size" android:layout_marginTop="12dp"
android:textColor="@color/accent" android:layout_marginRight="@dimen/very_large_spacing"
android:textStyle="bold" android:padding="12dp"
android:text="@string/activity_pn_mode_recommended_option_tag" /> android:orientation="vertical"
android:background="@drawable/pn_option_background">
</LinearLayout> <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/medium_spacing"
android:textColor="@color/text"
android:textStyle="bold"
android:text="@string/activity_pn_mode_fcm_option_title" />
<LinearLayout <TextView
android:id="@+id/backgroundPollingOptionView" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="4dp"
android:layout_marginLeft="@dimen/very_large_spacing" android:textSize="@dimen/very_small_font_size"
android:layout_marginTop="4dp" android:textColor="@color/text"
android:layout_marginRight="@dimen/very_large_spacing" android:text="@string/activity_pn_mode_fcm_option_explanation" />
android:padding="10dp"
android:orientation="vertical"
android:background="@drawable/pn_option_background">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:layout_marginTop="4dp"
android:textColor="@color/text" android:textSize="@dimen/very_small_font_size"
android:textStyle="bold" android:textColor="@color/accent"
android:text="@string/activity_pn_mode_background_polling_option_title" /> android:textStyle="bold"
android:text="@string/activity_pn_mode_recommended_option_tag" />
<TextView </LinearLayout>
<LinearLayout
android:id="@+id/backgroundPollingOptionView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginLeft="@dimen/very_large_spacing"
android:textSize="@dimen/very_small_font_size" android:layout_marginTop="@dimen/small_spacing"
android:textColor="@color/text" android:layout_marginRight="@dimen/very_large_spacing"
android:text="@string/activity_pn_mode_background_polling_option_explanation" /> android:padding="12dp"
android:orientation="vertical"
android:background="@drawable/pn_option_background">
</LinearLayout> <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/medium_spacing"
android:textColor="@color/text"
android:textStyle="bold"
android:text="@string/activity_pn_mode_background_polling_option_title" />
<View <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="1"/> android:layout_marginTop="4dp"
android:textSize="@dimen/very_small_font_size"
android:textColor="@color/text"
android:text="@string/activity_pn_mode_background_polling_option_explanation" />
<Button </LinearLayout>
style="@style/MediumProminentFilledButton"
android:id="@+id/registerButton" <Button
android:layout_width="match_parent" style="@style/MediumProminentFilledButton"
android:layout_height="@dimen/medium_button_height" android:id="@+id/registerButton"
android:layout_marginLeft="@dimen/massive_spacing" android:layout_width="match_parent"
android:layout_marginRight="@dimen/massive_spacing" android:layout_height="@dimen/medium_button_height"
android:layout_marginBottom="@dimen/medium_spacing" android:layout_marginLeft="@dimen/massive_spacing"
android:text="@string/continue_2" /> android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginRight="@dimen/massive_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:text="@string/continue_2" />
</LinearLayout>
</LinearLayout> </ScrollView>
Write Preview
Loading…
Cancel
Save