Merge pull request RohitSurwase#2 from Rohitss/mergeAll

All existing branches merged.
iharshb · Dec 31, 2016 · 4aa272a · 4aa272a
2 parents 3145c0c + 4bec844
commit 4aa272a
Show file tree

Hide file tree

Showing 24 changed files with 121 additions and 63 deletions.
diff --git a/AutoReadSmsOtp/app/build.gradle b/AutoReadSmsOtp/app/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile 'com.android.support:design:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
 //    testCompile 'junit:junit:4.12'
 }
diff --git a/NavigationDrawerInApp/app/build.gradle b/NavigationDrawerInApp/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.rohitss.navigationdrawerinapp"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,6 +24,6 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:appcompat-v7:25.1.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/NavigationDrawerInApp/build.gradle b/NavigationDrawerInApp/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
 allprojects {
     //You do not need to change buildDir if you have placed your project at root directory
     //path of buildDir depends on the machine where you are working
-    buildDir = "C:\\AndroidProjectBuild/${rootProject.name}/${project.name}"
+//    buildDir = "C:\\AndroidProjectBuild/${rootProject.name}/${project.name}"
 
     repositories {
         jcenter()

diff --git a/PickAndCropImage/PickAndCropImage.md b/PickAndCropImage/PickAndCropImage.md
@@ -0,0 +1,4 @@
+	//Step 1. Add Gradle dependency to app-gradle.
+        //Step 2. Add CropImageActivity to app-manifest
+        //Step 3. Add ImageUtilityHelper class in your project.
+        //Step 4. Create object of ImageUtilityHelper class.
diff --git a/PickAndCropImage/app/build.gradle b/PickAndCropImage/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.rohitss.pickandcropimage"
         minSdkVersion 15
@@ -20,8 +20,8 @@ android {
 }
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:appcompat-v7:25.1.0'
     //Android-Image-Cropper library - ArthurHub
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
-    compile 'com.android.support:design:25.0.1'
+    compile 'com.android.support:design:25.1.0'
 }
diff --git a/PickAndCropImage/app/src/main/AndroidManifest.xml b/PickAndCropImage/app/src/main/AndroidManifest.xml
@@ -8,11 +8,12 @@
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:supportsRtl="true"
+        android:supportsRtl="false"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>

diff --git a/PickAndCropImage/app/src/main/java/com/rohitss/pickandcropimage/ImageUtilityHelper.java b/PickAndCropImage/app/src/main/java/com/rohitss/pickandcropimage/ImageUtilityHelper.java
@@ -42,7 +42,6 @@ public ImageUtilityHelper(Context context, ImageView imageView) {
 
     /**
      * Used to create image chooser intent
-     *
      * @return chooserIntent
      */
     public Intent getPickImageChooserIntent() {

diff --git a/PickAndCropImage/build.gradle b/PickAndCropImage/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/SAMPLE .gitignore b/SAMPLE .gitignore
@@ -1,5 +1,6 @@
 #This is a gitignore file
 #Created by "rohitss"
+# Remove tracked files [git rm -r --cached .]
 /.gradle
 /.idea/
 /app/build/
@@ -13,4 +14,4 @@
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store
-/captures
+/captures
diff --git a/SplashScreenDemo1/app/build.gradle b/SplashScreenDemo1/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 25
     buildToolsVersion "24.0.3"
     defaultConfig {
         applicationId "com.rohitss.splashscreen"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,9 +21,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
+//    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//    })
+    compile 'com.android.support:appcompat-v7:25.1.0'
+//    testCompile 'junit:junit:4.12'
 }
diff --git a/SplashScreenDemo1/build.gradle b/SplashScreenDemo1/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/SplashScreenRightWay/app/build.gradle b/SplashScreenRightWay/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.rohitss.splashscreenrightway"
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,9 +21,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.0.1'
-    testCompile 'junit:junit:4.12'
+//    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//    })
+    compile 'com.android.support:appcompat-v7:25.1.0'
+//    testCompile 'junit:junit:4.12'
 }
diff --git a/SplashScreenRightWay/app/src/main/AndroidManifest.xml b/SplashScreenRightWay/app/src/main/AndroidManifest.xml
@@ -8,13 +8,16 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SplashActivity">
+        <activity
+            android:name=".SplashActivity"
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".SecondActivity" />
     </application>
 
 </manifest>
diff --git a/SplashScreenRightWay/app/src/main/java/com/rohitss/splashscreenrightway/SecondActivity.java b/SplashScreenRightWay/app/src/main/java/com/rohitss/splashscreenrightway/SecondActivity.java
@@ -0,0 +1,16 @@
+package com.rohitss.splashscreenrightway;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Created by JayYogeshwar on 27-12-2016.
+ */
+public class SecondActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_second);
+    }
+}
diff --git a/SplashScreenRightWay/app/src/main/java/com/rohitss/splashscreenrightway/SplashActivity.java b/SplashScreenRightWay/app/src/main/java/com/rohitss/splashscreenrightway/SplashActivity.java
@@ -1,13 +1,32 @@
 package com.rohitss.splashscreenrightway;
 
-import android.support.v7.app.AppCompatActivity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Window;
+import android.view.WindowManager;
 
 public class SplashActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_splash);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                startActivity(new Intent(getBaseContext(), SecondActivity.class));
+            }
+        }, 2000);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        finish();
     }
 }
diff --git a/SplashScreenRightWay/app/src/main/res/drawable/img_splash_screen.xml b/SplashScreenRightWay/app/src/main/res/drawable/img_splash_screen.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FFFF8800"
+        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z" />
+</vector>
diff --git a/SplashScreenRightWay/app/src/main/res/drawable/splash_screen_with_layers.xml b/SplashScreenRightWay/app/src/main/res/drawable/splash_screen_with_layers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/img_splash_screen"></item>
+</layer-list>
diff --git a/SplashScreenRightWay/app/src/main/res/layout/activity_second.xml b/SplashScreenRightWay/app/src/main/res/layout/activity_second.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:text="Second Screen" />
+</RelativeLayout>
diff --git a/SplashScreenRightWay/app/src/main/res/layout/activity_splash.xml b/SplashScreenRightWay/app/src/main/res/layout/activity_splash.xml
diff --git a/SplashScreenRightWay/app/src/main/res/values/colors.xml b/SplashScreenRightWay/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
+    <color name="colorWhite">#FFFFFF</color>
 </resources>
diff --git a/SplashScreenRightWay/app/src/main/res/values/styles.xml b/SplashScreenRightWay/app/src/main/res/values/styles.xml
@@ -8,4 +8,8 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:background">@drawable/splash_screen_with_layers</item>
+    </style>
+
 </resources>
diff --git a/SplashScreenRightWay/build.gradle b/SplashScreenRightWay/build.gradle
@@ -5,15 +5,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
 allprojects {
-    buildDir "C:\\AndroidProjectBuild/${rootProject.name}/${project.name}"
+//    buildDir "C:\\AndroidProjectBuild/${rootProject.name}/${project.name}"
     repositories {
         jcenter()
     }

diff --git a/SwipeableTabs/app/build.gradle b/SwipeableTabs/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.rohitss.swipeabletabs"
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+//        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,11 +21,11 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.android.support:design:25.0.1'
-    compile 'com.android.support:support-v4:25.0.1'
-    testCompile 'junit:junit:4.12'
+//    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+//        exclude group: 'com.android.support', module: 'support-annotations'
+//    })
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.android.support:support-v4:25.1.0'
+//    testCompile 'junit:junit:4.12'
 }
diff --git a/SwipeableTabs/build.gradle b/SwipeableTabs/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * Used to create image chooser intent
-         *
          * @return chooserIntent
          */
         public Intent getPickImageChooserIntent() {
@@ Expand Down @@