app publish to dahili test

app/build.gradle

@@ -22,8 +22,8 @@ android {
         applicationId "ch.pizzamaxx.android"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode  2 // play store'daki version --> canlı:  - dahili test: 1
+        versionCode  5 // play store'daki version --> canlı:  - dahili test: 4
-        versionName "1.01"   // play store'daki version --> canlı:  -  dahili test: 1.00
+        versionName "1.11"   // play store'daki version --> canlı:  -  dahili test: 1.10
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         manifestPlaceholders = [

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.00","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"1.10","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -77,7 +77,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="ch.pizzapp.capri.braintree" />
+                <data android:scheme="ch.pizzamaxx.android.braintree" />
             </intent-filter>
         </activity>
 

app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java

@@ -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);

app/src/main/java/ch/pizzamaxx/android/api/ApiConstants.java

@@ -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;
 }

app/src/main/java/ch/pizzamaxx/android/api/ApiService.java

@@ -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);
-    }
-
 }

app/src/main/java/ch/pizzamaxx/android/fragment/ProductFragment.java

@@ -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){
+        FragmentActivity fragmentActivity = getActivity();
-            MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity;
+        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();
         }
     }