Merge https://github.com/hacktoberfest17/programming

Author: Bharat Saraswat

CONTRIBUTORS.md

@@ -792,4 +792,6 @@ Programming contributors (sorted contributions)
 
 * **[nicktheway](https://github.com/nicktheway)**
 
+* **[codealtgeek](https://github.com/codealtgeek)**
+
 

Trees/Binary_Trees/B-Tree-with-4-Nodes.java

@@ -0,0 +1,38 @@
+package binarytree;
+
+// class contain left and right child of tree and key
+
+class Node {
+    int key;
+    Node left,right;
+    
+    public Node(int item) {
+        key = item;
+        left = right = null;
+    }
+}
+
+// Java Program to introduce to the Binary Tree
+
+class BinaryTree {
+    // root of Binary Tree
+    Node root;
+    
+    //constructor
+    
+    BinaryTree(int key) {
+        root = new Node(key);
+    }
+    
+    BinaryTree() {
+        root = null;
+    }
+    
+    public static void main(String[] args) {
+        BinaryTree tree = new BinaryTree();
+        tree.root = new Node(1);
+        tree.root.left = new Node(2);
+        tree.root.right = new Node(3);
+        tree.root.left.left = new Node(4);
+    }
+}

Trees/Segment_trees/segtrees.cpp renamed to Trees/segment_trees/segtrees.cpp

@@ -46,4 +46,4 @@ int main(){
 	//update(node,tree,a,2,0,n-1,0);
 	ll p=query(node,tree,a,0,n-1,3	,n-1);
 	cout<<p;
-}
+}

android_apps/DatabaseApp

@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild

android_apps/DatabaseApp/.gitignore

@@ -0,0 +1 @@
+/build

android_apps/DatabaseApp/app/.gitignore

@@ -0,0 +1,30 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
+    defaultConfig {
+        applicationId "com.yacov.databaseapp"
+        minSdkVersion 15
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+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:26.+'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    testCompile 'junit:junit:4.12'
+}

android_apps/DatabaseApp/app/build.gradle

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\YacovR\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

android_apps/DatabaseApp/app/proguard-rules.pro

@@ -0,0 +1,26 @@
+package com.yacov.databaseapp;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.yacov.databaseapp", appContext.getPackageName());
+    }
+}

android_apps/DatabaseApp/app/src/androidTest/java/com/yacov/databaseapp/ExampleInstrumentedTest.java

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.yacov.databaseapp">
+
+    <application
+        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">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>