diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a492481ea9..57b9a1b4ce 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -150,6 +150,9 @@ android:name="org.thoughtcrime.securesms.loki.redesign.activities.JoinPublicChatActivity" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/profile_picture_view_large_background.xml b/res/drawable/profile_picture_view_large_background.xml new file mode 100644 index 0000000000..bfc404e25f --- /dev/null +++ b/res/drawable/profile_picture_view_large_background.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/profile_picture_view_large_foreground.xml b/res/drawable/profile_picture_view_large_foreground.xml new file mode 100644 index 0000000000..18cac49b38 --- /dev/null +++ b/res/drawable/profile_picture_view_large_foreground.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/setting_button_background.xml b/res/drawable/setting_button_background.xml new file mode 100644 index 0000000000..ee5f321c99 --- /dev/null +++ b/res/drawable/setting_button_background.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/res/drawable/unimportant_outline_button_medium_background.xml b/res/drawable/unimportant_outline_button_medium_background.xml new file mode 100644 index 0000000000..202eb9cd5c --- /dev/null +++ b/res/drawable/unimportant_outline_button_medium_background.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml index a2b5ea939a..3a900ffd99 100644 --- a/res/layout/activity_home.xml +++ b/res/layout/activity_home.xml @@ -24,7 +24,8 @@ android:id="@+id/profileButton" android:layout_width="@dimen/small_profile_picture_size" android:layout_height="@dimen/small_profile_picture_size" - android:layout_alignParentStart="true" + android:layout_marginLeft="8dp" + android:layout_alignParentLeft="true" android:layout_centerVertical="true"/> + android:layout_marginLeft="64dp" /> diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml new file mode 100644 index 0000000000..b1e43dba48 --- /dev/null +++ b/res/layout/activity_settings.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + +