TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 15:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor & match design

Browse Source
This commit is contained in:
nielsandriesse
2020-09-09 13:57:22 +10:00
parent 49d344f7f7
commit ff21d760f6
17 changed files with 88 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/drawable/profile_picture_view_large_background.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/unimportant" />
<solid android:color="@color/profile_picture_background" />
<corners android:radius="38dp" />

2
res/drawable/profile_picture_view_large_foreground.xml
View File

@@ -7,5 +7,5 @@
<corners android:radius="38dp" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
</shape>

4
res/drawable/profile_picture_view_medium_background.xml
View File

@@ -3,7 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/unimportant" />
<solid android:color="@color/profile_picture_background" />
<corners android:radius="23dp" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
</shape>

2
res/drawable/profile_picture_view_medium_foreground.xml
View File

@@ -7,5 +7,5 @@
<corners android:radius="23dp" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
</shape>

4
res/drawable/profile_picture_view_rss_medium_background.xml
View File

@@ -3,7 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#353535" />
<solid android:color="@color/profile_picture_background" />
<corners android:radius="23dp" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
</shape>

4
res/drawable/profile_picture_view_small_background.xml
View File

@@ -3,7 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/unimportant" />
<solid android:color="@color/profile_picture_background" />
<corners android:radius="18dp" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
</shape>

2
res/drawable/profile_picture_view_small_foreground.xml
View File

@@ -7,5 +7,5 @@
<corners android:radius="18dp" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/border" />
<stroke android:width="@dimen/profile_picture_border_thickness" android:color="@color/profile_picture_border" />
</shape>

3
res/layout/activity_home.xml
View File

@@ -34,8 +34,7 @@
android:layout_height="@dimen/small_profile_picture_size"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="9dp"
android:foreground="@drawable/circle_touch_highlight_background"/>
android:layout_marginLeft="9dp" />
<TextView
android:layout_width="wrap_content"

3
res/layout/activity_settings.xml
View File

@@ -24,8 +24,7 @@
android:id="@+id/profilePictureView"
android:layout_width="@dimen/large_profile_picture_size"
android:layout_height="@dimen/large_profile_picture_size"
android:layout_marginTop="@dimen/medium_spacing"
android:foreground="@drawable/circle_touch_highlight_background" />
android:layout_marginTop="@dimen/medium_spacing" />
<RelativeLayout
android:id="@+id/ctnGroupNameSection"

21
res/layout/view_profile_picture.xml
View File

@@ -19,9 +19,13 @@
android:id="@+id/doubleModeImageView1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.65"
android:background="@drawable/profile_picture_view_small_background" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_small_foreground" />
</RelativeLayout>
<RelativeLayout
@@ -36,6 +40,11 @@
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_small_background" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_small_foreground" />
</RelativeLayout>
</RelativeLayout>
@@ -51,6 +60,11 @@
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_medium_background" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_medium_foreground" />
</RelativeLayout>
<ImageView
@@ -73,6 +87,11 @@
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_large_background" />
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/profile_picture_view_large_foreground" />
</RelativeLayout>
</RelativeLayout>

2
res/values-notnight-v21/colors.xml
View File

@@ -7,6 +7,8 @@
<color name="text">#000000</color>
<color name="destructive">#f26f55</color>
<color name="unimportant">#606060</color>
<color name="profile_picture_border">#23000000</color>
<color name="profile_picture_background">#B0B0B0</color>
<color name="cell_background">#FCFCFC</color>
<color name="cell_selected">#DFDFDF</color>
<color name="navigation_bar_background">#FCFCFC</color>

16
res/values/colors.xml
View File

@@ -7,6 +7,8 @@
<color name="text">#FFFFFF</color>
<color name="destructive">#FF453A</color>
<color name="unimportant">#D8D8D8</color>
<color name="profile_picture_border">#23FFFFFF</color>
<color name="profile_picture_background">#353535</color>
<color name="border">#979797</color>
<color name="cell_background">#1B1B1B</color>
<color name="cell_selected">#0C0C0C</color>
@@ -29,6 +31,13 @@
<color name="pn_option_background">#1B1B1B</color>
<color name="pn_option_border">#212121</color>
<color name="paths_building">#FFCE3A</color>
<array name="profile_picture_placeholder_colors">
<item>#5ff8b0</item>
<item>#26cdb9</item>
<item>#f3c615</item>
<item>#fcac5a</item>
</array>
<!-- Session -->
<!-- Loki -->
@@ -108,11 +117,4 @@
<color name="default_background_start">#121212</color>
<color name="default_background_end">#171717</color>
<array name="user_pic_placeholder_primary">
<item>#2bca81</item>
<item>#ee7117</item>
<item>#239edf</item>
<item>#bb35e9</item>
</array>
</resources>