Merge GUI modifications - part 1 into staging.

jklmnn · Jul 22, 2017 · 896e4d5 · 896e4d5
2 parents 2d2bb10 + ec8bdc0
commit 896e4d5
Show file tree

Hide file tree

Showing 117 changed files with 1,995 additions and 1,222 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,4 +29,7 @@ dependencies {
     compile 'com.android.support:design:22.2.1'
     compile 'org.piwik.sdk:piwik-sdk:0.0.3'
     compile 'org.osmdroid:osmdroid-android:5.0.1@aar'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.android.support:recyclerview-v7:22.2.1'
+    compile 'com.android.support:cardview-v7:22.2.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.jkliemann.parkendd" >
+    package="de.jkliemann.parkendd">
 
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -15,44 +15,38 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_app_icon"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".Views.Main.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".AboutActivity"
-            android:label="@string/action_about" >
-        </activity>
-        <activity
-            android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings" >
-        </activity>
-        <activity
-            android:name=".PlaceActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:name=".Views.AboutActivity"
+            android:label="@string/settings_about">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name=".Views.AboutActivity" />
 
                 <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="geo" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ForecastActivity"
-            android:label="@string/title_activity_forecast" >
+        <activity android:name=".Views.Preferences.PreferencesActivity"
+            android:label="@string/settings_activity_title">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".Views.Main.MainActivity" />
         </activity>
-        <activity
-            android:name=".MapActivity"
-            android:label="@string/title_activity_map" >
+        <activity android:name=".Views.Cities.CitiesActivity"
+            android:label="@string/cities_activity_title">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".Views.Main.MainActivity" />
         </activity>
     </application>
 
-</manifest>
+</manifest>