diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml index 902225d5d..109d31630 100644 --- a/OneToOne/src/main/AndroidManifest.xml +++ b/OneToOne/src/main/AndroidManifest.xml @@ -141,6 +141,12 @@ + + @@ -149,10 +155,10 @@ android:windowSoftInputMode="stateHidden|adjustResize" /> + android:windowSoftInputMode="stateHidden|adjustResize" /> + android:windowSoftInputMode="stateHidden|adjustResize" /> >() { + @Override + public void onSuccess(List data) { + exchangeAdapter.addData(data); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java new file mode 100644 index 000000000..3f35eddb0 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MyArnActivity.java @@ -0,0 +1,90 @@ +package com.shayu.onetoone.activity; + + +import android.os.Bundle; +import android.widget.TextView; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.shayu.onetoone.R; +import com.shayu.onetoone.adapter.MyArnAdapter; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.bean.FriendAppMoneySumModel; +import com.shayu.onetoone.manager.OTONetManager; +import com.shayu.onetoone.manager.RouteManager; +import com.yunbao.common.http.base.HttpCallback; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.views.weight.ViewClicksAntiShake; + +import java.util.List; + + +@Route(path = RouteManager.ACTIVITY_MY_ARN) +public class MyArnActivity extends AbsOTOActivity { + private TextView todayEarnings, cumulativeIncome; + + private MyArnAdapter myArnAdapter; + private RecyclerView myArnList; + + @Override + protected int getLayoutId() { + return R.layout.activity_my_arnings; + + } + + @Override + protected void main(Bundle savedInstanceState) { + initView(); + initData(); + } + + private void initView() { + todayEarnings = findViewById(R.id.today_earnings); + cumulativeIncome = findViewById(R.id.cumulative_income); + myArnList = findViewById(R.id.my_arn_list); + myArnList.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)); + myArnAdapter = new MyArnAdapter(); + myArnList.setAdapter(myArnAdapter); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.my_arn_back), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + finish(); + } + }); + ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.diamond_star_coins), new ViewClicksAntiShake.ViewClicksCallBack() { + @Override + public void onViewClicks() { + RouteManager.forwardActivity(RouteManager.ACTIVITY_DIAMOND_EXCHANGE); + } + }); + + } + + private void initData() { + OTONetManager.getInstance(mContext).getFriendAppMoneySum(new HttpCallback() { + @Override + public void onSuccess(FriendAppMoneySumModel data) { + todayEarnings.setText(data.getToday()); + cumulativeIncome.setText(data.getSum()); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + OTONetManager.getInstance(mContext).getFriendAppMoneyLogModel("3", "1", new HttpCallback>() { + @Override + public void onSuccess(List data) { + myArnAdapter.showData(data); + } + + @Override + public void onError(String error) { + ToastUtil.show(error); + } + }); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java index 6a37d68e6..28b258c61 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java @@ -3,7 +3,6 @@ package com.shayu.onetoone.activity.fragments; import android.content.ClipboardManager; import android.content.Context; -import android.content.Intent; import android.graphics.Outline; import android.os.Bundle; import android.text.TextUtils; @@ -39,7 +38,6 @@ import com.shayu.onetoone.view.CustomMyViewHolder; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.CommonAppContext; import com.yunbao.common.Constants; -import com.yunbao.common.HtmlConfig; import com.yunbao.common.activity.WebViewActivity; import com.yunbao.common.bean.GoogleBean; import com.yunbao.common.bean.LevelBean; @@ -446,8 +444,9 @@ public class MyFragment extends BaseFragment implements OnItemClickListener exchangeModels = new ArrayList<>(); + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View bodyView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_diamond_exchange_item_holder, parent, false); + return new DiamondExchangeViewHolder(bodyView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + DiamondExchangeViewHolder exchangeViewHolder = (DiamondExchangeViewHolder) holder; + exchangeViewHolder.showData(exchangeModels.get(position)); + } + + @Override + public int getItemCount() { + return exchangeModels.size(); + } + + public void addData(List mExchangeModels) { + exchangeModels.clear(); + exchangeModels.addAll(mExchangeModels); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java new file mode 100644 index 000000000..f11933518 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/MyArnAdapter.java @@ -0,0 +1,43 @@ +package com.shayu.onetoone.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.shayu.onetoone.R; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.view.MyArnViewHolder; + +import java.util.ArrayList; +import java.util.List; + +public class MyArnAdapter extends RecyclerView.Adapter { + private List friendAppMoneyLogModels = new ArrayList<>(); + + @NonNull + @Override + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View bodyView = LayoutInflater.from(parent.getContext()).inflate(R.layout.view_my_arn_item_holder, parent, false); + return new MyArnViewHolder(bodyView); + } + + @Override + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { + MyArnViewHolder arnViewHolder = (MyArnViewHolder) holder; + arnViewHolder.setData(friendAppMoneyLogModels.get(position)); + } + + @Override + public int getItemCount() { + return friendAppMoneyLogModels.size(); + } + + public void showData(List mFriendAppMoneyLogModels) { + friendAppMoneyLogModels.clear(); + friendAppMoneyLogModels.addAll(mFriendAppMoneyLogModels); + notifyDataSetChanged(); + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java new file mode 100644 index 000000000..8fc31278a --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/ExchangeModel.java @@ -0,0 +1,52 @@ +package com.shayu.onetoone.bean; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +public class ExchangeModel extends BaseModel { + + @SerializedName("top") + private String top; + @SerializedName("name") + private String name; + @SerializedName("title") + private String title; + @SerializedName("num") + private int num; + + public String getTop() { + return top; + } + + public ExchangeModel setTop(String top) { + this.top = top; + return this; + } + + public String getName() { + return name; + } + + public ExchangeModel setName(String name) { + this.name = name; + return this; + } + + public String getTitle() { + return title; + } + + public ExchangeModel setTitle(String title) { + this.title = title; + return this; + } + + public int getNum() { + return num; + } + + public ExchangeModel setNum(int num) { + this.num = num; + return this; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java new file mode 100644 index 000000000..7626c2548 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneyLogModel.java @@ -0,0 +1,140 @@ +package com.shayu.onetoone.bean; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +public class FriendAppMoneyLogModel extends BaseModel { + + @SerializedName("id") + private String id; + @SerializedName("uid") + private String uid; + @SerializedName("income") + private String income; + @SerializedName("before_money") + private String beforeMoney; + @SerializedName("money") + private String money; + @SerializedName("after_money") + private String afterMoney; + @SerializedName("memo") + private String memo; + @SerializedName("type") + private String type; + @SerializedName("currency_type") + private String currencyType; + @SerializedName("service_id") + private String serviceId; + @SerializedName("create_time") + private String createTime; + @SerializedName("tuid") + private String tuid; + + public String getId() { + return id; + } + + public FriendAppMoneyLogModel setId(String id) { + this.id = id; + return this; + } + + public String getUid() { + return uid; + } + + public FriendAppMoneyLogModel setUid(String uid) { + this.uid = uid; + return this; + } + + public String getIncome() { + return income; + } + + public FriendAppMoneyLogModel setIncome(String income) { + this.income = income; + return this; + } + + public String getBeforeMoney() { + return beforeMoney; + } + + public FriendAppMoneyLogModel setBeforeMoney(String beforeMoney) { + this.beforeMoney = beforeMoney; + return this; + } + + public String getMoney() { + return money; + } + + public FriendAppMoneyLogModel setMoney(String money) { + this.money = money; + return this; + } + + public String getAfterMoney() { + return afterMoney; + } + + public FriendAppMoneyLogModel setAfterMoney(String afterMoney) { + this.afterMoney = afterMoney; + return this; + } + + public String getMemo() { + return memo; + } + + public FriendAppMoneyLogModel setMemo(String memo) { + this.memo = memo; + return this; + } + + public String getType() { + return type; + } + + public FriendAppMoneyLogModel setType(String type) { + this.type = type; + return this; + } + + public String getCurrencyType() { + return currencyType; + } + + public FriendAppMoneyLogModel setCurrencyType(String currencyType) { + this.currencyType = currencyType; + return this; + } + + public String getServiceId() { + return serviceId; + } + + public FriendAppMoneyLogModel setServiceId(String serviceId) { + this.serviceId = serviceId; + return this; + } + + public String getCreateTime() { + return createTime; + } + + public FriendAppMoneyLogModel setCreateTime(String createTime) { + this.createTime = createTime; + return this; + } + + public String getTuid() { + return tuid; + } + + public FriendAppMoneyLogModel setTuid(String tuid) { + this.tuid = tuid; + return this; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java new file mode 100644 index 000000000..1016cd6e6 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/FriendAppMoneySumModel.java @@ -0,0 +1,30 @@ +package com.shayu.onetoone.bean; + +import com.google.gson.annotations.SerializedName; +import com.yunbao.common.bean.BaseModel; + +public class FriendAppMoneySumModel extends BaseModel { + + @SerializedName("today") + private String today; + @SerializedName("sum") + private String sum; + + public String getToday() { + return today; + } + + public FriendAppMoneySumModel setToday(String today) { + this.today = today; + return this; + } + + public String getSum() { + return sum; + } + + public FriendAppMoneySumModel setSum(String sum) { + this.sum = sum; + return this; + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java index 76f1f77a8..8c912cbcd 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/OTONetManager.java @@ -6,8 +6,10 @@ import android.util.Log; import com.alibaba.fastjson.JSONObject; import com.shayu.onetoone.bean.AvatarBean; -import com.shayu.onetoone.bean.CustomBean; +import com.shayu.onetoone.bean.ExchangeModel; import com.shayu.onetoone.bean.FollowBean; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.bean.FriendAppMoneySumModel; import com.shayu.onetoone.bean.GiftBean; import com.shayu.onetoone.bean.GreetBean; import com.shayu.onetoone.bean.HomeItemBean; @@ -30,11 +32,8 @@ import com.yunbao.common.http.ResponseModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.manager.IMLoginManager; import com.yunbao.common.utils.MD5Util; -import com.yunbao.faceunity.entity.PropBean; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -45,7 +44,6 @@ import io.rong.imlib.model.UserInfo; import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; -import retrofit2.http.Query; /** * 网络管理类 使用参考{@link com.yunbao.common.http.live.LiveNetManager} @@ -848,5 +846,84 @@ public class OTONetManager { }).isDisposed(); } + /** + * @param currencyType 1星币 2砖石 3社交新币种 + * @param income 1收入 2支出 + */ + public void getFriendAppMoneyLogModel(String currencyType, String income, HttpCallback> callback) { + API.get().otoApi(mContext). + getFriendAppMoneyLogModel(currencyType, income) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>>() { + @Override + public void accept(ResponseModel> listResponseModel) throws Exception { + if (listResponseModel.getData().getCode() == 0) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } else { + callback.onError(listResponseModel.getData().getMsg()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + public void getFriendAppMoneySum(HttpCallback callback) { + API.get().otoApi(mContext). + getFriendAppMoneySum() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>() { + @Override + public void accept(ResponseModel friendAppMoneySumModelResponseModel) throws Exception { + if (friendAppMoneySumModelResponseModel.getData().getCode() == 0) { + callback.onSuccess(friendAppMoneySumModelResponseModel.getData().getInfo()); + } else { + callback.onError(friendAppMoneySumModelResponseModel.getData().getMsg()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } + + /** + * + * @param type coin砖石 yuanbao 星币 + * @param callback + */ + public void getExchangeList(String type, HttpCallback> callback) { + API.get().otoApi(mContext). + getExchangeList(type) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Consumer>>() { + @Override + public void accept(ResponseModel> listResponseModel) throws Exception { + if (listResponseModel.getData().getCode() == 0) { + callback.onSuccess(listResponseModel.getData().getInfo()); + } else { + callback.onError(listResponseModel.getData().getMsg()); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) throws Exception { + if (callback != null) { + callback.onError(mContext.getString(com.yunbao.common.R.string.net_error)); + } + } + }).isDisposed(); + } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java b/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java index 965efb403..9bbddd3a9 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/manager/RouteManager.java @@ -15,6 +15,8 @@ public class RouteManager { public static final String ACTIVITY_LOGIN = "/activity/LoginActivity"; public static final String ACTIVITY_WEB_VIEW = "/activity/WebViewActivity"; public static final String ACTIVITY_HOME_RANK = "/activity/HomepageRankingActivity"; + public static final String ACTIVITY_MY_ARN = "/activity/MyAarningsActivity"; + public static final String ACTIVITY_DIAMOND_EXCHANGE = "/activity/DiamondExchangeActivity"; public static final String ACTIVITY_HOME_SEARCH = "/activity/HomeSearchActivity"; public static final String ACTIVITY_HOME_SCREEN = "/activity/HomeScreenActivity"; public static final String ACTIVITY_CALL_VIDEO = "/activity/CallVideoActivity"; diff --git a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java index a540fa5d8..8e0354268 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/network/OneToOneApi.java @@ -1,8 +1,10 @@ package com.shayu.onetoone.network; import com.shayu.onetoone.bean.AvatarBean; -import com.shayu.onetoone.bean.CustomBean; +import com.shayu.onetoone.bean.ExchangeModel; import com.shayu.onetoone.bean.FollowBean; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; +import com.shayu.onetoone.bean.FriendAppMoneySumModel; import com.shayu.onetoone.bean.GiftBean; import com.shayu.onetoone.bean.GreetBean; import com.shayu.onetoone.bean.HomeItemBean; @@ -16,7 +18,6 @@ import com.shayu.onetoone.bean.SystemMessageBean; import com.shayu.onetoone.bean.TargetUserInfoBean; import com.shayu.onetoone.bean.UserBean; import com.yunbao.common.bean.BaseModel; -import com.yunbao.common.bean.HttpCallbackModel; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.bean.UserAvatarSelectBean; import com.yunbao.common.http.ResponseModel; @@ -212,6 +213,30 @@ public interface OneToOneApi { @Field("labels") String avatar ); + /** + * 获取记录 + */ + @GET("/api/public/?service=Friendappmoney.logs") + Observable>> getFriendAppMoneyLogModel( + @Query("currency_type") String currencyType, + @Query("income") String income + ); + + /** + * 获取记录 统计 + */ + @GET("/api/public/?service=Friendappmoney.sum") + Observable> getFriendAppMoneySum( + + ); + + /** + * 兑换表 + */ + @GET("/api/public/?service=Friendappmoney.exchangeList") + Observable>> getExchangeList( + @Query("type") String type + ); } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java b/OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java new file mode 100644 index 000000000..984ca3020 --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/view/DiamondExchangeViewHolder.java @@ -0,0 +1,28 @@ +package com.shayu.onetoone.view; + +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.shayu.onetoone.R; +import com.shayu.onetoone.bean.ExchangeModel; + +public class DiamondExchangeViewHolder extends RecyclerView.ViewHolder { + private LinearLayout diamondExchangeBtn; + private TextView fullConversion, coins, goldCoin; + + public DiamondExchangeViewHolder(@NonNull View itemView) { + super(itemView); + diamondExchangeBtn = itemView.findViewById(R.id.diamond_exchange_btn); + fullConversion = itemView.findViewById(R.id.full_conversion); + coins = itemView.findViewById(R.id.coins); + goldCoin = itemView.findViewById(R.id.gold_coin); + } + + public void showData(ExchangeModel model) { + + } +} diff --git a/OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java b/OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java new file mode 100644 index 000000000..6f8bf550b --- /dev/null +++ b/OneToOne/src/main/java/com/shayu/onetoone/view/MyArnViewHolder.java @@ -0,0 +1,41 @@ +package com.shayu.onetoone.view; + +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.shayu.onetoone.R; +import com.shayu.onetoone.bean.FriendAppMoneyLogModel; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class MyArnViewHolder extends RecyclerView.ViewHolder { + private TextView memoName, createTime, money; + + public MyArnViewHolder(@NonNull View itemView) { + super(itemView); + memoName = itemView.findViewById(R.id.memo_name); + createTime = itemView.findViewById(R.id.create_time); + money = itemView.findViewById(R.id.money); + } + + public void setData(FriendAppMoneyLogModel model) { + StringBuilder builder = new StringBuilder(); + builder.append("+") + .append(model.getMoney()); + memoName.setText(model.getMemo()); + money.setText(builder.toString()); + createTime.setText(getDateStr(new Date(Long.parseLong(model.getCreateTime())*1000), null)); + } + + public String getDateStr(Date date, String format) { + if (format == null || format.isEmpty()) { + format = "yyyy-MM-dd HH:mm"; + } + SimpleDateFormat formatter = new SimpleDateFormat(format); + return formatter.format(date); + } +} diff --git a/OneToOne/src/main/res/drawable/background_diamond_exchange_select.png b/OneToOne/src/main/res/drawable/background_diamond_exchange_select.png new file mode 100644 index 000000000..827917127 Binary files /dev/null and b/OneToOne/src/main/res/drawable/background_diamond_exchange_select.png differ diff --git a/OneToOne/src/main/res/drawable/background_diamond_exchange_unselect.png b/OneToOne/src/main/res/drawable/background_diamond_exchange_unselect.png new file mode 100644 index 000000000..42c03a7ed Binary files /dev/null and b/OneToOne/src/main/res/drawable/background_diamond_exchange_unselect.png differ diff --git a/OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml b/OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml new file mode 100644 index 000000000..a6041bb8f --- /dev/null +++ b/OneToOne/src/main/res/drawable/bg_diamond_exchange_btn.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/button_diamond_exchange.xml b/OneToOne/src/main/res/drawable/button_diamond_exchange.xml new file mode 100644 index 000000000..457c75588 --- /dev/null +++ b/OneToOne/src/main/res/drawable/button_diamond_exchange.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/button_my_arn_exchange.xml b/OneToOne/src/main/res/drawable/button_my_arn_exchange.xml new file mode 100644 index 000000000..191d62ce4 --- /dev/null +++ b/OneToOne/src/main/res/drawable/button_my_arn_exchange.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml b/OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml new file mode 100644 index 000000000..2c7120916 --- /dev/null +++ b/OneToOne/src/main/res/drawable/button_my_arn_exchange2.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/drawable/input_diamond_exchange.xml b/OneToOne/src/main/res/drawable/input_diamond_exchange.xml new file mode 100644 index 000000000..f274c054c --- /dev/null +++ b/OneToOne/src/main/res/drawable/input_diamond_exchange.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OneToOne/src/main/res/layout/activity_diamond_exchange.xml b/OneToOne/src/main/res/layout/activity_diamond_exchange.xml new file mode 100644 index 000000000..8ad6e253d --- /dev/null +++ b/OneToOne/src/main/res/layout/activity_diamond_exchange.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +