diff --git a/appdev/.gitignore b/appdev/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/appdev/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/appdev/.idea/compiler.xml b/appdev/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/appdev/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/appdev/.idea/copyright/profiles_settings.xml b/appdev/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/appdev/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/appdev/.idea/gradle.xml b/appdev/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/appdev/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/appdev/.idea/misc.xml b/appdev/.idea/misc.xml new file mode 100644 index 0000000..7c1371c --- /dev/null +++ b/appdev/.idea/misc.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/appdev/.idea/modules.xml b/appdev/.idea/modules.xml new file mode 100644 index 0000000..28eef88 --- /dev/null +++ b/appdev/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/appdev/.idea/runConfigurations.xml b/appdev/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/appdev/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/appdev/Readme.txt b/appdev/Readme.txt new file mode 100644 index 0000000..d017322 --- /dev/null +++ b/appdev/Readme.txt @@ -0,0 +1,5 @@ + Proposed Modifications + 1. Sign Up/Login page UI improvement + 2. Making Sections + 3. Profile Page + 4. Contact us details diff --git a/appdev/app/.gitignore b/appdev/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/appdev/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/appdev/app/build.gradle b/appdev/app/build.gradle new file mode 100644 index 0000000..8d7c75c --- /dev/null +++ b/appdev/app/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.0" + defaultConfig { + applicationId "com.vansh.wikifeedia" + minSdkVersion 15 + targetSdkVersion 25 + 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:25.0.0' + compile 'com.android.support:design:25.0.0' + testCompile 'junit:junit:4.12' +} diff --git a/appdev/app/proguard-rules.pro b/appdev/app/proguard-rules.pro new file mode 100644 index 0000000..dd09fbb --- /dev/null +++ b/appdev/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Users\vansh\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 *; +#} diff --git a/appdev/app/src/androidTest/java/com/vansh/wikifeedia/ExampleInstrumentedTest.java b/appdev/app/src/androidTest/java/com/vansh/wikifeedia/ExampleInstrumentedTest.java new file mode 100644 index 0000000..8daa52e --- /dev/null +++ b/appdev/app/src/androidTest/java/com/vansh/wikifeedia/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.vansh.wikifeedia; + +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 Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.vansh.wikifeedia", appContext.getPackageName()); + } +} diff --git a/appdev/app/src/main/AndroidManifest.xml b/appdev/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0d3beaa --- /dev/null +++ b/appdev/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/appdev/app/src/main/java/com/vansh/wikifeedia/MainActivity.java b/appdev/app/src/main/java/com/vansh/wikifeedia/MainActivity.java new file mode 100644 index 0000000..a0f6b27 --- /dev/null +++ b/appdev/app/src/main/java/com/vansh/wikifeedia/MainActivity.java @@ -0,0 +1,101 @@ +package com.vansh.wikifeedia; + +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.view.View; +import android.support.design.widget.NavigationView; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; + +public class MainActivity extends AppCompatActivity + implements NavigationView.OnNavigationItemSelectedListener { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + } + }); + + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( + this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.setDrawerListener(toggle); + toggle.syncState(); + + NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view); + navigationView.setNavigationItemSelectedListener(this); + } + + @Override + public void onBackPressed() { + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + if (drawer.isDrawerOpen(GravityCompat.START)) { + drawer.closeDrawer(GravityCompat.START); + } else { + super.onBackPressed(); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + @SuppressWarnings("StatementWithEmptyBody") + @Override + public boolean onNavigationItemSelected(MenuItem item) { + // Handle navigation view item clicks here. + int id = item.getItemId(); + + if (id == R.id.nav_camera) { + // Handle the camera action + } else if (id == R.id.nav_gallery) { + + } else if (id == R.id.nav_slideshow) { + + } else if (id == R.id.nav_manage) { + + } else if (id == R.id.nav_share) { + + } else if (id == R.id.nav_send) { + + } + + DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + drawer.closeDrawer(GravityCompat.START); + return true; + } +} diff --git a/appdev/app/src/main/res/drawable-v21/ic_menu_camera.xml b/appdev/app/src/main/res/drawable-v21/ic_menu_camera.xml new file mode 100644 index 0000000..0d9ea10 --- /dev/null +++ b/appdev/app/src/main/res/drawable-v21/ic_menu_camera.xml @@ -0,0 +1,12 @@ + + + + diff --git a/appdev/app/src/main/res/drawable-v21/ic_menu_gallery.xml b/appdev/app/src/main/res/drawable-v21/ic_menu_gallery.xml new file mode 100644 index 0000000..f6872c4 --- /dev/null +++ b/appdev/app/src/main/res/drawable-v21/ic_menu_gallery.xml @@ -0,0 +1,9 @@ + + + diff --git a/appdev/app/src/main/res/drawable-v21/ic_menu_manage.xml b/appdev/app/src/main/res/drawable-v21/ic_menu_manage.xml new file mode 100644 index 0000000..c1be60b --- /dev/null +++ b/appdev/app/src/main/res/drawable-v21/ic_menu_manage.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/appdev/app/src/main/res/drawable-v21/ic_menu_send.xml b/appdev/app/src/main/res/drawable-v21/ic_menu_send.xml new file mode 100644 index 0000000..00c668c --- /dev/null +++ b/appdev/app/src/main/res/drawable-v21/ic_menu_send.xml @@ -0,0 +1,9 @@ + + + diff --git a/appdev/app/src/main/res/drawable-v21/ic_menu_share.xml b/appdev/app/src/main/res/drawable-v21/ic_menu_share.xml new file mode 100644 index 0000000..a28fb9e --- /dev/null +++ b/appdev/app/src/main/res/drawable-v21/ic_menu_share.xml @@ -0,0 +1,9 @@ + + + diff --git a/appdev/app/src/main/res/drawable-v21/ic_menu_slideshow.xml b/appdev/app/src/main/res/drawable-v21/ic_menu_slideshow.xml new file mode 100644 index 0000000..209aa64 --- /dev/null +++ b/appdev/app/src/main/res/drawable-v21/ic_menu_slideshow.xml @@ -0,0 +1,9 @@ + + + diff --git a/appdev/app/src/main/res/drawable/side_nav_bar.xml b/appdev/app/src/main/res/drawable/side_nav_bar.xml new file mode 100644 index 0000000..458b4b0 --- /dev/null +++ b/appdev/app/src/main/res/drawable/side_nav_bar.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/appdev/app/src/main/res/layout/activity_main.xml b/appdev/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..a61d8a6 --- /dev/null +++ b/appdev/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/appdev/app/src/main/res/layout/app_bar_main.xml b/appdev/app/src/main/res/layout/app_bar_main.xml new file mode 100644 index 0000000..6e2a1c2 --- /dev/null +++ b/appdev/app/src/main/res/layout/app_bar_main.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/appdev/app/src/main/res/layout/content_main.xml b/appdev/app/src/main/res/layout/content_main.xml new file mode 100644 index 0000000..bd15d5d --- /dev/null +++ b/appdev/app/src/main/res/layout/content_main.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/appdev/app/src/main/res/layout/nav_header_main.xml b/appdev/app/src/main/res/layout/nav_header_main.xml new file mode 100644 index 0000000..5eea9a6 --- /dev/null +++ b/appdev/app/src/main/res/layout/nav_header_main.xml @@ -0,0 +1,35 @@ + + + + + + + + + + diff --git a/appdev/app/src/main/res/menu/activity_main_drawer.xml b/appdev/app/src/main/res/menu/activity_main_drawer.xml new file mode 100644 index 0000000..2a7f467 --- /dev/null +++ b/appdev/app/src/main/res/menu/activity_main_drawer.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/appdev/app/src/main/res/menu/main.xml b/appdev/app/src/main/res/menu/main.xml new file mode 100644 index 0000000..a2411e3 --- /dev/null +++ b/appdev/app/src/main/res/menu/main.xml @@ -0,0 +1,9 @@ + + + + diff --git a/appdev/app/src/main/res/mipmap-hdpi/ic_launcher.png b/appdev/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/appdev/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/appdev/app/src/main/res/mipmap-mdpi/ic_launcher.png b/appdev/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/appdev/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/appdev/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/appdev/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/appdev/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/appdev/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/appdev/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/appdev/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/appdev/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/appdev/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/appdev/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/appdev/app/src/main/res/values-v21/styles.xml b/appdev/app/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..dbbdd40 --- /dev/null +++ b/appdev/app/src/main/res/values-v21/styles.xml @@ -0,0 +1,9 @@ + + + + diff --git a/appdev/app/src/main/res/values-w820dp/dimens.xml b/appdev/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/appdev/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/appdev/app/src/main/res/values/colors.xml b/appdev/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/appdev/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/appdev/app/src/main/res/values/dimens.xml b/appdev/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..c2effc5 --- /dev/null +++ b/appdev/app/src/main/res/values/dimens.xml @@ -0,0 +1,9 @@ + + + 16dp + 160dp + + 16dp + 16dp + 16dp + diff --git a/appdev/app/src/main/res/values/drawables.xml b/appdev/app/src/main/res/values/drawables.xml new file mode 100644 index 0000000..52c6a6c --- /dev/null +++ b/appdev/app/src/main/res/values/drawables.xml @@ -0,0 +1,8 @@ + + @android:drawable/ic_menu_camera + @android:drawable/ic_menu_gallery + @android:drawable/ic_menu_slideshow + @android:drawable/ic_menu_manage + @android:drawable/ic_menu_share + @android:drawable/ic_menu_send + diff --git a/appdev/app/src/main/res/values/strings.xml b/appdev/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..5fd272d --- /dev/null +++ b/appdev/app/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + Wikifeedia + + Open navigation drawer + Close navigation drawer + + Settings + diff --git a/appdev/app/src/main/res/values/styles.xml b/appdev/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..545b9c6 --- /dev/null +++ b/appdev/app/src/main/res/values/styles.xml @@ -0,0 +1,20 @@ + + + + + + + +