Commit 05d59c51459e224cf901323003463eb9abff783b

Authored by Anna Ivanova
1 parent db85426c

design main page

.DS_Store
No preview for this file type
Risiko/.idea/misc.xml
... ... @@ -24,7 +24,7 @@
24 24 </value>
25 25 </option>
26 26 </component>
27   - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
  27 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
28 28 <output url="file://$PROJECT_DIR$/build/classes" />
29 29 </component>
30 30 <component name="ProjectType">
... ...
Risiko/.idea/vcs.xml
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
4 5 <mapping directory="$PROJECT_DIR$" vcs="Git" />
5 6 </component>
6 7 </project>
7 8 \ No newline at end of file
... ...
Risiko/app/src/main/AndroidManifest.xml
... ... @@ -9,7 +9,8 @@
9 9 android:roundIcon="@mipmap/ic_launcher_round"
10 10 android:supportsRtl="true"
11 11 android:theme="@style/AppTheme">
12   - <activity android:name="activity.Startside">
  12 + <activity android:name="activity.Startside"
  13 + android:theme="@style/risiko">
13 14 <intent-filter>
14 15 <action android:name="android.intent.action.MAIN" />
15 16  
... ...
Risiko/app/src/main/res/drawable/bg.png 0 → 100644

141 KB

Risiko/app/src/main/res/drawable/btnEnter.xml 0 → 100644
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android" >
  3 + <item android:state_pressed="true" >
  4 + <shape android:shape="rectangle" >
  5 +
  6 + <stroke android:width="2dip" android:color="#000000" />
  7 + <gradient android:angle="-90" android:startColor="#ffffff" android:endColor="#ffffff" />
  8 + </shape>
  9 + </item>
  10 + <item android:state_focused="true">
  11 + <shape android:shape="rectangle" >
  12 +
  13 + <stroke android:width="1dip" android:color="#d32827" />
  14 + <solid android:color="#ffffff"/>
  15 + </shape>
  16 + </item>
  17 + <item >
  18 + <shape android:shape="rectangle" >
  19 + <corners android:radius="5dip" />
  20 + <stroke android:width="1dip" android:color="#000000" />
  21 + <gradient android:angle="-90" android:startColor="#ffffff" android:endColor="#e6e6e6" />
  22 + </shape>
  23 + </item>
  24 +</selector>
0 25 \ No newline at end of file
... ...
Risiko/app/src/main/res/layout/activity_startside.xml
... ... @@ -4,38 +4,53 @@
4 4 xmlns:tools="http://schemas.android.com/tools"
5 5 android:layout_width="match_parent"
6 6 android:layout_height="match_parent"
  7 + android:background="@drawable/bg"
7 8 tools:context="com.risiko.risiko.activity.Startside">
8 9  
9 10 <TextView
10 11 android:id="@+id/app_name"
  12 + android:layout_width="316dp"
  13 + android:layout_height="103dp"
11 14 android:layout_marginTop="45dp"
12   - android:layout_width="wrap_content"
13   - android:layout_height="wrap_content"
14   - android:text="Risiko"
15   - android:textSize="25dp"
  15 + android:fontFamily="monospace"
  16 + android:text="@string/app_name"
  17 + android:textAlignment="center"
  18 + android:textColor="@android:color/background_dark"
  19 + android:textSize="80sp"
16 20 android:textStyle="bold"
17   - app:layout_constraintTop_toTopOf="parent"
18 21 app:layout_constraintLeft_toLeftOf="parent"
19   - app:layout_constraintRight_toRightOf="parent"/>
  22 + app:layout_constraintRight_toRightOf="parent"
  23 + app:layout_constraintTop_toTopOf="parent" />
20 24  
21 25  
22 26 <TextView
23 27 android:id="@+id/app_description"
24 28 android:layout_width="wrap_content"
25 29 android:layout_height="wrap_content"
26   - android:text="App for risikovurdering"
27   - app:layout_constraintLeft_toLeftOf="parent"
28   - app:layout_constraintRight_toRightOf="parent"
29   - app:layout_constraintTop_toBottomOf="@id/app_name" />
  30 + android:layout_marginBottom="100dp"
  31 + android:layout_marginEnd="8dp"
  32 + android:layout_marginStart="8dp"
  33 + android:fontFamily="serif-monospace"
  34 + android:text="@string/app_descr"
  35 + android:textColor="@android:color/background_dark"
  36 + android:textSize="20sp"
  37 + android:textStyle="bold"
  38 + app:layout_constraintBottom_toTopOf="@+id/btn_to_main_menu"
  39 + app:layout_constraintEnd_toEndOf="parent"
  40 + app:layout_constraintHorizontal_bias="0.115"
  41 + app:layout_constraintStart_toStartOf="parent" />
30 42  
31 43 <Button
32 44 android:id="@+id/btn_to_main_menu"
33   - android:layout_width="wrap_content"
34   - android:layout_height="wrap_content"
35   - android:text="Gå til hovedmeny"
36   - app:layout_constraintLeft_toLeftOf="parent"
37   - app:layout_constraintRight_toRightOf="parent"
  45 + android:layout_width="234dp"
  46 + android:layout_height="70dp"
  47 + android:layout_marginBottom="52dp"
  48 + android:background="@drawable/btnEnter"
  49 + android:fontFamily="sans-serif"
  50 + android:text="@string/btn_enter"
  51 + android:textSize="20sp"
38 52 app:layout_constraintBottom_toBottomOf="parent"
39   - android:layout_marginBottom="100dp"/>
  53 + app:layout_constraintLeft_toLeftOf="parent"
  54 + app:layout_constraintRight_toRightOf="parent" />
40 55  
41 56 </android.support.constraint.ConstraintLayout>
... ...
Risiko/app/src/main/res/values/colors.xml
... ... @@ -3,4 +3,5 @@
3 3 <color name="colorPrimary">#3F51B5</color>
4 4 <color name="colorPrimaryDark">#303F9F</color>
5 5 <color name="colorAccent">#FF4081</color>
  6 + <color name="accent_material_light">#ff4040</color>
6 7 </resources>
... ...
Risiko/app/src/main/res/values/strings.xml
1 1 <resources>
2 2 <string name="app_name">Risiko</string>
  3 + <string name="app_descr">App for risikovurdering</string>
  4 + <string name="btn_enter">GÅ TIL HOVEDMENY</string>
3 5 </resources>
... ...
Risiko/app/src/main/res/values/styles.xml
... ... @@ -2,8 +2,8 @@
2 2  
3 3 <!-- Base application theme. -->
4 4 <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
5   - <!-- Customize your theme here. -->
6   - <item name="colorPrimary">@color/colorPrimary</item>
  5 +
  6 + <item name="colorPrimary">@android:color/background_dark</item>
7 7 <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8 8 <item name="colorAccent">@color/colorAccent</item>
9 9 </style>
... ...