Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #18

Merged
merged 23 commits into from
Sep 23, 2020
Merged

fix #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
788cb16
Merge pull request #1 from o-ligei/master
ShanSimu Sep 14, 2020
a97ba4e
Merge branch 'master' of https://github.com/o-ligei/TimeManagement
Sep 16, 2020
6547a98
feat: unfinished while list
Sep 19, 2020
8824c72
Merge branch 'develop' into develop
ShanSimu Sep 20, 2020
4444227
Merge branch 'develop' into develop
ShanSimu Sep 20, 2020
f3b1422
feat: task success activity
Sep 21, 2020
6366d11
fix:task succuess activity
Sep 21, 2020
3abbbf9
fix：white list
Sep 21, 2020
6cdf13a
feat:screen saver activity
Sep 21, 2020
2652768
Merge branch 'develop' of https://github.com/ShaoJieCui/TimeManagemen…
Sep 21, 2020
6ef84c6
Merge branch 'develop' into develop
ShanSimu Sep 21, 2020
6e03077
Merge branch 'develop' of https://github.com/o-ligei/TimeManagement i…
ShanSimu Sep 21, 2020
9275745
confict
ShanSimu Sep 21, 2020
2c08d37
Merge branch 'o-ligei-develop' into develop
ShanSimu Sep 21, 2020
a163cea
fix:for the stupid name
ShanSimu Sep 21, 2020
27d8f98
fix:white list layout
ShanSimu Sep 22, 2020
af13359
feat:task list
ShanSimu Sep 22, 2020
764c1a6
Merge branch 'develop' of https://github.com/o-ligei/TimeManagement i…
ShanSimu Sep 22, 2020
0192ec0
Merge branch 'oligei-develop' into develop
ShanSimu Sep 22, 2020
6e4af83
Merge branch 'develop' of https://github.com/o-ligei/TimeManagement i…
ShanSimu Sep 23, 2020
f24cdb0
Merge branch 'o-ligei-develop' into develop
ShanSimu Sep 23, 2020
2968e82
fix:layout and strings
ShanSimu Sep 23, 2020
a40b9fb
Merge branch 'develop' into develop
ShanSimu Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 31 additions & 91 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,113 +9,53 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".CreditDetailList"/>
<activity android:name=".CreditDetailList" />
<activity android:name=".FriendsList" />
<activity android:name=".PersonInfoDetail" />
<activity android:name=".CreditDetailCard" />
<activity android:name=".FriendsListCard" />
<activity android:name=".PersonInfoCard" />
<activity android:name=".PersonInfo" />
<activity android:name=".AlarmList"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".GameSetting"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".RingSetting"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".TaskListActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ScreenSaverActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".TaskSuccessActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".WhiteListActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".TaskListActivity"/>
<activity android:name=".ScreenSaverActivity"/>
<activity android:name=".TaskSuccessActivity"/>
<activity android:name=".WhiteListActivity"/>
<activity android:name=".RegisterActivity" />
<activity android:name=".LoginActivity2" />
<activity android:name=".StatisticActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!-- <activity-->
<!-- android:name=".MainActivity"-->
<!-- android:label="111"-->
<!-- android:launchMode="singleInstance"-->
<!-- android:theme="@style/AppTheme.NoActionBar">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->

<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<!-- </activity>-->
<activity android:name=".StatisticActivity" />
<activity
android:name=".MainActivity"
android:label="111"
android:launchMode="singleInstance"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".ClockSetting"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".LoginActivity1">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".MainActivity"
android:launchMode="standard">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
android:theme="@style/AppTheme.NoActionBar"/>
<activity android:name=".LoginActivity1"/>
<!-- <activity-->
<!-- android:name=".MainActivity"-->
<!-- android:launchMode="standard">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->

<!-- <category android:name="android.intent.category.DEFAULT" />-->
<!-- </intent-filter>-->
<!-- </activity>-->
<activity android:name=".AnotherActivity" />
<activity android:name=".TestActivity" />
</application>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_baseline_done_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#BAFF93"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>
32 changes: 16 additions & 16 deletions app/src/main/res/layout/activity_task_success.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<TextView
android:id="@+id/SuccessNotice"
android:layout_width="270dp"
android:layout_height="86dp"
android:layout_width="275dp"
android:layout_height="43dp"
android:fontFamily="sans-serif"
android:lineSpacingExtra="8sp"
android:text="@string/task_success"
Expand All @@ -19,22 +19,9 @@
android:typeface="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.53" />

<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.136"
app:srcCompat="@drawable/success"
android:contentDescription="TODO" />
app:layout_constraintVertical_bias="0.556" />

