Merge pull request #46 from DrewGregory/develop

Develop
culturemesh · Apr 7, 2018 · d668b44 · d668b44
2 parents 5ecb841 + 3be56ac
commit d668b44
Show file tree

Hide file tree

Showing 212 changed files with 11,585 additions and 519 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 /build
 /captures
 .externalNativeBuild
+.idea
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,31 +1,73 @@
+buildscript {
+    repositories {
+        maven { url 'https://maven.fabric.io/public' }
+    }
+
+    dependencies {
+        classpath 'io.fabric.tools:gradle:1.+'
+    }
+}
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "org.codethechange.culturemesh"
         minSdkVersion 19
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
+        multiDexEnabled true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            // Disable fabric build ID generation for debug builds
+            //TODO: See if weird "E/Beta: Error reading Beta build properties" persists in production
+            //builds.
+
+        }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation 'com.android.support:support-v4:27.1.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.+'
-    compile 'com.android.support:design:26.+'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    implementation 'com.android.support:design:27.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.koushikdutta.ion:ion:2.+'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.android.support:cardview-v7:27.1.0'
+    implementation 'com.android.support:recyclerview-v7:27.1.0'
+    testImplementation 'junit:junit:4.12'
+    implementation files('libs/jbox2d-library-2.1.2.2.jar')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.codemybrainsout.onboarding:onboarder:1.0.4'
+    implementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
+        transitive = true;
+    }
+    implementation 'com.android.support:multidex:1.0.1'
+
+    implementation "android.arch.persistence.room:runtime:1.0.0"
+    annotationProcessor "android.arch.persistence.room:compiler:1.0.0"
+    //Notice that there are some other libraries for ViewModel, LiveData, and Paging if we need it.
+    //https://developer.android.com/topic/libraries/architecture/adding-components.html
 }
+repositories {
+    mavenCentral()
+    maven { url 'https://maven.fabric.io/public' }
+}
+
+apply plugin: 'kotlin-android-extensions'
diff --git a/app/fabric.properties b/app/fabric.properties
@@ -0,0 +1,3 @@
+#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
+#Mon Jan 29 18:20:01 PST 2018
+apiSecret=19df52dfe062f07a2aa415de9ebe74a37b76ecb4d6b09e90edffa7d478d12646
diff --git a/app/libs/jbox2d-library-2.1.2.2.jar b/app/libs/jbox2d-library-2.1.2.2.jar
diff --git a/app/libs/slf4j-api-1.7.22.jar b/app/libs/slf4j-api-1.7.22.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,26 +2,116 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.codethechange.culturemesh">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
+        android:name=".ApplicationStart"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:largeHeap = "true"
+        android:windowSoftInputMode="adjustNothing">
         <activity
             android:name=".TimelineActivity"
             android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".ExploreBubblesOpenGLActivity"
+            android:label="@string/title_activity_explore_bubbles_open_gl"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".FindNetworkActivity"
+            android:label="@string/title_activity_find_network"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
+        <activity
+            android:name=".ChooseNearLocationActivity"
+            android:label="@string/title_activity_choose_near_location"
+            android:parentActivityName=".FindNetworkActivity"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
 
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.codethechange.culturemesh.FindNetworkActivity" />
+        </activity>
+        <activity
+            android:name=".CreatePostActivity"
+            android:label="@string/title_activity_create_post"
+            android:parentActivityName=".TimelineActivity"
+            android:theme="@style/AppTheme.NoActionBar">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.codethechange.culturemesh.TimelineActivity" />
+        </activity>
+        <activity
+            android:name=".CreateEventActivity"
+            android:label="@string/title_activity_create_event"
+            android:parentActivityName=".TimelineActivity"
+            android:theme="@style/AppTheme.NoActionBar">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.codethechange.culturemesh.TimelineActivity" />
+        </activity>
+        <activity
+            android:name=".DrawerActivity"
+            android:label="@string/title_activity_drawer"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".LoginActivity"
+            android:label="@string/title_activity_login"
+            android:parentActivityName=".TimelineActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".OnboardActivity"
+            android:label="@string/title_activity_onboard"
+            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=".FindNetworkActivity"
-            android:label="@string/title_activity_find_network"
+            android:name=".SpecificPostActivity"
+            android:label="@string/title_activity_specific_post"
+            android:parentActivityName=".TimelineActivity"
+            android:theme="@style/AppTheme">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.codethechange.culturemesh.TimelineActivity" />
+        </activity>
+        <activity
+            android:name=".HelpActivity"
+            android:label="@string/help"
+            android:theme="@style/AppTheme.NoActionBar" />
+
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="264409e41fc2e4073f71bd98485d3b60f90b0dcf" />
+
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".ViewProfileActivity"
+            android:label="@string/title_activity_view_profile"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/title_activity_settings"
             android:theme="@style/AppTheme.NoActionBar"></activity>
     </application>
 

diff --git a/app/src/main/java/org/codethechange/bubblepicker/BubblePickerListener.kt b/app/src/main/java/org/codethechange/bubblepicker/BubblePickerListener.kt
@@ -0,0 +1,14 @@
+package org.codethechange.bubblepicker
+
+import org.codethechange.bubblepicker.model.PickerItem
+
+/**
+ * Created by irinagalata on 3/6/17.
+ */
+interface BubblePickerListener {
+
+    fun onBubbleSelected(item: PickerItem)
+
+    fun onBubbleDeselected(item: PickerItem)
+
+}
diff --git a/app/src/main/java/org/codethechange/bubblepicker/Constant.kt b/app/src/main/java/org/codethechange/bubblepicker/Constant.kt
@@ -0,0 +1,12 @@
+package org.codethechange.bubblepicker
+
+/**
+ * Created by irinagalata on 3/8/17.
+ */
+object Constant {
+
+    val TEXTURE_VERTICES = floatArrayOf(0f, 0f, 0f, 1f, 1f, 0f, 1f, 1f)
+
+    val FLOAT_SIZE = 4
+
+}
diff --git a/app/src/main/java/org/codethechange/bubblepicker/adapter/BubblePickerAdapter.kt b/app/src/main/java/org/codethechange/bubblepicker/adapter/BubblePickerAdapter.kt
@@ -0,0 +1,14 @@
+package org.codethechange.bubblepicker.adapter
+
+import org.codethechange.bubblepicker.model.PickerItem
+
+/**
+ * Created by irinagalata on 5/22/17.
+ */
+interface BubblePickerAdapter {
+
+    val totalCount: Int
+
+    fun getItem(position: Int): PickerItem
+
+}
diff --git a/app/src/main/java/org/codethechange/bubblepicker/exception/EmptyPickerException.kt b/app/src/main/java/org/codethechange/bubblepicker/exception/EmptyPickerException.kt
@@ -0,0 +1,6 @@
+package org.codethechange.bubblepicker.exception
+
+/**
+ * Created by irinagalata on 1/19/17.
+ */
+class EmptyPickerException() : Exception("Picker must have at least one item when it becomes visible")