volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app publish to dahili test

Browse Source
This commit is contained in:
cimenmus
2019-03-28 01:30:23 +03:00
parent c73fc108aa
commit de2c9cf389
9 changed files with 21 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java
View File

@@ -30,6 +30,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import ch.pizzamaxx.android.R;
import ch.pizzamaxx.android.adapter.recycler.NavigationMenuRecyclerAdapter;
import ch.pizzamaxx.android.api.ApiConstants;
import ch.pizzamaxx.android.fragment.CartFragment;
import ch.pizzamaxx.android.fragment.OrderHistoryFragment;
import ch.pizzamaxx.android.fragment.StoreInfoFragment;
@@ -166,7 +167,7 @@ public class MainActivity extends BaseActivity {
bottomNavigationView.setCurrentItem(2);
}
else {
openProductsScreen(categoryList.get(0));
openProductsScreen(categoryList.get(ApiConstants.NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX));
}
}
private void initBottomNavigationView(){
@@ -183,11 +184,15 @@ public class MainActivity extends BaseActivity {
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()){
case R.id.action_menu:
/*
if (currentFragmentName.equals(MenuFragment.FRAGMENT_NAME))
return true;
fragmentManager.beginTransaction().replace(R.id.fragmentContainer,
MenuFragment.newInstance(categoryList.get(3))).commit();
MenuFragment.newInstance(categoryList.get(ApiConstants.NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX))).commit();
currentFragmentName = MenuFragment.FRAGMENT_NAME;
*/
openProductsScreen(categoryList.get(ApiConstants.NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX));
shoppingCartImageView.setImageDrawable(whiteCartDrawable);
shoppingCartTextView.setTextColor(whiteColor);

2
app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java
View File

@@ -30,4 +30,6 @@ public class ApiConstants {
public static final String ONESIGNAL_NOTIFICATION_TAG_KEY = "notificationAllowed";
public static final String ONESIGNAL_NOTIFICATION_TAG_VALUE = "true";
public static final int NAVIGATION_MENU_DEFAULT_CATEGORY_INDEX = 0;
}

38
app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
View File

@@ -62,42 +62,4 @@ public class ApiService {
apiInterface = retrofit.create(ApiInterface.class);
}
public void reset3dsTest() {
Gson gson = new GsonBuilder()
.setLenient()
.create();
OkHttpClient.Builder builder = new OkHttpClient().newBuilder();
builder.readTimeout(ApiConstants.API_READ_TIMEOUT, TimeUnit.SECONDS);
builder.connectTimeout(ApiConstants.API_CONNECT_TIMEOUT, TimeUnit.SECONDS);
builder.addInterceptor(new Interceptor() {
@Override
public Response intercept(Interceptor.Chain chain) throws IOException {
Request.Builder builder = chain.request().newBuilder();
builder.addHeader("Content-Type", "application/json");
Request request = builder.build();
return chain.proceed(request);
}
});
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
//builder.addInterceptor(logging);
OkHttpClient client = builder.build();
retrofit = new Retrofit.Builder()
.baseUrl("http://pizzamaxx.ch/")
.addConverterFactory(GsonConverterFactory.create(gson))
.client(client)
.build();
apiInterface = retrofit.create(ApiInterface.class);
}
}

10
app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java
View File

@@ -2,6 +2,7 @@ package ch.pizzamaxx.android.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -77,8 +78,13 @@ public class ProductFragment extends BaseFragment {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES && resultCode == RESULT_OK){
MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
FragmentActivity fragmentActivity = getActivity();
if(requestCode == REQUEST_CODE_PRODUCT_PROPERTIES &&
resultCode == RESULT_OK &&
fragmentActivity instanceof MainActivity){
MainActivity mainActivity = (MainActivity) fragmentActivity;
BaseActivity.setCurrentActivity(mainActivity);
BaseActivity.setCurrentActivity((MainActivity) fragmentActivity);
mainActivity.setCartItemCount();
}
}