Skip to content
Snippets Groups Projects
Commit 6afa634f authored by Amirhossein Naghshzan's avatar Amirhossein Naghshzan
Browse files

account: minor changes on buttons design 

Change-Id: I9db37bb97ece84c1bc6651168b6300976003af97
parent 5f68e51c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
ring-android/app/src/main/res/layout/frag_acc_summary.xml
+ 7
− 69
View file @ 6afa634f
...@@ -38,34 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -38,34 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:focusable="true" android:focusable="true"
android:focusableInTouchMode="true" > android:focusableInTouchMode="true" >
<!-- <RelativeLayout-->
<!-- android:id="@+id/ring_account_status_container"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content">-->
<!-- <com.google.android.material.chip.Chip-->
<!-- android:id="@+id/account_status"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentStart="true"-->
<!-- android:textColor="@color/white"-->
<!-- tools:chipBackgroundColor="@color/green_400"-->
<!-- tools:text="Registered"/>-->
<!-- <cx.ring.views.SwitchButton-->
<!-- android:id="@+id/account_switch"-->
<!-- android:layout_width="80dp"-->
<!-- android:layout_height="30dp"-->
<!-- app:textOn="on"-->
<!-- app:textOff="off"-->
<!-- app:thumbColor="@color/white"-->
<!-- app:showText="true"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_gravity="end"-->
<!-- />-->
<!-- </RelativeLayout>-->
<TextView <TextView
android:id="@+id/account_alias_txt" android:id="@+id/account_alias_txt"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -123,6 +95,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -123,6 +95,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toStartOf="@+id/btn_qr" android:layout_toStartOf="@+id/btn_qr"
app:chipIconSize="18dp"
app:iconStartPadding="6dp"
app:chipIcon="@drawable/baseline_share_twoton_24dp" app:chipIcon="@drawable/baseline_share_twoton_24dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="@string/share_label" android:text="@string/share_label"
...@@ -138,6 +112,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -138,6 +112,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
app:chipIconSize="18dp"
app:iconStartPadding="6dp"
app:chipIcon="@drawable/baseline_qr_code_2_black_24dp" app:chipIcon="@drawable/baseline_qr_code_2_black_24dp"
app:chipBackgroundColor="@color/colorPrimary" app:chipBackgroundColor="@color/colorPrimary"
android:textColor="@color/colorOnPrimary" android:textColor="@color/colorOnPrimary"
...@@ -145,45 +121,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -145,45 +121,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:text="@string/qr_code" android:text="@string/qr_code"
/> />
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal"-->
<!-- android:background="@drawable/background_share"-->
<!-- android:layout_alignParentEnd="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:paddingBottom="6dp"-->
<!-- android:paddingTop="6dp"-->
<!-- android:paddingStart="12dp"-->
<!-- android:paddingEnd="12dp">-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/share_label"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:textColor="@color/text_color"-->
<!-- android:textStyle="bold"-->
<!-- android:textSize="14sp"-->
<!-- android:layout_marginRight="12dp"/>-->
<!-- <ImageButton-->
<!-- android:id="@+id/btn_share"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/baseline_share_twoton_24dp"-->
<!-- android:background="?selectableItemBackgroundBorderless"-->
<!-- android:layout_marginEnd="6dp"/>-->
<!-- <ImageButton-->
<!-- android:id="@+id/btn_qr"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/baseline_qr_code_twotone_24dp"-->
<!-- android:background="?selectableItemBackgroundBorderless"/>-->
<!-- </LinearLayout>-->
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
...@@ -205,8 +142,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -205,8 +142,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:text="@string/register_name" android:text="@string/register_name"
android:textColor="@color/colorOnPrimary" android:textColor="@color/colorPrimary"
app:chipBackgroundColor="@color/colorPrimary" app:chipBackgroundColor="@color/chip_background"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible"/>
...@@ -295,6 +232,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -295,6 +232,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:nestedScrollingEnabled="true" /> android:nestedScrollingEnabled="true" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
<FrameLayout <FrameLayout
......
ring-android/app/src/main/res/values-night/colors.xml
+ 1
− 0
View file @ 6afa634f
...@@ -27,5 +27,6 @@ ...@@ -27,5 +27,6 @@
<color name="text_color">@color/colorPrimary</color> <color name="text_color">@color/colorPrimary</color>
<color name="text_hint">@color/colorPrimary</color> <color name="text_hint">@color/colorPrimary</color>
<color name="button_border">@color/colorPrimary</color> <color name="button_border">@color/colorPrimary</color>
<color name="chip_background">#4dffffff</color>
</resources> </resources>
ring-android/app/src/main/res/values/colors.xml
+ 1
− 0
View file @ 6afa634f
...@@ -48,5 +48,6 @@ ...@@ -48,5 +48,6 @@
<color name="text_color">#414141</color> <color name="text_color">#414141</color>
<color name="text_hint">@color/color_primary_dark</color> <color name="text_hint">@color/color_primary_dark</color>
<color name="button_border">@color/color_primary_dark</color> <color name="button_border">@color/color_primary_dark</color>
<color name="chip_background">#330f426b</color>
</resources> </resources>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment