Skip to content

Commit

Permalink
rev
Browse files Browse the repository at this point in the history
  • Loading branch information
aodihis committed Jun 19, 2016
1 parent d8eef25 commit a69b105
Show file tree
Hide file tree
Showing 30 changed files with 49 additions and 178 deletions.
2 changes: 1 addition & 1 deletion .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion "23.0.3"

defaultConfig {
applicationId "net.nguliv1"
applicationId "net.nguli_v1"
minSdkVersion 15
targetSdkVersion 23
versionCode 1
Expand All @@ -21,6 +21,6 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.android.support:design:23.0.1'
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.nguliv1;
package net.nguli_v1;

import android.app.Application;
import android.test.ApplicationTestCase;
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.nguliv1">
package="net.nguli_v1">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
<activity android:name=".MainActivity">
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
package net.nguliv1.Fragments;
package net.nguli_v1.Fragments;

/**
* Created by aodihis on 6/19/2016.
*/

import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import net.nguliv1.R;

import net.nguli_v1.R;

public class Beranda extends Fragment{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package net.nguliv1;
package net.nguli_v1;


import android.os.Bundle;
import android.support.design.widget.TabLayout;
Expand All @@ -10,7 +11,7 @@
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import net.nguliv1.Fragments.Beranda;
import net.nguli_v1.Fragments.Beranda;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -29,16 +30,16 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);

toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);

getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setIcon(R.drawable.logo);
// setSupportActionBar(toolbar);

viewPager = (ViewPager) findViewById(R.id.viewpager);
setupViewPager(viewPager);
// getSupportActionBar().setDisplayHomeAsUpEnabled(true);
// getSupportActionBar().setIcon(R.drawable.logo);

tabLayout = (TabLayout) findViewById(R.id.tabs);
tabLayout.setupWithViewPager(viewPager);
// viewPager = (ViewPager) findViewById(R.id.viewpager);
// setupViewPager(viewPager);
//
// tabLayout = (TabLayout) findViewById(R.id.tabs);
// tabLayout.setupWithViewPager(viewPager);
}

private void setupViewPager(ViewPager viewPager) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
package net.nguliv1;
package net.nguli_v1;

/**
* Created by aodihis on 6/19/2016.
*/

import android.os.Bundle;
import android.support.v4.app.Fragment;
Expand Down Expand Up @@ -27,4 +31,4 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
return inflater.inflate(R.layout.fragment_three, container, false);
}

}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
package net.nguliv1;
package net.nguli_v1;

/**
* Created by aodihis on 6/19/2016.
*/

import android.os.Bundle;
import android.support.v4.app.Fragment;
Expand Down
33 changes: 0 additions & 33 deletions app/src/main/java/net/nguliv1/OneFragment.java

This file was deleted.

Binary file removed app/src/main/res/drawable-v21/cart.png
Binary file not shown.
12 changes: 0 additions & 12 deletions app/src/main/res/drawable-v21/ic_menu_camera.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable-v21/ic_menu_gallery.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable-v21/ic_menu_manage.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable-v21/ic_menu_send.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable-v21/ic_menu_share.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable-v21/ic_menu_slideshow.xml

This file was deleted.

File renamed without changes
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />

<android.support.design.widget.TabLayout
<TableLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/app_bar_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="net.nguliv1.MainActivity">
tools:context="net.nguli_v1.MainActivity">

<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/content_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context="net.nguliv1.MainActivity"
tools:context="net.nguli_v1.MainActivity"
tools:showIn="@layout/app_bar_main">

<TextView
Expand Down
36 changes: 0 additions & 36 deletions app/src/main/res/menu/activity_main_drawer.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/values-v21/styles.xml

This file was deleted.

8 changes: 0 additions & 8 deletions app/src/main/res/values/drawables.xml

This file was deleted.

3 changes: 1 addition & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<resources>
<string name="app_name">Nguliv1</string>

<string name="app_name">nguli_v1</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package net.nguliv1;
package net.nguli_v1;

import org.junit.Test;

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:2.1.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Oct 21 11:34:03 PDT 2015
#Mon Dec 28 10:00:20 PST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 comments on commit a69b105

Please sign in to comment.