Skip to content

[KIOSK-11] v1을 위한 데모버전 정리 작업(carouselview, google place api, 기타 라이브러리… #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kyewonseo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[KIOSK-11] v1을 위한 데모버전 정리 작업(carouselview, google place api, 기타 라이브러리… #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,11 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.+'
compile 'com.google.android.gms:play-services-maps:10.0.1'
compile 'com.google.android.gms:play-services:10.0.1'
compile 'com.google.firebase:firebase-core:10.0.1'
compile 'com.google.firebase:firebase-messaging:10.0.1'
compile 'com.android.support:design:24.0.0'
compile 'com.synnapps:carouselview:0.0.10'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
compile 'com.squareup:otto:1.3.7'
compile 'com.squareup.okhttp3:okhttp:3.2.0'
compile 'noman.placesapi:placesAPI:1.1.3'
testCompile 'junit:junit:4.12'
}

apply plugin: 'com.google.gms.google-services'
23 changes: 6 additions & 17 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.bluehack.kiosk">

<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />

<application
android:name=".ApplicationLoader"
Expand All @@ -16,17 +13,9 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">

<!--google map-->
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyA7av6NBZ3U-CwHzYMPex2M96OWP1zQz4Y"/>
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

<activity
android:name=".main.MainActivity"
android:label="@string/app_title"
android:label="@string/tool_bar_main"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand All @@ -37,31 +26,31 @@

<activity
android:name=".store.StoreActivity"
android:label="@string/app_title"
android:label="@string/tool_bar_store"
android:screenOrientation="portrait">
</activity>

<activity
android:name=".order.OrderActivity"
android:label="@string/app_title"
android:label="@string/tool_bar_order"
android:screenOrientation="portrait">
</activity>

<activity
android:name=".order_pay.OrderPayActivity"
android:label="@string/app_title"
android:label="@string/tool_bar_order"
android:screenOrientation="portrait">
</activity>

<activity
android:name=".order_option.OrderOptionActivity"
android:label="@string/app_title"
android:label="@string/tool_bar_order"
android:screenOrientation="portrait">
</activity>

<activity
android:name=".process.ProcessActivity"
android:label="@string/app_title"
android:label="@string/tool_bar_main"
android:screenOrientation="portrait">
</activity>

Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/net/bluehack/kiosk/login/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package net.bluehack.kiosk.login;

public class LoginActivity {
}
24 changes: 2 additions & 22 deletions app/src/main/java/net/bluehack/kiosk/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,11 @@
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageView;
import android.widget.Toast;

import com.synnapps.carouselview.CarouselView;
import com.synnapps.carouselview.ViewListener;

import net.bluehack.kiosk.R;
import net.bluehack.kiosk.store.StoreActivity;

Expand All @@ -31,8 +27,6 @@ public class MainActivity extends AppCompatActivity {
private Context context;
private DrawerLayout drawerLayout;
private NavigationView navigationView;
private CarouselView carouselView;
private int[] carouselImgs = {R.drawable.img_slidemenu_promotion, R.drawable.img_slidemenu_promotion, R.drawable.img_slidemenu_promotion, R.drawable.img_slidemenu_promotion};

private RecyclerView recyclerView;
private RecyclerView.LayoutManager layoutManager;
Expand All @@ -56,10 +50,11 @@ protected void onCreate(Bundle savedInstanceState) {
ActionBar actionBar = getSupportActionBar();
actionBar.setHomeAsUpIndicator(R.drawable.btn_main_menu_nor);
actionBar.setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false);


orderBtn = (ImageView) findViewById(R.id.order_btn);
drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
carouselView = (CarouselView) findViewById(R.id.carousel_view);
//recyclerView = (RecyclerView) findViewById(R.id.recent_menu_list);
//recyclerView.setHasFixedSize(true);

Expand All @@ -70,21 +65,6 @@ protected void onCreate(Bundle savedInstanceState) {
//recyclerView.setAdapter(recentCardAdapter);
//recentCardAdapter.notifyDataSetChanged();

carouselView.setPageCount(carouselImgs.length);
carouselView.setSlideInterval(2000);
carouselView.setViewListener(new ViewListener() {
@Override
public View setViewForPosition(int position) {
View carouselListItem = getLayoutInflater().inflate(R.layout.carousel_list_item, null);
ImageView carouselItemImg = (ImageView) carouselListItem.findViewById(R.id.carousel_item_img);

carouselItemImg.setImageResource(carouselImgs[position]);
carouselView.setIndicatorGravity(Gravity.CENTER_HORIZONTAL|Gravity.BOTTOM);

return carouselListItem;
}
});

navigationView = (NavigationView) findViewById(R.id.navigation_view);
navigationView.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
@Override
Expand Down
Loading