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;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.navigation.NavigationBarView;
import ly.warp.sdk.fragments.BillPaymentFragment;
import ly.warp.sdk.fragments.HomeFragment;
import ly.warp.sdk.fragments.LoyaltyFragment;
import warp.ly.android_sdk.R;
......@@ -63,13 +61,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
.addToBackStack(null)
.commit();
return true;
case R.id.menu_shop:
mFragmentToSet = BillPaymentFragment.newInstance();
getSupportFragmentManager().beginTransaction()
.replace(R.id.fl_fragment, mFragmentToSet)
.addToBackStack(null)
.commit();
return true;
}
return false;
}
......
......@@ -27,7 +27,7 @@ public class BillPaymentActivity extends Activity implements View.OnClickListene
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.fragment_bill_payment);
setContentView(R.layout.activity_bill_payment);
// mIvBack = findViewById(R.id.iv_back);
......
package ly.warp.sdk.fragments;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import ly.warp.sdk.R;
import ly.warp.sdk.activities.BillPaymentActivity;
import ly.warp.sdk.activities.LoyaltyActivity;
public class BillPaymentFragment extends Fragment {
@Override
public View onCreateView(
LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState
) {
return inflater.inflate(R.layout.fragment_bill_payment, container, false);
}
public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
}
@Override
public void onDestroyView() {
super.onDestroyView();
}
public void onClick(View view) {
// if (view.getId() == R.id.cl_rewards_wallet) {
Intent intent = new Intent(getContext(), BillPaymentActivity.class);
getContext().startActivity(intent);
// }
}
public static Fragment newInstance() {
BillPaymentFragment billPaymentFragment = new BillPaymentFragment();
return billPaymentFragment;
}
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1.5dp"
android:color="#AFD767" />
<corners android:radius="10dp" />
<solid android:color="#AFD767" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_bill_payment"
android:layout_width="match_parent"
......@@ -7,7 +7,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:id="@+id/cl_bill_header"
android:layout_width="match_parent"
android:layout_height="80dp"
app:layout_constraintTop_toTopOf="parent">
......@@ -36,36 +36,38 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="415dp"
android:layout_height="794dp"
android:layout_marginTop="4dp"
android:layout_width="match_parent"
android:layout_height="807dp"
android:layout_below="@+id/cl_bill_header"
android:layout_marginTop="1dp"
android:background="@drawable/shape_cos_profile"
android:orientation="vertical"
android:paddingBottom="24dp"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout"
tools:layout_editor_absoluteX="0dp">
tools:layout_editor_absoluteX="-2dp">
<ImageView
android:id="@+id/imageView4"
android:layout_width="357dp"
android:layout_height="191dp"
android:layout_width="310dp"
android:layout_height="176dp"
android:layout_marginTop="16dp"
android:src="@drawable/payment_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.495"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.06" />
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view"
android:layout_width="351dp"
android:layout_height="297dp"
android:background="@color/white"
android:layout_width="328dp"
android:layout_height="265dp"
android:background="@drawable/banner_border"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.493"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView4"
app:layout_constraintVertical_bias="0.245" />
app:layout_constraintVertical_bias="0.142" />
<EditText
android:id="@+id/editTextTextPersonName"
......@@ -86,37 +88,29 @@
android:id="@+id/editTextTextPersonName2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
android:ems="10"
android:inputType="textPersonName"
android:text="Name"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintEnd_toEndOf="@+id/view"
app:layout_constraintHorizontal_bias="0.475"
app:layout_constraintHorizontal_bias="0.482"
app:layout_constraintStart_toStartOf="@+id/view"
app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName"
app:layout_constraintVertical_bias="0.408" />
app:layout_constraintVertical_bias="0.277" />
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="28dp"
android:background="@drawable/round_border_green"
android:text="Πληρωμή"
android:textAllCaps="false"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintEnd_toEndOf="@+id/view"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="@+id/view"
app:layout_constraintTop_toBottomOf="@+id/editTextTextPersonName2"
app:layout_constraintVertical_bias="0.916" />
<ImageView
android:id="@+id/imageView5"
android:layout_width="341dp"
android:layout_height="144dp"
app:layout_constraintEnd_toEndOf="@+id/view"
app:layout_constraintStart_toStartOf="@+id/view"
app:srcCompat="@drawable/ellipse"
tools:layout_editor_absoluteY="314dp" />
app:layout_constraintVertical_bias="1.0" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
......