DT @10.11.2015: Layout überarbeitet, bugfixes (ranking)

This commit is contained in:
Dennis Thießen
2015-11-10 23:26:42 +01:00
parent c8551bf081
commit 49ba686b3f
58 changed files with 190 additions and 45 deletions

View File

@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!--<set xmlns:android="http://schemas.android.com/apk/res/android">
<alpha
android:fromAlpha="0.0"
android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"
android:repeatCount="0" />
</set>-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="@android:integer/config_shortAnimTime"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="@android:integer/config_shortAnimTime" />
</set>

View File

@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!--<set xmlns:android="http://schemas.android.com/apk/res/android">
<alpha
android:fromAlpha="1.0"
android:toAlpha="0.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"
android:repeatCount="0" />
</set>-->
<set xmlns:android="http://schemas.android.com/apk/res/android">
<translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="@android:integer/config_shortAnimTime"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="@android:integer/config_shortAnimTime" />
</set>

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 669 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 465 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 613 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 330 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 793 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 860 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 468 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 648 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 527 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 925 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="#8ae6e6e6"
android:background="@color/bg_common_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
@@ -57,7 +57,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="#c5a7a7a7"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"

View File

@@ -5,7 +5,7 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#8a000000"
android:background="@color/bg_common_2"
tools:context=".ProfileActivity">
<LinearLayout
@@ -180,7 +180,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="#34bbff"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="#8ae6e6e6"
android:background="@color/bg_common_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ReportActivity">
@@ -37,10 +37,7 @@
<com.beardedhen.androidbootstrap.BootstrapEditText
bootstrap:bootstrapSize="lg"
bootstrap:bootstrapBrand="info"
bootstrap:roundedCorners="true"
<EditText
android:id="@+id/input_report_short"
android:hint="@string/input_report_short_hint"
android:inputType="text"
@@ -60,10 +57,7 @@
android:layout_marginTop="10dp"
android:layout_below="@+id/input_report_short" />
<com.beardedhen.androidbootstrap.BootstrapEditText
bootstrap:bootstrapSize="lg"
bootstrap:bootstrapBrand="info"
bootstrap:roundedCorners="true"
<EditText
android:id="@+id/input_report_long"
android:hint="@string/input_report_long_hint"
android:inputType="textMultiLine"
@@ -112,10 +106,7 @@
android:layout_alignLeft="@+id/input_report_time"
android:layout_alignStart="@+id/input_report_time"/>
<com.beardedhen.androidbootstrap.BootstrapEditText
bootstrap:bootstrapSize="lg"
bootstrap:bootstrapBrand="info"
bootstrap:roundedCorners="true"
<EditText
android:id="@+id/input_report_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -127,10 +118,7 @@
android:layout_alignStart="@+id/lbl_report_date"
android:focusable="false"/>
<com.beardedhen.androidbootstrap.BootstrapEditText
bootstrap:bootstrapSize="lg"
bootstrap:bootstrapBrand="info"
bootstrap:roundedCorners="true"
<EditText
android:id="@+id/input_report_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -187,7 +175,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="#34bbff"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="#8a000000"
android:background="@color/bg_common_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">
@@ -138,7 +138,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="#34bbff"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">

View File

@@ -43,10 +43,7 @@
android:layout_height="wrap_content"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint"
android:enabled="false"
android:editable="false"
android:layout_marginTop="20dp"/>
<TextView
@@ -65,12 +62,9 @@
android:gravity="top|left"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint"
android:layout_below="@+id/lbl_viewreport_long"
android:scrollbars="vertical"
android:enabled="false"
android:editable="false"
android:minLines="1"
android:lines="4"
android:maxLines="4"/>
@@ -221,7 +215,7 @@
<LinearLayout
android:id="@+id/ll_01"
android:gravity="center"
android:background="#34bbff"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"

View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/activatedBackgroundIndicator"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:padding="10dp" >
<ImageView
android:id="@+id/imageViewIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:paddingRight="10dp" />
<TextView
android:id="@+id/textViewName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/imageViewIcon"
android:paddingRight="10dp"
android:text="Folder name here."
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="#000000" />
</RelativeLayout>

View File

@@ -2,8 +2,13 @@
<color name="bg_login">#26ae90</color>
<color name="bg_register">#2e3237</color>
<color name="bg_main">#428bca</color>
<color name="bg_common_2">#e1e1e1</color>
<color name="bg_common">#0461A8</color>
<color name="white">#ffffff</color>
<color name="title">#ffffff</color>
<color name="red">#ff0000</color>
<color name="my_awesome_red">#ff4400</color>
<color name="my_awesome_darker_red">#03518c</color>
<color name="input_login">#222222</color>
<color name="input_login_hint">#999999</color>
<color name="input_register">#888888</color>

View File

@@ -102,4 +102,14 @@
<string name="action_settings">Settings</string>
<string name="title_activity_view_report">View Report</string>
<string-array name="navigation_drawer_items_array">
<item>Start</item>
<item>Report</item>
<item>Incident Map</item>
<item>User Statistics</item>
<item>Account Settings</item>
<item>Subscriptions</item>
<item>Logout</item>
</string-array>
</resources>

View File

@@ -1,6 +1,7 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<!-- <item name="android:background" tools:ignore="NewApi">@color/red</item>-->
<!-- <item name="background">@color/red</item>-->
</style>
<style name="wrapping_button">
@@ -8,4 +9,26 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginRight">@dimen/micro_padding</item>
</style>
<style name="CustomActionBarTheme" parent="@style/Theme.AppCompat.Light">
<item name="android:actionBarStyle" tools:ignore="NewApi">@style/MyActionBar</item>
<item name="actionBarStyle">@style/MyActionBar</item>
<item name="actionBarTheme">@style/MyActionBarTheme</item>
<item name="colorPrimaryDark">@color/my_awesome_darker_red</item>
</style>
<style name="MyActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background" tools:ignore="NewApi">@color/white</item>
<item name="titleTextStyle">@style/MyActionBar.ActionBar.TitleTextStyle</item>
<item name="background">@color/bg_common</item>
</style>
<style name="MyActionBarTheme" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="actionMenuTextColor">@color/title</item>
<item name="colorControlNormal">@color/title</item>
</style>
<style name="MyActionBar.ActionBar.TitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/title</item>
</style>
</resources>