From 524257807562d50e7f5a35b189e2338fe80d4b3d Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Tue, 1 Jan 2019 11:31:57 +0100
Subject: [PATCH] fixed text layout under icons
---
app/src/main/res/layout/activity_main.xml | 7 +------
app/src/main/res/layout/activity_state.xml | 16 +++++++++-------
.../main/res/layout/activity_state_messages.xml | 14 ++++++++------
app/src/main/res/xml/changelog_master.xml | 1 +
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 769fab3..0e710a5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -203,7 +203,6 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
android:drawableTop="@drawable/ic_notes"
android:text="@string/action_notes"
android:textColor="#ffffff" />
@@ -212,7 +211,6 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
android:drawableTop="@drawable/ic_user"
android:text="@string/action_user"
android:textColor="#ffffff" />
@@ -222,7 +220,6 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
android:drawableTop="@drawable/ic_state"
android:text="@string/action_state"
android:textColor="#ffffff" />
@@ -232,7 +229,6 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
android:drawableTop="@drawable/ic_howto"
android:text="@string/action_howto"
android:textColor="#ffffff" />
@@ -250,7 +246,6 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
android:drawableTop="@drawable/ic_about"
android:text="@string/action_about"
android:textColor="#ffffff" />
@@ -261,7 +256,7 @@
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:text=""
- android:textColor="#ffffff" />
+ android:textColor="#ffffff" /><!-- remove line android:maxWidth="24dp" when new button added -->
<Button
android:id="@+id/Placeholder3"
style="?android:attr/borderlessButtonStyle"
diff --git a/app/src/main/res/layout/activity_state.xml b/app/src/main/res/layout/activity_state.xml
index 4c39e50..9995c2b 100644
--- a/app/src/main/res/layout/activity_state.xml
+++ b/app/src/main/res/layout/activity_state.xml
@@ -29,20 +29,21 @@
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
+ android:gravity="center|top"
android:background="#203140">
<Button
android:id="@+id/StateBtn"
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
+ android:maxWidth="120dp"
+ android:breakStrategy="simple"
+ android:minLines="3"
android:drawableTop="@drawable/ic_state"
android:drawableTint="@color/gray"
android:text="@string/state_btn"
android:layout_gravity="center"
- android:layout_marginLeft="@android:dimen/app_icon_size"
- android:layout_marginRight="@android:dimen/app_icon_size"
+ android:layout_marginRight="30dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="@color/gray"/>
<Button
@@ -50,12 +51,13 @@
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
+ android:maxWidth="120dp"
+ android:breakStrategy="simple"
+ android:minLines="3"
android:drawableTop="@drawable/ic_state"
android:text="@string/state_messages_btn"
android:layout_gravity="center"
- android:layout_marginLeft="@android:dimen/app_icon_size"
- android:layout_marginRight="@android:dimen/app_icon_size"
+ android:layout_marginLeft="30dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/>
</android.support.v7.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/activity_state_messages.xml b/app/src/main/res/layout/activity_state_messages.xml
index 7678a47..6bd0b7a 100644
--- a/app/src/main/res/layout/activity_state_messages.xml
+++ b/app/src/main/res/layout/activity_state_messages.xml
@@ -36,12 +36,13 @@
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
+ android:maxWidth="120dp"
+ android:breakStrategy="simple"
+ android:minLines="3"
android:drawableTop="@drawable/ic_state"
android:text="@string/state_btn"
android:layout_gravity="center"
- android:layout_marginLeft="@android:dimen/app_icon_size"
- android:layout_marginRight="@android:dimen/app_icon_size"
+ android:layout_marginRight="24dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="#ffffff"/>
<Button
@@ -49,13 +50,14 @@
android:shadowColor="@color/bg_primary_blue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="24dp"
+ android:maxWidth="120dp"
+ android:breakStrategy="simple"
+ android:minLines="3"
android:drawableTop="@drawable/ic_state"
android:drawableTint="@color/gray"
android:text="@string/state_messages_btn"
android:layout_gravity="center"
- android:layout_marginLeft="@android:dimen/app_icon_size"
- android:layout_marginRight="@android:dimen/app_icon_size"
+ android:layout_marginLeft="24dp"
style="?android:attr/borderlessButtonStyle"
android:textColor="@color/gray"/>
</android.support.v7.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 31a9ad2..b1752cd 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -5,6 +5,7 @@
<change>Corrected some typos</change>
<change>Spanish, Serbian and French translation updated</change>
<change>Added pull to refresh page</change>
+ <change>Fixed text layout under icons</change>
</release>
<release version="1.1.0" versioncode="13" >
<change>State page is api based instead of webview</change>
--
GitLab