flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2026-08-23 14:23:04 +00:00
Code Issues Releases Wiki Activity

Drawer, Toolbar and minor UI optimizations (#145)

Browse Source 
* initial add of toolbar and hamburger menu to main activity
* toolbar added to preferences and accounts screens
* fixed original string (name)
* Layout fix for content
* initial add of toolbar and hamburger menu to main activity
* remove unnecessary padding bottom
* fix styling and paint login activity in blue
* toolbar added to preferences and accounts screens
* Layout fix for content
* remove unnecessary padding bottom
* fix styling and paint login activity in blue
* fixes after rebase
* consolidate style since minVersion=16, make drawer to be behind the systembar
* optimize drawer header
* add back navigation to login activity, fix spinner background
* add back navigation
* more launcher icon to mipmap folders
* fix identation
* fix license header
* revert code style deletion, change identation
* proper notification icon
* proper resolution for login logo
* fix large notification icon
* removed unused Eclair switch since support is v16+
* only use small notification icon
* spaces->tabs
* fix toolbar style for Android 4.x
This commit is contained in:
Andy Scherzinger
2017-03-23 20:16:31 +01:00
committed by Loïc Blot
parent 0bc671901e
commit f83eebe4dd
35 changed files with 570 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/activity_login.xml
+10 -6
View File
@@ -61,7 +61,9 @@
android:id="@+id/ocsms_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/login_logo"
android:paddingTop="24dp"
android:paddingBottom="36dp"
android:src="@drawable/logo"
android:contentDescription="@string/login_logo" />
<LinearLayout
@@ -73,8 +75,9 @@
android:id="@+id/oc_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/protocol_array">
</Spinner>
android:layout_gravity="center_vertical"
android:popupBackground="@color/oc_primary"
android:entries="@array/protocol_array" />
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
@@ -84,6 +87,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_serverURI"
android:textColor="@color/oc_white"
android:inputType="textUri" >
<requestFocus />
</EditText>
@@ -99,9 +103,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/prompt_login"
android:textColor="@color/oc_white"
android:inputType="textEmailAddress"
android:maxLines="1"
android:singleLine="true" />
android:maxLines="1" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@@ -117,7 +121,7 @@
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true" />
android:textColor="@color/oc_white" />
</android.support.design.widget.TextInputLayout>
<com.dd.processbutton.iml.ActionProcessButton
src/main/res/layout/activity_main.xml
+9 -22
View File
@@ -34,9 +34,14 @@
android:fitsSystemWindows="true"
tools:openDrawer="start"
xmlns:app="http://schemas.android.com/apk/res-auto">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<include
layout="@layout/toolbar" />
<TextView
android:id="@+id/main_title_welcome"
@@ -44,7 +49,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/ma_title_welcome"
android:gravity="top"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
@@ -53,26 +57,9 @@
android:paddingRight="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_below="@+id/main_title_welcome"
android:text="@string/ma_content_welcome"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/main_tv_swipe"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_below="@+id/main_tv_welcome"
android:text="@string/ma_content_swipeaction"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
</LinearLayout>
<android.support.design.widget.NavigationView
android:id="@+id/nav_view"
@@ -81,5 +68,5 @@
android:layout_gravity="start"
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer"
android:fitsSystemWindows="false"/>
android:fitsSystemWindows="true"/>
</android.support.v4.widget.DrawerLayout>
src/main/res/layout/nav_header_main.xml
+3 -6
View File
@@ -3,24 +3,21 @@
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
android:background="@drawable/side_nav_bar"
android:gravity="top"
android:gravity="bottom"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:padding="@dimen/activity_horizontal_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:src="@drawable/ic_launcher"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:paddingTop="@dimen/standard_half_padding"
android:text="@string/app_name"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
src/main/res/layout/recovery_phone_list_item.xml
+2 -2
View File
@@ -6,6 +6,6 @@
android:id="@+id/recovery_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="20dp"
android:textSize="18sp" />
android:padding="@dimen/activity_vertical_margin"
android:textSize="18sp"/>
</RelativeLayout>
src/main/res/layout/toolbar.xml
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
* Copyright (c) 2017, Andy Scherzinger
* Copyright (c) 2014-2015, Loic Blot <loic.blot@unix-experience.fr>
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-->
<android.support.design.widget.AppBarLayout
android:id="@+id/appbar"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways|snap"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
<ProgressBar
android:id="@+id/login_progress"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:visibility="gone" />
</android.support.design.widget.AppBarLayout>