diff --git a/README.md b/README.md index 12fa945..168ae53 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ [![Build Status](https://travis-ci.org/TonnyL/Espresso.svg?branch=master)](https://travis-ci.org/TonnyL/Espresso) -![icon](https://github.com/TonnyL/Espresso/blob/master/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png) +
+ logo +
Espresso is an express delivery tracking app designed with Material Design style, built on MVP(Model-View-Presenter) architecture with RxJava2, Retrofit2, Realm database and ZXing. diff --git a/art/logo.png b/art/logo.png new file mode 100755 index 0000000..d071c21 Binary files /dev/null and b/art/logo.png differ diff --git a/wear/.gitignore b/wear/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/wear/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/wear/build.gradle b/wear/build.gradle deleted file mode 100644 index 91c6957..0000000 --- a/wear/build.gradle +++ /dev/null @@ -1,25 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" - defaultConfig { - applicationId "io.github.marktony.espresso" - minSdkVersion 21 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" - } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.google.android.support:wearable:2.0.0' - compile 'com.google.android.gms:play-services-wearable:10.2.1' -} diff --git a/wear/proguard-rules.pro b/wear/proguard-rules.pro deleted file mode 100644 index c4ce4eb..0000000 --- a/wear/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/lizhaotailang/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml deleted file mode 100644 index 3572805..0000000 --- a/wear/src/main/AndroidManifest.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wear/src/main/java/io/github/marktony/espresso/MainActivity.java b/wear/src/main/java/io/github/marktony/espresso/MainActivity.java deleted file mode 100644 index 9ac4918..0000000 --- a/wear/src/main/java/io/github/marktony/espresso/MainActivity.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright(c) 2017 lizhaotailang - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.github.marktony.espresso; - -import android.app.Activity; -import android.os.Bundle; -import android.support.wearable.view.DefaultOffsettingHelper; -import android.support.wearable.view.WearableRecyclerView; - -import java.util.ArrayList; -import java.util.List; - -import io.github.marktony.espresso.data.Package; - -public class MainActivity extends Activity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - List list = new ArrayList<>(); - Package p1 = new Package(); - p1.setName("SF"); - list.add(p1); - - Package p2 = new Package(); - p2.setName("YUNDA"); - list.add(p2); - - WearableRecyclerView recyclerView = (WearableRecyclerView) findViewById(R.id.recyclerView); - recyclerView.setCenterEdgeItems(true); - - recyclerView.setOffsettingHelper(new DefaultOffsettingHelper()); - - PackageRecyclerAdapter adapter = new PackageRecyclerAdapter(list); - recyclerView.setAdapter(adapter); - - } -} diff --git a/wear/src/main/java/io/github/marktony/espresso/PackageRecyclerAdapter.java b/wear/src/main/java/io/github/marktony/espresso/PackageRecyclerAdapter.java deleted file mode 100644 index 1c18e36..0000000 --- a/wear/src/main/java/io/github/marktony/espresso/PackageRecyclerAdapter.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright(c) 2017 lizhaotailang - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.github.marktony.espresso; - -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.wearable.view.CircledImageView; -import android.support.wearable.view.WearableRecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import java.util.List; - -import io.github.marktony.espresso.data.Package; - -/** - * Created by lizhaotailang on 2017/3/31. - */ - -public class PackageRecyclerAdapter extends WearableRecyclerView.Adapter { - - private final List mList; - - public PackageRecyclerAdapter(@NonNull List list) { - mList = list; - } - - @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - return new ViewHolder(LayoutInflater.from(parent.getContext()) - .inflate(R.layout.item_package, parent, false)); - } - - @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { - Package p = mList.get(position); - ViewHolder vh = (ViewHolder) holder; - if (p != null) { - vh.textViewAvatar.setText(p.getName().substring(0, 1)); - vh.textViewName.setText(p.getName()); - if (p.getData() != null && p.getData().size() > 0) { - vh.textViewStatus.setText(p.getData().get(0).getContext()); - } else { - vh.textViewStatus.setText("Can not get the latest status."); - } - } - } - - @Override - public int getItemCount() { - return mList.size(); - } - - public class ViewHolder extends WearableRecyclerView.ViewHolder { - - private TextView textViewAvatar; - private TextView textViewName; - private TextView textViewStatus; - private CircledImageView avatar; - - public ViewHolder(View itemView) { - super(itemView); - textViewAvatar = (TextView) itemView.findViewById(R.id.textViewAvatar); - textViewName = (TextView) itemView.findViewById(R.id.textViewName); - textViewStatus = (TextView) itemView.findViewById(R.id.textViewStatus); - avatar = (CircledImageView) itemView.findViewById(R.id.avatar); - } - } - -} diff --git a/wear/src/main/java/io/github/marktony/espresso/data/Package.java b/wear/src/main/java/io/github/marktony/espresso/data/Package.java deleted file mode 100644 index 2f7b4b9..0000000 --- a/wear/src/main/java/io/github/marktony/espresso/data/Package.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright(c) 2017 lizhaotailang - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.github.marktony.espresso.data; - -import java.util.List; - -/** - * Created by lizhaotailang on 2017/2/10. - * Immutable model class for a Package. - * 示例JSON格式 - * JSON format sample - * { - * "message":"ok", - * "nu":"47258833029", - * "ischeck":"1", - * "condition":"F00", - * "com":"jd", - * "status":"200", - * "state":"3", - * "data": - * [ - * { - * "time":"2016-12-13 21:35:51", - * "ftime":"2016-12-13 21:35:51", - * "context":"货物已完成配送，感谢您选择京东配送", - * "location":"" - * }, - * { - * "time":"2016-12-13 11:01:55", - * "ftime":"2016-12-13 11:01:55", - * "context":"配送员开始配送，请您准备收货，配送员，朱小宝，手机号，13060495388或0917-2622505", - * "location":"" - * }, - * { - * "time":"2016-12-13 10:06:25", - * "ftime":"2016-12-13 10:06:25", - * "context":"货物已分配，等待配送", - * "location":"" - * }, - * { - * "time":"2016-12-13 10:06:22", - * "ftime":"2016-12-13 10:06:22", - * "context":"货物已到达【宝鸡北环站】","location":"" - * }, - * ... - * ] - * } - */ - -public class Package { - - public static final int STATUS_FAILED = 2, STATUS_NORMAL = 0, - STATUS_ON_THE_WAY = 5, STATUS_DELIVERED = 3, - STATUS_RETURNED = 4, STATUS_RETURNING = 6, - STATUS_OTHER = 1; - - private String message; - - private String number; - - private String isCheck; - - private String condition; - - private String company; - - private String status; - - private String state; - - private List data; - - - private boolean pushable = false; - - private boolean readable = false; - - private String name; - - private String companyChineseName; - - private int colorAvatar; - - private long timestamp; - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getNumber() { - return number; - } - - public void setNumber(String number) { - this.number = number; - } - - public String getIsCheck() { - return isCheck; - } - - public void setIsCheck(String isCheck) { - this.isCheck = isCheck; - } - - public String getCondition() { - return condition; - } - - public void setCondition(String condition) { - this.condition = condition; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public List getData() { - return data; - } - - public void setData(List data) { - this.data = data; - } - - public boolean isReadable() { - return readable; - } - - public void setReadable(boolean readable) { - this.readable = readable; - } - - public String getCompany() { - return company; - } - - public void setCompany(String company) { - this.company = company; - } - - public boolean isPushable() { - return pushable; - } - - public void setPushable(boolean pushable) { - this.pushable = pushable; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCompanyChineseName() { - return companyChineseName; - } - - public void setCompanyChineseName(String companyChineseName) { - this.companyChineseName = companyChineseName; - } - - public void setColorAvatar(int colorAvatar) { - this.colorAvatar = colorAvatar; - } - - public int getColorAvatar() { - return colorAvatar; - } - - public void setTimestamp(long timestamp) { - this.timestamp = timestamp; - } - - public long getTimestamp() { - return timestamp; - } - -} diff --git a/wear/src/main/java/io/github/marktony/espresso/data/PackageStatus.java b/wear/src/main/java/io/github/marktony/espresso/data/PackageStatus.java deleted file mode 100644 index d8027d3..0000000 --- a/wear/src/main/java/io/github/marktony/espresso/data/PackageStatus.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright(c) 2017 lizhaotailang - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package io.github.marktony.espresso.data; - -/** - * Created by lizhaotailang on 2017/2/24. - * Immutable model class for a PackageStatus. - */ -public class PackageStatus { - - private String time; - - private String ftime; - - private String context; - - private String location; - - private String phone; - - public String getTime() { - return time; - } - - public void setTime(String time) { - this.time = time; - } - - public String getFtime() { - return ftime; - } - - public void setFtime(String ftime) { - this.ftime = ftime; - } - - public String getContext() { - return context; - } - - public void setContext(String context) { - this.context = context; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public void setPhone(String phone) { - this.phone = phone; - } - - public String getPhone() { - return phone; - } -} diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml deleted file mode 100644 index 739dbc8..0000000 --- a/wear/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - diff --git a/wear/src/main/res/layout/item_package.xml b/wear/src/main/res/layout/item_package.xml deleted file mode 100644 index 1941576..0000000 --- a/wear/src/main/res/layout/item_package.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100755 index 8d3d04d..0000000 Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher.png b/wear/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100755 index 381ddc9..0000000 Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100755 index b5330b3..0000000 Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100755 index e61488b..0000000 Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml deleted file mode 100644 index be29994..0000000 --- a/wear/src/main/res/values/dimens.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - 8dp - 8dp - - \ No newline at end of file diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml deleted file mode 100644 index 6039bb4..0000000 --- a/wear/src/main/res/values/strings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - Espresso - Hello Round World! - Hello Square World! -