bug fix

prasanthlouis · Jul 26, 2015 · aac4475 · aac4475
2 parents 3c6d1ed + 631654f
commit aac4475
Show file tree

Hide file tree

Showing 16 changed files with 543 additions and 0 deletions.
diff --git a/.classpath b/.classpath
@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+<<<<<<< HEAD
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+=======
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+>>>>>>> 631654f04374ed3e840d9d81cf87662c4fec6515
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.psiuol21.selfiecam"
+<<<<<<< HEAD
     android:versionCode="4"
     android:versionName="4.0" >
 
     <uses-sdk
         android:minSdkVersion="11"
+=======
+    android:versionCode="2"
+    android:versionName="2.0" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+>>>>>>> 631654f04374ed3e840d9d81cf87662c4fec6515
         android:targetSdkVersion="19" />
    <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -21,7 +29,11 @@
         android:allowBackup="true"
         android:icon="@drawable/selfie5"
         android:label="@string/app_name"
+<<<<<<< HEAD
         android:theme="@style/CustomActionBarTheme" >
+=======
+        android:theme="@style/AppTheme" >
+>>>>>>> 631654f04374ed3e840d9d81cf87662c4fec6515
         <activity
             android:name="com.psiuol21.selfiecam.MainActivity"
             android:label="@string/app_name"

diff --git a/README.md b/README.md
@@ -0,0 +1,12 @@
+Selfiecam
+=========
+
+The best selfiecamera for Android!
+
+This is a selfie camera I developed for android. 
+
+The whole screen is a button so it makes it easier to take selfies using the back camera.
+
+Hence, you'll be avoiding taking blurry selfies with the front camera and without the difficulty of clicking on the small capture button using the backcamera.
+
+Play store link: https://play.google.com/store/apps/details?id=com.psiuol21.selfiecam
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.psiuol21.selfiecam"
+<<<<<<< HEAD
     android:versionCode="4"
     android:versionName="4.0" >
 
     <uses-sdk
         android:minSdkVersion="11"
+=======
+    android:versionCode="2"
+    android:versionName="2.0" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+>>>>>>> 631654f04374ed3e840d9d81cf87662c4fec6515
         android:targetSdkVersion="19" />
    <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -21,7 +29,11 @@
         android:allowBackup="true"
         android:icon="@drawable/selfie5"
         android:label="@string/app_name"
+<<<<<<< HEAD
         android:theme="@style/CustomActionBarTheme" >
+=======
+        android:theme="@style/AppTheme" >
+>>>>>>> 631654f04374ed3e840d9d81cf87662c4fec6515
         <activity
             android:name="com.psiuol21.selfiecam.MainActivity"
             android:label="@string/app_name"