Skip to content

D
doodle

carrotech / doodle
与 Fork 源项目一致

从无法访问的项目Fork

通知 5
Star 1
Fork 0
D
doodle

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 abec1ae3 编写于 作者: H huangziwei
浏览文件
操作

update Androids version to 1.3

上级 a89fa0ff
隐藏空白更改
内联 并排
Showing with 55 addition and 59 deletion
doodle/build.gradle
浏览文件 @ abec1ae3
......@@ -19,5 +19,5 @@ android {
dependencies {
// https://github.com/1993hzw/Androids
api 'com.github.1993hzw:Androids:1.2.3'
api 'com.github.1993hzw:Androids:1.3'
}
\ No newline at end of file
doodle/src/main/java/cn/hzw/doodle/DoodleActivity.java
浏览文件 @ abec1ae3
......@@ -627,17 +627,18 @@ public class DoodleActivity extends Activity {
}
if (!(DoodleParams.getDialogInterceptor() != null
&& DoodleParams.getDialogInterceptor().onShow(DoodleActivity.this, mDoodle, DoodleParams.DialogType.SAVE))) {
DialogController.showEnterCancelDialog(DoodleActivity.this, getString(R.string.doodle_saving_picture), null, new View.OnClickListener() {
@Override
public void onClick(View v) {
mDoodle.save();
}
}, new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
DialogController.showMsgDialog(DoodleActivity.this, getString(R.string.doodle_saving_picture), null, getString(R.string.doodle_cancel),
getString(R.string.doodle_save), new View.OnClickListener() {
@Override
public void onClick(View v) {
mDoodle.save();
}
}, new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
} else if (v.getId() == R.id.doodle_btn_rotate) {
// 旋转图片
......
doodle/src/main/java/cn/hzw/doodle/dialog/DialogController.java
浏览文件 @ abec1ae3
......@@ -14,7 +14,6 @@ import android.widget.TextView;
import java.util.List;
import cn.forward.androids.base.InjectionLayoutInflater;
import cn.forward.androids.utils.StatusBarUtil;
import cn.hzw.doodle.R;
import cn.hzw.doodle.imagepicker.ImageSelectorView;
......@@ -45,26 +44,8 @@ public class DialogController {
dialog.setCanceledOnTouchOutside(true);
final Dialog finalDialog = dialog;
View.OnClickListener onClickListener = new View.OnClickListener() {
public void onClick(View v) {
if (v.getId() == R.id.dialog_bg) {
finalDialog.dismiss();
} else if (v.getId() == R.id.dialog_enter_btn_02) {
finalDialog.dismiss();
if (enterClick != null) {
enterClick.onClick(v);
}
} else if (v.getId() == R.id.dialog_enter_btn_01) {
finalDialog.dismiss();
if (cancelClick != null) {
cancelClick.onClick(v);
}
}
}
};
View view = InjectionLayoutInflater.from(activity).inflate(R.layout.doodle_dialog, null,
InjectionLayoutInflater.getViewOnClickListenerInjector(onClickListener));
View view = View.inflate(activity, R.layout.doodle_dialog, null);
dialog.setContentView(view);
if (TextUtils.isEmpty(title)) {
......@@ -96,6 +77,27 @@ public class DialogController {
textView.setText(btn02);
}
View.OnClickListener onClickListener = new View.OnClickListener() {
public void onClick(View v) {
if (v.getId() == R.id.dialog_bg) {
finalDialog.dismiss();
} else if (v.getId() == R.id.dialog_enter_btn_02) {
finalDialog.dismiss();
if (enterClick != null) {
enterClick.onClick(v);
}
} else if (v.getId() == R.id.dialog_enter_btn_01) {
finalDialog.dismiss();
if (cancelClick != null) {
cancelClick.onClick(v);
}
}
}
};
view.findViewById(R.id.dialog_bg).setOnClickListener(onClickListener);
view.findViewById(R.id.dialog_enter_btn_01).setOnClickListener(onClickListener);
view.findViewById(R.id.dialog_enter_btn_02).setOnClickListener(onClickListener);
return dialog;
}
......
doodle/src/main/res/layout/doodle_color_selector_dialog.xml
浏览文件 @ abec1ae3
......@@ -137,7 +137,6 @@
android:text="@string/doodle_cancel"
android:textColor="#bebebe"
android:textSize="20dp"
app:injectListener="true"
app:stv_text_color_pressed="#88bebebe"/>
<cn.forward.androids.views.STextView
......@@ -151,7 +150,6 @@
android:text="@string/doodle_enter"
android:textColor="#11cfff"
android:textSize="20dp"
app:injectListener="true"
app:stv_text_color_pressed="#8811cfff"/>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
doodle/src/main/res/layout/doodle_dialog.xml
浏览文件 @ abec1ae3
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/dialog_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#88000000"
android:fitsSystemWindows="true"
android:paddingBottom="10dp"
android:paddingTop="10dp"
app:injectListener="true">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/dialog_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#88000000"
android:fitsSystemWindows="true"
android:paddingTop="10dp"
android:paddingBottom="10dp">
<cn.forward.androids.views.SLinearLayout
android:layout_width="280dp"
......@@ -18,8 +17,8 @@
android:clickable="true"
android:minWidth="280dp"
android:orientation="vertical"
android:paddingBottom="3.5dp"
android:paddingTop="0dp"
android:paddingBottom="3.5dp"
app:sel_background="#ffffff"
app:sel_background_corners="5dp">
......@@ -30,21 +29,19 @@
android:layout_gravity="center_horizontal"
android:ellipsize="middle"
android:gravity="center"
android:maxLines="1"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:singleLine="true"
android:text=""
android:textColor="#2b2b2b"
android:textSize="20dp"
android:textStyle="bold"/>
android:textStyle="bold" />
<FrameLayout
android:id="@+id/dialog_list_title_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#dfdfdf"
/>
android:background="#dfdfdf" />
<TextView
android:id="@+id/dialog_enter_msg"
......@@ -55,15 +52,13 @@
android:minWidth="50dp"
android:padding="20dp"
android:textColor="#2b2b2b"
android:textSize="16dp"
/>
android:textSize="16dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
android:orientation="horizontal">
<cn.forward.androids.views.STextView
android:id="@+id/dialog_enter_btn_01"
......@@ -71,27 +66,25 @@
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:background="#00000000"
android:gravity="center"
android:text=""
android:textColor="#bebebe"
android:background="#00000000"
android:textSize="20dp"
app:injectListener="true"
app:stv_text_color_pressed="#88bebebe"/>
app:stv_text_color_pressed="#88bebebe" />
<cn.forward.androids.views.STextView
android:background="#00000000"
android:id="@+id/dialog_enter_btn_02"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:layout_weight="1"
android:background="#00000000"
android:gravity="center"
android:text=""
android:textColor="#11cfff"
android:textSize="20dp"
app:injectListener="true"
app:stv_text_color_pressed="#8811cfff"/>
app:stv_text_color_pressed="#8811cfff" />
</LinearLayout>
</cn.forward.androids.views.SLinearLayout>
</FrameLayout>
\ No newline at end of file
doodle/src/main/res/values-en/strings.xml
浏览文件 @ abec1ae3
......@@ -3,9 +3,10 @@
<string name="doodle_clear_screen">Clear</string>
<string name="doodle_cant_undo_after_clearing">Are you sure to clear all?</string>
<string name="doodle_saving_picture">Save before exit?</string>
<string name="doodle_saving_picture">Save all before exiting</string>
<string name="doodle_enter">Enter</string>
<string name="doodle_cancel">Cancel</string>
<string name="doodle_save">Save</string>
<string name="doodle_edit">Edit</string>
<string name="doodle_remove">Delete</string>
......
doodle/src/main/res/values/strings.xml
浏览文件 @ abec1ae3
......@@ -6,6 +6,7 @@
<string name="doodle_saving_picture">保存图片</string>
<string name="doodle_enter">确定</string>
<string name="doodle_cancel">取消</string>
<string name="doodle_save">保存</string>
<string name="doodle_edit">编辑</string>
<string name="doodle_remove">移除</string>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或