Commit e54c424ab126459baa3a0de75830591a9d62e614
1 parent
c55b3db1a7
Exists in
master
完善对话框
Showing
9 changed files
with
63 additions
and
37 deletions
Show diff stats
PersonalCenter/.idea/gradle.xml
| ... | ... | @@ -3,8 +3,9 @@ |
| 3 | 3 | <component name="GradleSettings"> |
| 4 | 4 | <option name="linkedExternalProjectsSettings"> |
| 5 | 5 | <GradleProjectSettings> |
| 6 | - <option name="distributionType" value="DEFAULT_WRAPPED" /> | |
| 6 | + <option name="distributionType" value="LOCAL" /> | |
| 7 | 7 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> |
| 8 | + <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" /> | |
| 8 | 9 | <option name="modules"> |
| 9 | 10 | <set> |
| 10 | 11 | <option value="$PROJECT_DIR$" /> | ... | ... |
PersonalCenter/.idea/misc.xml
| ... | ... | @@ -27,6 +27,46 @@ |
| 27 | 27 | </value> |
| 28 | 28 | </option> |
| 29 | 29 | </component> |
| 30 | + <component name="ProjectInspectionProfilesVisibleTreeState"> | |
| 31 | + <entry key="Project Default"> | |
| 32 | + <profile-state> | |
| 33 | + <expanded-state> | |
| 34 | + <State> | |
| 35 | + <id /> | |
| 36 | + </State> | |
| 37 | + <State> | |
| 38 | + <id>Class structureJava</id> | |
| 39 | + </State> | |
| 40 | + <State> | |
| 41 | + <id>Code maturity issuesJava</id> | |
| 42 | + </State> | |
| 43 | + <State> | |
| 44 | + <id>Java</id> | |
| 45 | + </State> | |
| 46 | + <State> | |
| 47 | + <id>Java language level migration aidsJava</id> | |
| 48 | + </State> | |
| 49 | + <State> | |
| 50 | + <id>Javadoc issuesJava</id> | |
| 51 | + </State> | |
| 52 | + <State> | |
| 53 | + <id>Performance issuesJava</id> | |
| 54 | + </State> | |
| 55 | + <State> | |
| 56 | + <id>TestNGJava</id> | |
| 57 | + </State> | |
| 58 | + <State> | |
| 59 | + <id>Threading issuesJava</id> | |
| 60 | + </State> | |
| 61 | + </expanded-state> | |
| 62 | + <selected-state> | |
| 63 | + <State> | |
| 64 | + <id>Android</id> | |
| 65 | + </State> | |
| 66 | + </selected-state> | |
| 67 | + </profile-state> | |
| 68 | + </entry> | |
| 69 | + </component> | |
| 30 | 70 | <component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
| 31 | 71 | <OptionsSetting value="true" id="Add" /> |
| 32 | 72 | <OptionsSetting value="true" id="Remove" /> |
| ... | ... | @@ -37,26 +77,10 @@ |
| 37 | 77 | <ConfirmationsSetting value="0" id="Add" /> |
| 38 | 78 | <ConfirmationsSetting value="0" id="Remove" /> |
| 39 | 79 | </component> |
| 40 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 80 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 41 | 81 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | 82 | </component> |
| 43 | 83 | <component name="ProjectType"> |
| 44 | 84 | <option name="id" value="Android" /> |
| 45 | 85 | </component> |
| 46 | - <component name="masterDetails"> | |
| 47 | - <states> | |
| 48 | - <state key="ProjectJDKs.UI"> | |
| 49 | - <settings> | |
| 50 | - <last-edited>1.8</last-edited> | |
| 51 | - <splitter-proportions> | |
| 52 | - <option name="proportions"> | |
| 53 | - <list> | |
| 54 | - <option value="0.2" /> | |
| 55 | - </list> | |
| 56 | - </option> | |
| 57 | - </splitter-proportions> | |
| 58 | - </settings> | |
| 59 | - </state> | |
| 60 | - </states> | |
| 61 | - </component> | |
| 62 | 86 | </project> |
| 63 | 87 | \ No newline at end of file | ... | ... |
PersonalCenter/.idea/modules.xml
| ... | ... | @@ -3,8 +3,6 @@ |
| 3 | 3 | <component name="ProjectModuleManager"> |
| 4 | 4 | <modules> |
| 5 | 5 | <module fileurl="file://$PROJECT_DIR$/PersonalCenter.iml" filepath="$PROJECT_DIR$/PersonalCenter.iml" /> |
| 6 | - <module fileurl="file://$PROJECT_DIR$/PersonalCenter.iml" filepath="$PROJECT_DIR$/PersonalCenter.iml" /> | |
| 7 | - <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> | |
| 8 | 6 | <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
| 9 | 7 | <module fileurl="file://$PROJECT_DIR$/circledialog/circledialog.iml" filepath="$PROJECT_DIR$/circledialog/circledialog.iml" /> |
| 10 | 8 | </modules> | ... | ... |
PersonalCenter/app/src/main/AndroidManifest.xml
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | android:icon="@mipmap/ic_launcher" |
| 8 | 8 | android:label="@string/app_name" |
| 9 | 9 | android:supportsRtl="true" |
| 10 | - android:theme="@style/Theme.AppCompat.NoActionBar"> | |
| 10 | + android:theme="@style/Theme.AppCompat.Light.NoActionBar"> | |
| 11 | 11 | <activity |
| 12 | 12 | android:name=".activity.MainActivity" |
| 13 | 13 | android:launchMode="singleTask" | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java
| ... | ... | @@ -2,7 +2,9 @@ package com.hjx.personalcenter.customdialog; |
| 2 | 2 | |
| 3 | 3 | import android.content.Context; |
| 4 | 4 | import android.content.Intent; |
| 5 | +import android.graphics.Color; | |
| 5 | 6 | import android.os.Bundle; |
| 7 | +import android.view.Gravity; | |
| 6 | 8 | import android.view.LayoutInflater; |
| 7 | 9 | import android.view.View; |
| 8 | 10 | import android.view.ViewGroup; |
| ... | ... | @@ -23,6 +25,8 @@ public class ElectronicCardDialog extends BaseCircleDialog { |
| 23 | 25 | dialogFragment.setCanceledOnTouchOutside(true); |
| 24 | 26 | dialogFragment.setRadius(CircleDimen.RADIUS); |
| 25 | 27 | dialogFragment.setWidth(0.8f); |
| 28 | + dialogFragment.setGravity(Gravity.CENTER); | |
| 29 | + dialogFragment.setBackgroundColor(Color.WHITE); | |
| 26 | 30 | return dialogFragment; |
| 27 | 31 | } |
| 28 | 32 | @Override | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ListDialog.java
| 1 | 1 | package com.hjx.personalcenter.customdialog; |
| 2 | 2 | |
| 3 | 3 | import android.content.Context; |
| 4 | +import android.graphics.Color; | |
| 4 | 5 | import android.os.Bundle; |
| 6 | +import android.view.Gravity; | |
| 5 | 7 | import android.view.LayoutInflater; |
| 6 | 8 | import android.view.View; |
| 7 | 9 | import android.view.ViewGroup; |
| ... | ... | @@ -30,6 +32,8 @@ public class ListDialog extends BaseCircleDialog implements AdapterView.OnItemCl |
| 30 | 32 | dialogFragment.setCanceledOnTouchOutside(true); |
| 31 | 33 | dialogFragment.setRadius(CircleDimen.RADIUS); |
| 32 | 34 | dialogFragment.setWidth(0.5f); |
| 35 | + dialogFragment.setGravity(Gravity.CENTER); | |
| 36 | + dialogFragment.setBackgroundColor(Color.WHITE); | |
| 33 | 37 | return dialogFragment; |
| 34 | 38 | } |
| 35 | 39 | @Override | ... | ... |
PersonalCenter/app/src/main/res/drawable/corcle_white_bg.xml
| ... | ... | @@ -2,12 +2,12 @@ |
| 2 | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | 3 | android:shape="rectangle"> |
| 4 | 4 | <solid |
| 5 | - android:color="@color/white"/> | |
| 5 | + android:color="@color/colorAccent"/> | |
| 6 | 6 | <corners |
| 7 | - android:bottomLeftRadius="100dp" | |
| 8 | - android:topLeftRadius="100dp" | |
| 9 | - android:bottomRightRadius="100dp" | |
| 10 | - android:topRightRadius="100dp"/> | |
| 7 | + android:bottomLeftRadius="20dp" | |
| 8 | + android:topLeftRadius="20dp" | |
| 9 | + android:bottomRightRadius="20dp" | |
| 10 | + android:topRightRadius="20dp"/> | |
| 11 | 11 | <stroke android:width="1dp" |
| 12 | 12 | android:color="@color/cutoff_line"/> |
| 13 | 13 | </shape> |
| 14 | 14 | \ No newline at end of file | ... | ... |
PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml
| 1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - android:orientation="vertical" android:layout_width="match_parent" | |
| 4 | - android:layout_height="match_parent" | |
| 5 | - android:background="@android:color/white"> | |
| 3 | + android:orientation="vertical" | |
| 4 | + android:layout_width="match_parent" | |
| 5 | + android:layout_height="600dp"> | |
| 6 | 6 | <RelativeLayout |
| 7 | 7 | android:id="@+id/title" |
| 8 | 8 | android:layout_width="match_parent" |
| 9 | 9 | android:layout_height="wrap_content" |
| 10 | - android:background="@android:color/white" | |
| 11 | 10 | android:minHeight="70dp" > |
| 12 | 11 | |
| 13 | 12 | <ImageView |
| ... | ... | @@ -24,7 +23,6 @@ |
| 24 | 23 | android:gravity="center" |
| 25 | 24 | android:layout_gravity="clip_horizontal" |
| 26 | 25 | android:layout_width="match_parent" |
| 27 | - android:background="@android:color/white" | |
| 28 | 26 | android:layout_height="wrap_content"> |
| 29 | 27 | <ImageView |
| 30 | 28 | android:layout_width="wrap_content" |
| ... | ... | @@ -33,7 +31,6 @@ |
| 33 | 31 | </RelativeLayout> |
| 34 | 32 | <LinearLayout |
| 35 | 33 | android:orientation="vertical" |
| 36 | - android:background="@android:color/white" | |
| 37 | 34 | android:layout_width="match_parent" |
| 38 | 35 | android:layout_height="wrap_content"> |
| 39 | 36 | <TextView |
| ... | ... | @@ -48,6 +45,7 @@ |
| 48 | 45 | android:layout_gravity="center" |
| 49 | 46 | android:layout_width="wrap_content" |
| 50 | 47 | android:layout_height="wrap_content" |
| 48 | + android:layout_marginTop="5dp" | |
| 51 | 49 | android:textSize="15sp" |
| 52 | 50 | android:textColor="@color/electronic_card" |
| 53 | 51 | android:text="@string/electronic_card2"/> |
| ... | ... | @@ -62,7 +60,7 @@ |
| 62 | 60 | <TextView |
| 63 | 61 | android:id="@+id/fill_card" |
| 64 | 62 | android:layout_gravity="center" |
| 65 | - android:layout_marginTop="20dp" | |
| 63 | + android:layout_marginTop="30dp" | |
| 66 | 64 | android:layout_width="wrap_content" |
| 67 | 65 | android:layout_height="wrap_content" |
| 68 | 66 | android:textSize="15sp" |
| ... | ... | @@ -72,7 +70,6 @@ |
| 72 | 70 | </LinearLayout> |
| 73 | 71 | <LinearLayout |
| 74 | 72 | android:orientation="vertical" |
| 75 | - android:background="@android:color/white" | |
| 76 | 73 | android:layout_width="match_parent" |
| 77 | 74 | android:layout_height="30dp"> |
| 78 | 75 | </LinearLayout> | ... | ... |
PersonalCenter/app/src/main/res/layout/custom_adilog_list.xml
| ... | ... | @@ -8,7 +8,6 @@ |
| 8 | 8 | android:id="@+id/title" |
| 9 | 9 | android:layout_width="match_parent" |
| 10 | 10 | android:layout_height="wrap_content" |
| 11 | - android:background="@android:color/white" | |
| 12 | 11 | android:minHeight="70dp" > |
| 13 | 12 | |
| 14 | 13 | <ImageView |
| ... | ... | @@ -32,9 +31,8 @@ |
| 32 | 31 | </RelativeLayout> |
| 33 | 32 | <ListView |
| 34 | 33 | android:id="@+id/listadapter" |
| 35 | - android:background="@android:color/white" | |
| 36 | 34 | android:layout_width="match_parent" |
| 37 | - android:layout_height="match_parent"> | |
| 35 | + android:layout_height="400dp"> | |
| 38 | 36 | |
| 39 | 37 | </ListView> |
| 40 | 38 | </LinearLayout> | ... | ... |