diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8000385d0053366a2f81d702a331787c07e4a171..9a5929360422a46853c2aefa256c2b62c41903a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:icon="@mipmap/kms" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/MyTheme"> <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/res/drawable/help.png b/app/src/main/res/drawable/help.png index 6649ac7e2b008b4528c4c47b50a89c2b5165cb6f..27d790cb07748dd038d5d88c092ea2da5122d442 100644 Binary files a/app/src/main/res/drawable/help.png and b/app/src/main/res/drawable/help.png differ diff --git a/app/src/main/res/layout/activity_confirmation_screen.xml b/app/src/main/res/layout/activity_confirmation_screen.xml index 87e39cf7fa5c370f411b22d3d252b223f3be2e5a..970257410c71fdef232f0998835029069c40ffc6 100644 --- a/app/src/main/res/layout/activity_confirmation_screen.xml +++ b/app/src/main/res/layout/activity_confirmation_screen.xml @@ -57,7 +57,7 @@ android:textSize="24sp" android:textAlignment="center" android:textStyle="normal|bold" - android:textColor="@android:color/holo_green_light" + android:textColor="#000000" android:layout_centerVertical="true" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3c709a1b3cfbbf7129f6cbff5258514a56a103f7..683ff2da2fd68d519d04b87abf94e235cc637ac2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:paddingBottom="@dimen/activity_vertical_margin" android:paddingLeft="@dimen/activity_horizontal_margin" - android:background="@color/colorPrimary" + android:background="@color/windows" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" @@ -32,7 +32,7 @@ android:textSize="30sp" android:textStyle="normal|bold" android:textAlignment="center" - android:textColor="#FFFFFF" + android:textColor="#F44336" android:layout_above="@+id/helpButton" android:layout_alignLeft="@+id/helpButton" android:layout_alignStart="@+id/helpButton" @@ -49,13 +49,17 @@ android:onClick="contact" /> <ImageButton - app:srcCompat="@drawable/help" + app:srcCompat="@drawable/help3" android:id="@+id/helpButton" - android:scaleType="fitXY" android:layout_width="350dp" android:layout_height="350dp" android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> + android:layout_alignParentEnd="true" + android:background="@color/windows" + + + + /> </RelativeLayout> diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000000000000000000000000000000000000..3ccb4d389af3eb61bf47fca40a8a3ad3ce9fb18f --- /dev/null +++ b/app/src/main/res/values-v21/styles.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="MyTheme" parent="MyTheme.base"> + <item name="android:colorPrimary">@color/colorPrimary</item> + <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="android:colorAccent">@color/colorAccent</item> + <item name="android:windowBackground">@color/windows</item> + <item name="android:navigationBarColor">@color/navigation</item> + + + + + + + + </style> + + + +</resources> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 748ed0012e36fcfef497ca5ce36fc74324409842..0f7e0592edfe7249b5c1fb5d5aabebbc43e91f2e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="colorPrimary">#3f51b5</color> - <color name="colorPrimaryDark">#0442d4</color> - <color name="colorAccent">#FF4081</color> + <color name="colorPrimary">#8BC34A</color> + <color name="colorPrimaryDark">#33691E</color> + <color name="colorAccent">#F44336</color> + <color name="navigation">#33691E</color> + <color name="windows">#DCEDC8</color> + + + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930df6d10edf3d6df40d6556297d11f953da..fd0ebff0110f67ca7c504899dc1e70ddc996b0b3 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,13 @@ <resources> <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="MyTheme" parent="MyTheme.base"></style> + <style name="MyTheme.base" parent="Theme.AppCompat.Light"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> + </style> </resources>