<Button
android:id="@+id/button6"
Expand All @@ -45,4 +32,17 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<ImageView
android:id="@+id/imageView3"
android:layout_width="235dp"
android:layout_height="206dp"
android:layout_marginTop="132dp"
android:layout_marginBottom="74dp"
app:layout_constraintBottom_toTopOf="@+id/SuccessNotice"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_baseline_done_24" />
</androidx.constraintlayout.widget.ConstraintLayout>
9 changes: 5 additions & 4 deletions app/src/main/res/layout/activity_white_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
android:id="@+id/white_list"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="32dp"
android:layout_marginTop="10dp"
android:divider="#FFF"
android:dividerHeight="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/white_list_name"
app:layout_constraintVertical_bias="0.0" />
Expand All @@ -22,8 +24,7 @@
android:id="@+id/white_list_name"
android:layout_width="55dp"
android:layout_height="31dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="7dp"
android:layout_marginTop="10dp"
android:text="@string/white_list_name"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@id/white_list"
Expand Down
53 changes: 34 additions & 19 deletions app/src/main/res/layout/white_list_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout 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">
android:layout_height="match_parent"
android:elevation="5dp">


<androidx.cardview.widget.CardView
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginBottom="5dp"
android:layout_height="70dp"
android:layout_margin="5dp"
android:layout_marginBottom="4dp"
android:clickable="true"
android:focusable="true"
app:cardCornerRadius="@dimen/tiny_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">

<ImageView
android:id="@+id/apps_icon"
android:layout_width="100dp"
android:layout_height="50dp"
android:layout_weight="1"
android:scaleType="fitCenter"
android:layout_width="150dp"
android:layout_height="62dp"
android:layout_marginLeft="@dimen/tiny_margin"
android:layout_marginTop="@dimen/tiny_margin"

android:layout_marginBottom="@dimen/tiny_margin"
android:layout_weight="1"
android:scaleType="centerCrop"
app:srcCompat="@drawable/qq" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/tiny_margin"
android:layout_weight="1">

<TextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="TextView" />
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="0dp"
android:gravity="center_vertical"
android:text="TextView"
android:textAlignment="center"
android:textSize="16sp" />

<Switch
android:id="@+id/switch1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="开启关闭" />
android:layout_width="wrap_content"
android:layout_height="70dp"
android:layout_weight="1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:layout_marginStart="0dp" />

</LinearLayout>

</LinearLayout>
Expand Down
32 changes: 17 additions & 15 deletions app/src/main/res/values-en-rUS/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,24 @@
<string name="test_message">Enter a message</string>
<string name="button_send">send</string>
<string name="phone_hint">please input phone number…</string>
<string name="captcha_hint">请输入验证码…</string>
<string name="get_captcha_hint">获取验证码</string>
<string name="captcha_hint">please input captcha…</string>
<string name="get_captcha_hint">Get Captcha</string>

<string name="username_hint">请输入用户名…</string>
<string name="password_hint">请输入密码…</string>
<string name="username_hint">input username…</string>
<string name="password_hint">input password…</string>

<string name="logo_description">This is the logo description.</string>
<string name="login_usepw_hint">使用账号密码登录?</string>
<string name="login_useregis_hint">没有账号?注册</string>
<string name="login_message">登录</string>
<string name="white_list_name">白名单</string>
<string name="login_usepw_hint">use password?</string>
<string name="login_useregis_hint">register</string>
<string name="login_message">login</string>
<string name="white_list_name">white list</string>


<string name="register_message">register</string>
<string name="login_usecapt_hint">use captcha?</string>
<string name="friends_list_name">friends</string>
<string name="credit_detail_list_name">credit detail</string>

<string name="register_message">注册</string>
<string name="login_usecapt_hint">使用验证码登录</string>

<!-- Strings used for clock setting-->
<string name="clock_setting_title">Setting alarm</string>
Expand All @@ -52,12 +56,10 @@
<string name="navigation_setting">Setting</string>
<string name="navigation_about">About</string>

<string name="friends_list_name">朋友们</string>
<string name="credit_detail_list_name">积分明细</string>
<string name="personinfo_name">info</string>
<string name="friendslist_name">friends</string>
<string name="creditdetail_name">credit detail</string>

<string name="personinfo_name">个人信息</string>
<string name="friendslist_name">好友列表</string>
<string name="creditdetail_name">积分详情</string>

<!--strings for navigation-->
<string name="statistic_day_title">daily summary</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
<dimen name="fab_margin">16dp</dimen>
<dimen name="card_width">108dp</dimen>
<dimen name="card_height">108dp</dimen>
<dimen name="tiny_margin">4dp</dimen>
<dimen name="small_margin">8dp</dimen>
<dimen name="medium_margin">16dp</dimen>
<dimen name="large_margin">20dp</dimen>
</resources>
Loading