open-source / warply_android_sdk_maven_plugin

Go to a project
Toggle navigation Toggle navigation pinning
Panagiotis Triantafyllou
c6de15b7 2 parents 9fdd1184 ed011068

Merge remote-tracking branch 'origin/cosmote' into cosmote

Inline Side-by-side
Showing 5 changed files with 35 additions and 88 deletions
...@@ -5,12 +5,10 @@ import android.view.MenuItem; ...@@ -5,12 +5,10 @@ import android.view.MenuItem;
5 5
6 import androidx.annotation.NonNull; 6 import androidx.annotation.NonNull;
7 import androidx.fragment.app.Fragment; 7 import androidx.fragment.app.Fragment;
8 -import androidx.fragment.app.FragmentTransaction;
9 8
10 import com.google.android.material.bottomnavigation.BottomNavigationView; 9 import com.google.android.material.bottomnavigation.BottomNavigationView;
11 import com.google.android.material.navigation.NavigationBarView; 10 import com.google.android.material.navigation.NavigationBarView;
12 11
13 -import ly.warp.sdk.fragments.BillPaymentFragment;
14 import ly.warp.sdk.fragments.HomeFragment; 12 import ly.warp.sdk.fragments.HomeFragment;
15 import ly.warp.sdk.fragments.LoyaltyFragment; 13 import ly.warp.sdk.fragments.LoyaltyFragment;
16 import warp.ly.android_sdk.R; 14 import warp.ly.android_sdk.R;
...@@ -63,13 +61,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt ...@@ -63,13 +61,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
63 .addToBackStack(null) 61 .addToBackStack(null)
64 .commit(); 62 .commit();
65 return true; 63 return true;
66 - case R.id.menu_shop:
67 - mFragmentToSet = BillPaymentFragment.newInstance();
68 - getSupportFragmentManager().beginTransaction()
69 - .replace(R.id.fl_fragment, mFragmentToSet)
70 - .addToBackStack(null)
71 - .commit();
72 - return true;
73 } 64 }
74 return false; 65 return false;
75 } 66 }
......
...@@ -27,7 +27,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene ...@@ -27,7 +27,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
27 @Override 27 @Override
28 public void onCreate(Bundle savedInstanceState) { 28 public void onCreate(Bundle savedInstanceState) {
29 super.onCreate(savedInstanceState); 29 super.onCreate(savedInstanceState);
30 - setContentView(R.layout.fragment_bill_payment); 30 + setContentView(R.layout.activity_bill_payment);
31 31
32 // mIvBack = findViewById(R.id.iv_back); 32 // mIvBack = findViewById(R.id.iv_back);
33 33
......
1 -package ly.warp.sdk.fragments;
2 -
3 -import android.content.Intent;
4 -import android.os.Bundle;
5 -import android.view.LayoutInflater;
6 -import android.view.View;
7 -import android.view.ViewGroup;
8 -
9 -import androidx.annotation.NonNull;
10 -import androidx.fragment.app.Fragment;
11 -
12 -import ly.warp.sdk.R;
13 -import ly.warp.sdk.activities.BillPaymentActivity;
14 -import ly.warp.sdk.activities.LoyaltyActivity;
15 -
16 -public class BillPaymentFragment extends Fragment {
17 -
18 - @Override
19 - public View onCreateView(
20 - LayoutInflater inflater, ViewGroup container,
21 - Bundle savedInstanceState
22 - ) {
23 - return inflater.inflate(R.layout.fragment_bill_payment, container, false);
24 - }
25 -
26 - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
27 - super.onViewCreated(view, savedInstanceState);
28 -
29 - }
30 -
31 - @Override
32 - public void onDestroyView() {
33 - super.onDestroyView();
34 - }
35 -
36 - public void onClick(View view) {
37 -// if (view.getId() == R.id.cl_rewards_wallet) {
38 - Intent intent = new Intent(getContext(), BillPaymentActivity.class);
39 - getContext().startActivity(intent);
40 -// }
41 - }
42 -
43 - public static Fragment newInstance() {
44 - BillPaymentFragment billPaymentFragment = new BillPaymentFragment();
45 - return billPaymentFragment;
46 - }
47 -}
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
3 + <stroke
4 + android:width="1.5dp"
5 + android:color="#AFD767" />
6 +
7 + <corners android:radius="10dp" />
8 + <solid android:color="#AFD767" />
9 +</shape>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 -<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto" 2 +<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto"
3 xmlns:tools="http://schemas.android.com/tools" 3 xmlns:tools="http://schemas.android.com/tools"
4 android:id="@+id/cl_bill_payment" 4 android:id="@+id/cl_bill_payment"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
7 xmlns:android="http://schemas.android.com/apk/res/android"> 7 xmlns:android="http://schemas.android.com/apk/res/android">
8 8
9 <androidx.constraintlayout.widget.ConstraintLayout 9 <androidx.constraintlayout.widget.ConstraintLayout
10 - android:id="@+id/constraintLayout" 10 + android:id="@+id/cl_bill_header"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 android:layout_height="80dp" 12 android:layout_height="80dp"
13 app:layout_constraintTop_toTopOf="parent"> 13 app:layout_constraintTop_toTopOf="parent">
...@@ -36,36 +36,38 @@ ...@@ -36,36 +36,38 @@
36 </androidx.constraintlayout.widget.ConstraintLayout> 36 </androidx.constraintlayout.widget.ConstraintLayout>
37 37
38 <androidx.constraintlayout.widget.ConstraintLayout 38 <androidx.constraintlayout.widget.ConstraintLayout
39 - android:layout_width="415dp" 39 + android:layout_width="match_parent"
40 - android:layout_height="794dp" 40 + android:layout_height="807dp"
41 - android:layout_marginTop="4dp" 41 + android:layout_below="@+id/cl_bill_header"
42 + android:layout_marginTop="1dp"
42 android:background="@drawable/shape_cos_profile" 43 android:background="@drawable/shape_cos_profile"
43 android:orientation="vertical" 44 android:orientation="vertical"
44 android:paddingBottom="24dp" 45 android:paddingBottom="24dp"
45 - app:layout_constraintTop_toBottomOf="@+id/constraintLayout" 46 + tools:layout_editor_absoluteX="-2dp">
46 - tools:layout_editor_absoluteX="0dp"> 47 +
47 48
48 <ImageView 49 <ImageView
49 android:id="@+id/imageView4" 50 android:id="@+id/imageView4"
50 - android:layout_width="357dp" 51 + android:layout_width="310dp"
51 - android:layout_height="191dp" 52 + android:layout_height="176dp"
53 + android:layout_marginTop="16dp"
52 android:src="@drawable/payment_icon" 54 android:src="@drawable/payment_icon"
53 - app:layout_constraintBottom_toBottomOf="parent"
54 app:layout_constraintEnd_toEndOf="parent" 55 app:layout_constraintEnd_toEndOf="parent"
56 + app:layout_constraintHorizontal_bias="0.495"
55 app:layout_constraintStart_toStartOf="parent" 57 app:layout_constraintStart_toStartOf="parent"
56 - app:layout_constraintTop_toTopOf="parent" 58 + app:layout_constraintTop_toTopOf="parent" />
57 - app:layout_constraintVertical_bias="0.06" />
58 59
59 <View 60 <View
60 android:id="@+id/view" 61 android:id="@+id/view"
61 - android:layout_width="351dp" 62 + android:layout_width="328dp"
62 - android:layout_height="297dp" 63 + android:layout_height="265dp"
63 - android:background="@color/white" 64 + android:background="@drawable/banner_border"
64 app:layout_constraintBottom_toBottomOf="parent" 65 app:layout_constraintBottom_toBottomOf="parent"
65 app:layout_constraintEnd_toEndOf="parent" 66 app:layout_constraintEnd_toEndOf="parent"
67 + app:layout_constraintHorizontal_bias="0.493"
66 app:layout_constraintStart_toStartOf="parent" 68 app:layout_constraintStart_toStartOf="parent"
67 app:layout_constraintTop_toBottomOf="@+id/imageView4" 69 app:layout_constraintTop_toBottomOf="@+id/imageView4"
68 - app:layout_constraintVertical_bias="0.245" /> 70 + app:layout_constraintVertical_bias="0.142" />
69 71
70 <EditText 72 <EditText
71 android:id="@+id/editTextTextPersonName" 73 android:id="@+id/editTextTextPersonName"
...@@ -86,37 +88,29 @@ ...@@ -86,37 +88,29 @@
86 android:id="@+id/editTextTextPersonName2" 88 android:id="@+id/editTextTextPersonName2"
87 android:layout_width="wrap_content" 89 android:layout_width="wrap_content"
88 android:layout_height="wrap_content" 90 android:layout_height="wrap_content"
89 - android:background="@color/white"
90 android:ems="10" 91 android:ems="10"
91 android:inputType="textPersonName" 92 android:inputType="textPersonName"
92 android:text="Name" 93 android:text="Name"
93 app:layout_constraintBottom_toBottomOf="@+id/view" 94 app:layout_constraintBottom_toBottomOf="@+id/view"
94 app:layout_constraintEnd_toEndOf="@+id/view" 95 app:layout_constraintEnd_toEndOf="@+id/view"
95 - app:layout_constraintHorizontal_bias="0.475" 96 + app:layout_constraintHorizontal_bias="0.482"
96 app:layout_constraintStart_toStartOf="@+id/view" 97 app:layout_constraintStart_toStartOf="@+id/view"
97 app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName" 98 app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName"
98 - app:layout_constraintVertical_bias="0.408" /> 99 + app:layout_constraintVertical_bias="0.277" />
99 100
100 <Button 101 <Button
101 android:id="@+id/button2" 102 android:id="@+id/button2"
102 android:layout_width="wrap_content" 103 android:layout_width="wrap_content"
103 android:layout_height="wrap_content" 104 android:layout_height="wrap_content"
104 android:layout_marginBottom="28dp" 105 android:layout_marginBottom="28dp"
106 + android:background="@drawable/round_border_green"
105 android:text="Πληρωμή" 107 android:text="Πληρωμή"
108 + android:textAllCaps="false"
109 + android:textColor="@color/white"
106 app:layout_constraintBottom_toBottomOf="@+id/view" 110 app:layout_constraintBottom_toBottomOf="@+id/view"
107 app:layout_constraintEnd_toEndOf="@+id/view" 111 app:layout_constraintEnd_toEndOf="@+id/view"
108 - app:layout_constraintHorizontal_bias="0.498"
109 app:layout_constraintStart_toStartOf="@+id/view" 112 app:layout_constraintStart_toStartOf="@+id/view"
110 app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName2" 113 app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName2"
111 - app:layout_constraintVertical_bias="0.916" /> 114 + app:layout_constraintVertical_bias="1.0" />
112 -
113 - <ImageView
114 - android:id="@+id/imageView5"
115 - android:layout_width="341dp"
116 - android:layout_height="144dp"
117 - app:layout_constraintEnd_toEndOf="@+id/view"
118 - app:layout_constraintStart_toStartOf="@+id/view"
119 - app:srcCompat="@drawable/ellipse"
120 - tools:layout_editor_absoluteY="314dp" />
121 </androidx.constraintlayout.widget.ConstraintLayout> 115 </androidx.constraintlayout.widget.ConstraintLayout>
122 -</androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
116 +</RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
......