Commit d14de730 authored by Wahyu Wibowo's avatar Wahyu Wibowo

merge with abi

parents 4f07bdd7 f76550b2
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.yourcashiertest">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-feature
android:name="android.hardware.camera"
android:required="true" />
......@@ -17,13 +17,25 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme2">
<activity android:name=".activities.WelcomeActivity"></activity>
<activity android:name=".activities.ForgetPassword" />
<activity android:name=".activities.RegisterActivity" />
<activity android:name=".activities.StatusPayment" />
<activity
android:name=".activities.SkActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".activities.WelcomeActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".activities.ForgetPassword"
android:screenOrientation="portrait"/>
<activity
android:name=".activities.RegisterActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".activities.StatusPayment"
android:screenOrientation="portrait"/>
<activity
android:name=".activities.SplashActivity"
android:theme="@style/AppTheme2">
android:theme="@style/AppTheme2"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
......@@ -32,17 +44,19 @@
</activity>
<activity
android:name=".activities.PaymentActivity"
android:theme="@style/AppTheme2" />
android:screenOrientation="portrait"/>
<activity
android:name=".activities.CartActivity"
android:theme="@style/AppTheme2" />
android:screenOrientation="portrait"/>
<activity
android:name=".activities.MainActivity"
android:theme="@style/AppTheme2" />
android:screenOrientation="portrait"/>
<activity
android:name=".activities.ProductActivity"
android:theme="@style/AppTheme2" />
<activity android:name=".activities.LoginActivity" />
android:screenOrientation="portrait"/>
<activity
android:name=".activities.LoginActivity"
android:screenOrientation="portrait"/>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.example.yourcashiertest.fileprovider"
......
......@@ -2,7 +2,9 @@ package com.example.yourcashiertest.activities;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
......@@ -15,12 +17,23 @@ public class LoginActivity extends AppCompatActivity {
TextInputEditText etUsername, etPassword;
MaterialButton btnLogin;
public static final String DATA_LOGIN = "DATA_LOGIN";
public static Boolean syarat;
// SharedPreferences sharedPreferences;
// public static final String SESS_SYARAT = "syarat";
// public static final String my_shared = "session_status";
private PrefManager prefManager;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
// sharedPreferences = getSharedPreferences(my_shared, Context.MODE_PRIVATE);
// syarat = sharedPreferences.getBoolean(SESS_SYARAT, false);
prefManager = new PrefManager(this);
if (!prefManager.isFirstLogin()) {
launchMain();
finish();
}
etPassword = findViewById(R.id.etPassword);
etUsername = findViewById(R.id.etUsername);
btnLogin = findViewById(R.id.btnLogin);
......@@ -48,4 +61,9 @@ public class LoginActivity extends AppCompatActivity {
public void tvSignUpHere(View view) {
startActivity(new Intent(LoginActivity.this, RegisterActivity.class));
}
public void launchMain() {
prefManager.setFirstLogin(false);
startActivity(new Intent(LoginActivity.this, MainActivity.class));
finish();
}
}
\ No newline at end of file
......@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModelProvider;
import android.Manifest;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
......@@ -26,7 +27,8 @@ import com.example.yourcashiertest.viewmodels.ProductViewModel;
public class MainActivity extends AppCompatActivity {
ActivityMainBinding binding;
private PrefManager prefManager;
SharedPreferences sharedPreferences;
public static final String DATA_PRODUCT = "DATA_PRODUCT";
private static final int REQUEST_PERMISSIONS = 111;
......@@ -43,6 +45,7 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
requestPermissions(permissions, REQUEST_PERMISSIONS);
prefManager = new PrefManager(this);
ProductAdapter adapter = new ProductAdapter();
binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
......@@ -74,6 +77,11 @@ public class MainActivity extends AppCompatActivity {
startActivity(getIntent());
overridePendingTransition(0, 0);
return true;
case R.id.item_three:
prefManager.removeLoginSession();
startActivity(new Intent(MainActivity.this, LoginActivity.class));
finish();
break;
}
return false;
});
......
......@@ -9,7 +9,8 @@ import androidx.lifecycle.ViewModelProvider;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import com.example.yourcashiertest.R;
......@@ -24,6 +25,7 @@ public class PaymentActivity extends AppCompatActivity {
public int refund;
public int amount;
CartViewModel cartViewModel;
public boolean change = false;
@RequiresApi(api = Build.VERSION_CODES.N)
@Override
......@@ -36,6 +38,16 @@ public class PaymentActivity extends AppCompatActivity {
amount = getIntent().getIntExtra(CartActivity.PRICE, 0);
binding.setAmount(Convert.changeToCurrency(amount));
binding.cvCash.setOnTouchListener((view, event) -> {
changeCvColor(event, binding.cvCash);
return true;
});
binding.cvCard.setOnTouchListener((view, event) -> {
changeCvColor(event, binding.cvCard);
return true;
});
}
public void btnPay(View view) {
......@@ -46,6 +58,29 @@ public class PaymentActivity extends AppCompatActivity {
finish();
}
public void changeCvColor(MotionEvent event, CardView cv){
if (change) {
change = false;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
cv.setCardBackgroundColor(getResources().getColor(R.color.colorPrimary));
break;
case MotionEvent.ACTION_UP:
cv.setCardBackgroundColor(getResources().getColor(R.color.white));
}
} else {
change = true;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
cv.setCardBackgroundColor(getResources().getColor(R.color.white));
break;
case MotionEvent.ACTION_UP:
cv.setCardBackgroundColor(getResources().getColor(R.color.colorPrimary));
}
}
}
@Override
protected void onDestroy() {
super.onDestroy();
......
......@@ -8,14 +8,13 @@ public class PrefManager {
SharedPreferences pref;
SharedPreferences.Editor editor;
Context _context;
// shared pref mode
int PRIVATE_MODE = 0;
// Shared preferences file name
private static final String PREF_NAME = "introslider";
private static final String IS_FIRST_TIME_LAUNCH = "IsFirstTimeLaunch";
private static final String PREF_NAME = "preferences";
private static final String IS_FIRST_WELCOME = "IsFirstWelcome";
private static final String IS_FIRST_LOGIN = "IsFirstLogin";
public PrefManager(Context context) {
this._context = context;
......@@ -23,13 +22,20 @@ public class PrefManager {
editor = pref.edit();
}
public void setFirstTimeLaunch(boolean isFirstTime) {
editor.putBoolean(IS_FIRST_TIME_LAUNCH, isFirstTime);
public void setFirstWelcome(boolean isFirstTime) {
editor.putBoolean(IS_FIRST_WELCOME, isFirstTime);
editor.commit();
}
public boolean isFirstTimeLaunch() {
return pref.getBoolean(IS_FIRST_TIME_LAUNCH, true);
public void setFirstLogin(boolean isFirstTime) {
editor.putBoolean(IS_FIRST_LOGIN, isFirstTime);
editor.commit();
}
public boolean isFirstLogin(){return pref.getBoolean(IS_FIRST_LOGIN, true);}
public boolean isFirstWelcome() { return pref.getBoolean(IS_FIRST_WELCOME, true); }
public void removeLoginSession(){
// loginActivity.launchMain(true);
editor.remove(IS_FIRST_LOGIN);
editor.apply();
}
}
......@@ -14,17 +14,14 @@ import android.os.Bundle;
import android.os.Environment;
import android.provider.MediaStore;
import android.text.TextUtils;
import com.example.yourcashiertest.R;
import com.example.yourcashiertest.databinding.ActivityProductBinding;
import com.example.yourcashiertest.entities.Product;
import com.example.yourcashiertest.utils.ViewUtil;
import com.example.yourcashiertest.viewmodels.ProductViewModel;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
public class ProductActivity extends AppCompatActivity{
private static final int PICK_IMAGE = 123;
ActivityProductBinding binding;
......@@ -32,36 +29,27 @@ public class ProductActivity extends AppCompatActivity{
private static final int REQUEST_IMAGE_CAPTURE = 1;
private File file;
private ProductViewModel viewModel;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
viewModel = new ViewModelProvider(this).get(ProductViewModel.class);
binding = DataBindingUtil.setContentView(this, R.layout.activity_product);
Product product = getIntent().getParcelableExtra(MainActivity.DATA_PRODUCT);
if (getSupportActionBar() != null) {
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
if (product != null){
isUpdate = true;
viewModel.setPhoto(product.getPhoto());
viewModel.setProduct(product);
binding.btnSubmit.setText(R.string.btn_edit);
binding.tvHeadProduct.setText("UPDATE PRODUCT");
}else {
product = new Product("", "", 0, 0, "", "");
}
binding.cvProduct.setOnClickListener(v -> selectAction(this));
Product fixProduct = product;
binding.btnSubmit.setOnClickListener(v -> {
try {
......@@ -73,38 +61,31 @@ public class ProductActivity extends AppCompatActivity{
ViewUtil.showMessage(binding.getRoot(), getString(R.string.form_error_message));
return;
}
if (file != null){
fixProduct.setPhoto(file.getAbsolutePath());
}
fixProduct.setName(binding.etProduct.getText().toString());
fixProduct.setCategory(binding.etCategory.getText().toString());
fixProduct.setDescription(binding.etDescription.getText().toString());
fixProduct.setPrice(Long.parseLong(binding.etPrice.getText().toString()));
fixProduct.setQuantity(Long.parseLong(binding.etQuantity.getText().toString()));
if (isUpdate){
viewModel.updateProduct(fixProduct);
}else {
viewModel.insertProduct(fixProduct);
}
finish();
}catch (Exception e){
e.printStackTrace();
}
});
binding.setViewModel(viewModel);
}
private void takePhoto() {
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
if (takePictureIntent.resolveActivity(getPackageManager()) != null) {
File photoFile = createImageFile();
if (photoFile != null) {
Uri photoURI = FileProvider.getUriForFile(this,
"com.example.yourcashiertest.fileprovider",
......@@ -114,18 +95,13 @@ public class ProductActivity extends AppCompatActivity{
}
}
}
private void selectAction(Context context){
final CharSequence[] options = { "Take Photo", "Choose from Gallery","Cancel" };
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle("Choose your profile picture");
builder.setItems(options, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int item) {
if (options[item].equals("Take Photo")) {
takePhoto();
} else if (options[item].equals("Choose from Gallery")) {
......@@ -137,14 +113,11 @@ public class ProductActivity extends AppCompatActivity{
});
builder.show();
}
private void openGallery(){
Intent intent = new Intent(Intent.ACTION_PICK);
intent.setType("image/*");
startActivityForResult(intent, PICK_IMAGE);
}
private File createImageFile() {
try {
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
......@@ -157,16 +130,13 @@ public class ProductActivity extends AppCompatActivity{
return image;
} catch (Exception ex) {
ex.printStackTrace();
return null;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
Uri imageUri;
if (resultCode == RESULT_OK && requestCode == PICK_IMAGE){
//set image to image view
binding.ivProduct.setImageURI(data.getData());
......@@ -178,7 +148,6 @@ public class ProductActivity extends AppCompatActivity{
}
}
}
public String getPath(Uri uri)
{
String[] projection = { MediaStore.Images.Media.DATA };
......@@ -190,17 +159,14 @@ public class ProductActivity extends AppCompatActivity{
cursor.close();
return s;
}
@Override
public boolean onSupportNavigateUp() {
onBackPressed();
return super.onSupportNavigateUp();
}
@Override
protected void onDestroy() {
super.onDestroy();
binding = null;
}
}
\ No newline at end of file
......@@ -5,10 +5,15 @@ import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.webkit.WebView;
import android.widget.ProgressBar;
import com.example.yourcashiertest.R;
public class RegisterActivity extends AppCompatActivity {
WebView wbCompany;
ProgressBar pbLoading;
private static final String urLCompany = "http://multidaya.id/";
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -18,5 +23,10 @@ public class RegisterActivity extends AppCompatActivity {
public void tvSignInHere(View view) {
startActivity(new Intent(RegisterActivity.this, LoginActivity.class));
finish();
}
public void tvSK(View view) {
startActivity(new Intent(RegisterActivity.this, SkActivity.class));
}
}
\ No newline at end of file
package com.example.yourcashiertest.activities;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.ProgressBar;
import com.example.yourcashiertest.R;
public class SkActivity extends AppCompatActivity {
WebView wbCompany;
ProgressBar pbLoading;
private static final String urLCompany = "http://multidaya.id/";
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sk);
pbLoading = findViewById(R.id.pbLoading);
wbCompany = findViewById(R.id.wbCompany);
wbCompany.getSettings().setLoadsImagesAutomatically(true);
wbCompany.getSettings().setJavaScriptEnabled(true);
wbCompany.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);
wbCompany.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
wbCompany.setVisibility(View.VISIBLE);
pbLoading.setVisibility(View.GONE);
if (getSupportActionBar() != null)
getSupportActionBar().setTitle("Multidaya Dinamika");
}
});
wbCompany.loadUrl(urLCompany);
}
}
\ No newline at end of file
......@@ -36,7 +36,7 @@ public class WelcomeActivity extends AppCompatActivity {
// mengecek lauch activity - sebelum memanggil setContentView()
prefManager = new PrefManager(this);
if (!prefManager.isFirstTimeLaunch()) {
if (!prefManager.isFirstWelcome()) {
launchHomeScreen();
finish();
}
......@@ -118,7 +118,7 @@ public class WelcomeActivity extends AppCompatActivity {
}
private void launchHomeScreen() {
prefManager.setFirstTimeLaunch(false);
prefManager.setFirstWelcome(false);
startActivity(new Intent(WelcomeActivity.this, LoginActivity.class));
finish();
}
......
<vector android:height="511.68176dp" android:viewportHeight="517.3097"
android:viewportWidth="567.1704" android:width="561dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#3f3d56" android:pathData="M13.551,186.032l475.239,-138.465l12.588,43.204l-475.239,138.465z"/>
<path android:fillColor="#3f3d56" android:pathData="M70.329,384.481 L0.283,144.068a7,7 0,0 1,4.763 -8.679L468.764,0.281a7.006,7.006 0,0 1,8.679 4.762l62.056,212.989 -1.92,0.56L475.522,5.603a5.009,5.009 0,0 0,-6.199 -3.402L5.605,137.309a5,5 0,0 0,-3.402 6.199l70.047,240.413Z"/>
<path android:fillColor="#E0A240" android:pathData="M436.862,219.022a6.512,6.512 0,0 1,-6.243 -4.683l-11.749,-40.323a6.507,6.507 0,0 1,4.422 -8.059l40.323,-11.749a6.507,6.507 0,0 1,8.059 4.423L483.423,198.955a6.507,6.507 0,0 1,-4.422 8.059l-40.323,11.749A6.479,6.479 0,0 1,436.862 219.022Z"/>
<path android:fillColor="#E0A240" android:pathData="M69.246,144.812a11.691,11.691 0,0 0,-0.43 -1.22,12 12,0 0,0 -22.91,6.67 11.38,11.38 0,0 0,0.29 1.26,12.019 12.019,0 0,0 11.53,8.64 11.749,11.749 0,0 0,3.35 -0.48A12.013,12.013 0,0 0,69.246 144.812ZM60.516,157.762a10.013,10.013 0,0 1,-12.4 -6.8,11.435 11.435,0 0,1 -0.28,-1.26 9.997,9.997 0,0 1,19.04 -5.54,8.338 8.338,0 0,1 0.45,1.21A10.004,10.004 0,0 1,60.516 157.762Z"/>
<path android:fillColor="#E0A240" android:pathData="M39.814,153.382a11.002,11.002 0,0 1,4.208 -12.057,11 11,0 1,0 5.818,19.967A11.002,11.002 0,0 1,39.814 153.382Z"/>
<path android:fillColor="#ccc" android:pathData="M350.676,202.942a6.042,6.042 0,0 0,-7.45 -4.2L276.836,217.312l-7.15,2h44.9l7.15,-2 24.75,-6.92A6.049,6.049 0,0 0,350.676 202.942Z"/>
<path android:fillColor="#ccc" android:pathData="M303.706,189.072a6.045,6.045 0,0 0,-7.45 -4.19l-99.62,27.86a6.068,6.068 0,0 0,-4.37 6.57h25.79l7.16,-2 74.3,-20.78A6.055,6.055 0,0 0,303.706 189.072Z"/>
<path android:fillColor="#3f3d56" android:pathData="M560.17,217.31L77.17,217.31a7.008,7.008 0,0 0,-7 7v286a7.008,7.008 0,0 0,7 7L560.17,517.31a7.008,7.008 0,0 0,7 -7v-286A7.008,7.008 0,0 0,560.17 217.31ZM565.17,510.31a5.002,5.002 0,0 1,-5 5L77.17,515.31a5.002,5.002 0,0 1,-5 -5v-286a5.002,5.002 0,0 1,5 -5L560.17,219.31a5.002,5.002 0,0 1,5 5Z"/>
<path android:fillColor="#E0A240" android:pathData="M124.166,256.312a12,12 0,1 1,12 -12A12.014,12.014 0,0 1,124.166 256.312ZM124.166,234.312a10,10 0,1 0,10 10A10.011,10.011 0,0 0,124.166 234.312Z"/>
<path android:fillColor="#E0A240" android:pathData="M105.514,244.312a11.002,11.002 0,0 1,7.413 -10.399,11 11,0 1,0 0,20.797A11.002,11.002 0,0 1,105.514 244.312Z"/>
<path android:fillColor="#E0A240" android:pathData="M172.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,172.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M196.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,196.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M220.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,220.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M257.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,257.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M281.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,281.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M305.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,305.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M342.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,342.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M366.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,366.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M390.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,390.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M427.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,427.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M451.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,451.81 386.09Z"/>
<path android:fillColor="#E0A240" android:pathData="M475.81,386.09a9.01,9.01 0,0 1,-9 -9v-27a9,9 0,0 1,18 0v27A9.01,9.01 0,0 1,475.81 386.09Z"/>
<path android:fillColor="#e6e6e6" android:pathData="M233.828,486.257L104.388,486.257a6.047,6.047 0,1 1,0 -12.095L233.828,474.162a6.047,6.047 0,1 1,0 12.095Z"/>
<path android:fillColor="#e6e6e6" android:pathData="M192.328,460.257L145.888,460.257a6.047,6.047 0,1 1,0 -12.095h46.44a6.047,6.047 0,1 1,0 12.095Z"/>
<path android:fillColor="#3f3d56" android:pathData="M71.81,277.09h493v2h-493z"/>
</vector>
This diff is collapsed.
app/src/main/res/drawable/minus.png

2.87 KB | W: | H:

app/src/main/res/drawable/minus.png

2.47 KB | W: | H:

app/src/main/res/drawable/minus.png
app/src/main/res/drawable/minus.png
app/src/main/res/drawable/minus.png
app/src/main/res/drawable/minus.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable/plus.png

3.52 KB | W: | H:

app/src/main/res/drawable/plus.png

5.69 KB | W: | H:

app/src/main/res/drawable/plus.png
app/src/main/res/drawable/plus.png
app/src/main/res/drawable/plus.png
app/src/main/res/drawable/plus.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -16,9 +16,7 @@
<path
android:pathData="M12 0H66C72.6274 0 78 5.37258 78 12V28C78 34.6274 72.6274 40 66 40H12C5.37258 40 0 34.6274 0 28V12C0 5.37258 5.37258 0 12 0Z"
android:strokeWidth="4"
android:strokeColor="#4D000000"
android:fillColor="#72B5B7"
android:fillColor="@color/colorPrimary"
/>
</group>
......
......@@ -53,9 +53,9 @@
android:id="@+id/items"
android:layout_width="60dp"
android:layout_height="21dp"
android:layout_marginStart="50dp"
android:layout_marginEnd="5dp"
android:gravity="top"
android:text=""
tools:text="$342424"
app:layout_constraintBottom_toBottomOf="@+id/cart"
app:layout_constraintStart_toEndOf="@+id/cart"
app:layout_constraintEnd_toStartOf="@+id/amount"
......@@ -65,11 +65,11 @@
<View
android:id="@+id/amount"
android:layout_width="100dp"
android:layout_height="35dp"
android:layout_height="50dp"
android:background="@drawable/rectangle_1"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="65dp"
android:layout_marginEnd="40dp"
android:layout_marginTop="62dp"
android:layout_marginEnd="52dp"
app:layout_constraintStart_toEndOf="@+id/items"
app:layout_constraintTop_toTopOf="parent" />
......
......@@ -6,15 +6,25 @@
android:layout_height="match_parent"
android:paddingHorizontal="10dp"
tools:context=".activities.ForgetPassword">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvResetPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="25dp"
android:layout_marginStart="10dp"
android:layout_marginTop="50dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"
android:text="RESET PASSWORD"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilEmail"
app:boxBackgroundColor="@color/white"
android:textColorHint="@color/grey"
app:boxStrokeColor="@color/black"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvResetPassword"
android:layout_marginTop="20dp"
android:layout_marginStart="@dimen/space_default"
android:layout_marginEnd="@dimen/space_default"
......@@ -29,17 +39,65 @@
android:imeOptions="actionNext"
android:textSize="@dimen/text_default" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnResetPw"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilCrPw"
app:passwordToggleEnabled="true"
app:boxBackgroundColor="@color/white"
android:textColorHint="@color/grey"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tilEmail"
android:layout_marginTop="20dp"
android:layout_marginStart="@dimen/space_default"
android:layout_marginEnd="@dimen/space_default"
android:layout_marginBottom="@dimen/space_default">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/etCrPw"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Current Password"
android:imeOptions="actionNext"
android:inputType="text"
android:textSize="@dimen/text_default" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilNewPw"
app:passwordToggleEnabled="true"
app:boxBackgroundColor="@color/white"
android:textColorHint="@color/grey"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/tilCrPw"
android:layout_marginTop="20dp"
android:layout_marginStart="@dimen/space_default"
android:layout_marginEnd="@dimen/space_default"
android:layout_marginBottom="@dimen/space_default">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/etNewPw"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="New Password"
android:inputType="text"
android:imeOptions="actionNext"
android:textSize="@dimen/text_default" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnResetPw"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="4dp"
android:backgroundTint="@color/colorPrimary"
android:padding="@dimen/space_default"
android:text="RESET PASSWORD"
app:cornerRadius="@dimen/space_default"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tilEmail" />
app:layout_constraintTop_toBottomOf="@+id/tilNewPw"
app:layout_constraintVertical_bias="0.008" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -17,7 +17,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"
android:text="Login"/>
android:text="LOGIN"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilUsername"
......
......@@ -63,7 +63,7 @@
android:id="@+id/iv_cash"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:src="@drawable/wallet"
android:src="@drawable/ic_undraw_wallet"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
......@@ -109,7 +109,7 @@
android:id="@+id/iv_card"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:src="@drawable/credit_card"
android:src="@drawable/ic_undraw_credit_card"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
......
......@@ -10,12 +10,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="25dp"
android:layout_marginTop="80dp"
android:layout_marginTop="50dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"
android:text="Register Account"/>
android:text="REGISTER ACCOUNT"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilUsername"
......@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/tvRegister"
android:layout_marginTop="60dp"
android:layout_marginTop="40dp"
android:layout_marginStart="@dimen/space_default"
android:layout_marginEnd="@dimen/space_default"
android:layout_marginBottom="@dimen/space_default">
......@@ -98,11 +98,45 @@
android:imeOptions="actionNext"
android:textSize="@dimen/text_default" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvDescSk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:text="By registering you have agreed to the"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tilPassword" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvSK"
android:onClick="tvSK"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="75dp"
android:layout_marginTop="10dp"
android:text="Terms and Conditions"
android:textColor="@color/blue"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDescSk" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvYourCashier"
android:onClick="tvSignInHere"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginTop="10dp"
android:text="Your Cashier"
app:layout_constraintStart_toEndOf="@id/tvSK"
app:layout_constraintTop_toBottomOf="@id/tvDescSk"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btnRegister"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="15dp"
android:layout_marginStart="@dimen/space_default"
android:layout_marginEnd="@dimen/space_default"
android:backgroundTint="@color/colorPrimary"
......@@ -110,13 +144,13 @@
android:text="Register My Account"
app:cornerRadius="@dimen/space_default"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tilPassword" />
app:layout_constraintTop_toBottomOf="@+id/tvSK" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tvDontHaveAnAccount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="60dp"
android:layout_marginStart="75dp"
android:layout_marginTop="15dp"
android:text="@string/dont_have_an_account"
app:layout_constraintEnd_toStartOf="@id/tvSignInHere"
......
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activities.SkActivity">
<WebView
android:id="@+id/wbCompany"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:context=".materials.designs.webview.CompanyActivity" />
<ProgressBar
android:id="@+id/pbLoading"
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_centerInParent="true" />
</RelativeLayout>
\ No newline at end of file
......@@ -17,12 +17,4 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar
android:id="@+id/pbLoading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivLogo"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -68,7 +68,6 @@
tools:text="@{price}"
android:textAppearance="@style/some_id"
app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.106"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/burger_medi"
......@@ -81,6 +80,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:background="@drawable/rec_qty"
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="@+id/some_id"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
......@@ -89,22 +89,24 @@
app:layout_constraintTop_toTopOf="@+id/some_id"
app:layout_constraintVertical_bias="1.0" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_min"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="8dp"
android:background="@drawable/minus"
app:rippleColor="@color/black"
app:layout_constraintBottom_toBottomOf="@+id/v_add"
app:layout_constraintStart_toStartOf="@+id/v_add"
app:layout_constraintTop_toTopOf="@+id/v_add"
app:layout_constraintVertical_bias="0.566" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_add"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginEnd="8dp"
app:rippleColor="@color/black"
android:background="@drawable/plus"
app:layout_constraintBottom_toBottomOf="@+id/v_add"
app:layout_constraintEnd_toEndOf="@+id/v_add"
......
......@@ -13,7 +13,8 @@
<ImageView
android:layout_width="250dp"
android:layout_height="200dp" />
android:layout_height="200dp"
android:src="@drawable/yout_cashier"/>
<TextView
android:layout_width="wrap_content"
......
......@@ -6,4 +6,7 @@
<item
android:id="@+id/item_two"
android:title="Update / Delete Product"/>
<item
android:id="@+id/item_three"
android:title="Log Out"/>
</menu>
\ No newline at end of file
......@@ -27,7 +27,7 @@
<string name="payment_by_cash_was_successful">Payment by Cash was successful</string>
<string name="refund">Refund</string>
<string name="payment_status">Payment Status</string>
<string name="lupa_password">Forget Password?</string>
<string name="lupa_password">Forgot Password?</string>
<string name="dont_have_an_account">Dont have an Account?</string>
<string name="sign_up_here">Sign Up Here</string>
<string name="sign_in_here">Sign In Here</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment