Permalink
Browse files

added UserTypeActivity

  • Loading branch information...
darver committed May 9, 2017
1 parent d8483ae commit 292d515c8af43f7724b321cea6a0e180602f6a08
View
@@ -40,6 +40,10 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
// compile 'com.google.android.gms:play-services:10.2.1'
compile 'com.android.support:appcompat-v7:25.3.0'
compile 'com.android.support:support-v4:25.3.0'
compile 'com.android.support:design:25.3.0'
@@ -51,19 +55,16 @@ dependencies {
compile 'com.firebaseui:firebase-ui-database:1.0.1'
compile 'com.google.android.gms:play-services-auth:10.2.1'
compile 'com.google.android.gms:play-services-maps:10.2.1'
// compile 'com.google.android.gms:play-services:10.2.1'
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
compile 'com.google.code.gson:gson:2.7'
compile 'agency.tango.android:material-intro-screen:0.0.5'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'de.hdodenhof:circleimageview:1.3.0'
compile 'com.miguelcatalan:materialsearchview:1.4.0'
testCompile 'junit:junit:4.12'
testCompile 'org.powermock:powermock-api-mockito:1.6.3'
testCompile 'org.powermock:powermock-module-junit4:1.6.2'
compile 'com.google.code.gson:gson:2.6.2'
}
apply plugin: 'com.google.gms.google-services'
@@ -1,44 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="foodrev.org.foodrev"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="foodrev.org.foodrev">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<!--
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
Google Maps Android API v2, but you must specify either coarse or fine
location permissions for the 'MyLocation' functionality.
-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<application
android:name=".App"
android:allowBackup="true"
android:icon="@drawable/foodrev_icon"
android:label="@string/app_name"
android:supportsRtl="true"
android:name=".App"
android:theme="@style/AppTheme">
<activity android:name=".presentation.ui.activities.SignInActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".presentation.ui.activities.MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme"/>
android:theme="@style/AppTheme" />
<activity
android:name=".presentation.ui.activities.rapidprototype.DetailItemActivity"
android:theme="@style/CustomDialog"/>
android:theme="@style/CustomDialog" />
<activity
android:name=".presentation.ui.activities.rapidprototype.DriverDetailItemActivity"
android:theme="@style/CustomDialog"/>
android:theme="@style/CustomDialog" />
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchDetailItemActivity"
android:theme="@style/CustomDialog"/>
android:theme="@style/CustomDialog" />
<!--
The API key for Google Maps-based APIs is defined as a string resource.
(See the file "res/values/google_maps_api.xml").
@@ -49,39 +50,39 @@
-->
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_key"/>
android:value="@string/google_maps_key" />
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.FoodMap"
android:label="@string/title_activity_food_map"/>
android:label="@string/title_activity_food_map" />
<!--
ATTENTION: This was auto-generated to add Google Play services to your project for
App Indexing. See https://g.co/AppIndexing/AndroidStudio for more information.
-->
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
android:value="@integer/google_play_services_version" />
<activity
android:name=".presentation.ui.activities.rapidprototype.IntroSlidesGeneric"
android:label="@string/title_activity_intro_slides_generic"
android:theme="@style/AppIntroTheme"/>
android:theme="@style/AppIntroTheme" />
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity"
android:label="@string/title_activity_coordinator_main"
android:theme="@style/AppTheme"/>
android:theme="@style/AppTheme" />
<activity
android:name=".presentation.ui.activities.rapidprototype.DriverMode.DriverModeActivity"
android:label="@string/title_activity_driver"
android:theme="@style/AppTheme"/>
android:theme="@style/AppTheme" />
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"
android:label="@string/title_activity_dispatch_creation"
android:parentActivityName=".presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity"
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity"/>
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.CoordinatorMainLanding.CoordinatorMainActivity" />
</activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DateTime.DispatchDateTimeSelect"
@@ -90,19 +91,19 @@
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
</activity>
<activity android:name=".presentation.ui.activities.rapidprototype.DetailItemActivity"
android:theme="@style/CustomDialog">
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
</activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.DetailItemActivity"
android:theme="@style/CustomDialog"></activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DriverSelect.DispatchDriverSelect"
android:label="@string/title_activity_dispatch_driver_select"
android:parentActivityName=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
</activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.CommunitySelect.DispatchCommunitySelect"
@@ -111,7 +112,7 @@
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
</activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DonorSelect.DispatchDonorSelect"
@@ -120,25 +121,19 @@
android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity"/>
android:value="foodrev.org.foodrev.presentation.ui.activities.rapidprototype.CoordinatorMode.DispatchCreation.DispatchCreationActivity" />
</activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.ChannelSearchActivity"/>
<activity
android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.CreateChannelActivity"/>
<activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.ChannelSearchActivity" />
<activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.CreateChannelActivity" />
<activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageMainActivity" />
<activity android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageSearchActivity" />
<activity
android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageMainActivity"/>
android:name=".presentation.ui.activities.rapidprototype.json.JsonActivity"
android:theme="@style/AppTheme"></activity>
<activity
android:name=".presentation.ui.activities.rapidprototype.messaging.ui.activities.MessageSearchActivity"/>
<activity android:name=".presentation.ui.activities.rapidprototype.json.JsonActivity"
android:theme="@style/AppTheme">
</activity>
<activity android:name=".presentation.ui.activities.rapidprototype.ai.AiUiSummary"
android:theme="@style/CustomDialog">
</activity>
android:name=".presentation.ui.activities.rapidprototype.ai.AiUiSummary"
android:theme="@style/CustomDialog"></activity>
<activity android:name=".presentation.ui.activities.UserTypeActivity"></activity>
</application>
</manifest>
@@ -6,4 +6,31 @@
android:layout_height="match_parent"
tools:context="foodrev.org.foodrev.presentation.ui.activities.UserTypeActivity">
<TextView
android:id="@+id/textView2"
android:layout_width="292dp"
android:layout_height="32dp"
android:text="TextView"
android:textAlignment="center"
android:textSize="22sp"
tools:layout_editor_absoluteX="59dp"
tools:layout_editor_absoluteY="186dp"
tools:text="@string/user_type" />
<Button
android:id="@+id/coordinatorButton"
android:layout_width="173dp"
android:layout_height="51dp"
android:text="Coordinator"
tools:layout_editor_absoluteX="119dp"
tools:layout_editor_absoluteY="304dp" />
<Button
android:id="@+id/DriverButton"
android:layout_width="173dp"
android:layout_height="51dp"
android:text="Driver"
tools:layout_editor_absoluteX="119dp"
tools:layout_editor_absoluteY="382dp" />
</android.support.constraint.ConstraintLayout>
@@ -49,7 +49,6 @@
<string name="title_activity_driver">Driver Mode</string>
<string name="pound">#</string>
<string name="at_sign">\@</string>
@@ -65,6 +64,7 @@
<string name="channel_name_description">Names must be 21 characters or less, lower case and cannot contain spaces or periods</string>
<string name="channel_purpose">Optional. Give your channel a purpose that describes what it will be used for</string>
<string name="enter_message">Enter Message Here</string>
<string name="user_type">What type of user are you?</string>
</resources>

0 comments on commit 292d515

Please sign in to comment.